Skip to content

Grand Cleanup of C# Project Files #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Grand Cleanup of C# Project Files #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,13 +744,13 @@ Task createXbuildTask(String taskName, String taskDescription,
executable project.ext.xbuildExe
workingDir projectToBuild.parentFile.absolutePath
args ([sprintf("/target:%s", target),
sprintf("/property:UnityHintPath=%s",
sprintf("/property:UnityHintPath=%s" + File.separator,
project.ext.unityDllPath.absolutePath),
sprintf("/property:UnityIosPath=%s",
sprintf("/property:UnityIosPath=%s" + File.separator,
project.ext.unityIosPath.absolutePath),
sprintf("/property:NUnityHintPath=%s",
project.ext.unityNUnitDll ?
project.ext.unityNUnitDll.absolutePath: ""),
project.ext.unityNUnitDll.absolutePath + File.separator: ""),
sprintf("/property:BaseIntermediateOutputPath=%s%s",
intermediatesDir.absolutePath,
File.separator),
Expand Down
6 changes: 3 additions & 3 deletions source/AndroidResolver/AndroidResolver.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<PropertyGroup>
<UnityHintPath>..\..\unity_dlls</UnityHintPath>
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="UnityEditor">
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
10 changes: 5 additions & 5 deletions source/AndroidResolver/test/AndroidResolverIntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<PropertyGroup>
<UnityHintPath>..\..\unity_dlls</UnityHintPath>
</PropertyGroup>
<PropertyGroup>
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="UnityEditor">
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
25 changes: 8 additions & 17 deletions source/IOSResolver/IOSResolver.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,24 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<PropertyGroup>
<UnityHintPath>..\..\unity_dlls</UnityHintPath>
<UnityIosPath>..\..\unity_dlls</UnityIosPath>
</PropertyGroup>
<PropertyGroup>
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
<UnityIosPath>$(SolutionDir)..\unity_dlls\</UnityIosPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="UnityEditor">
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.iOS.Extensions.Xcode">
<HintPath Condition="Exists('$(UnityIosPath)/UnityEditor.iOS.Extensions.Xcode.dll')">$(UnityIosPath)/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
<HintPath Condition="Exists('$(UnityIosPath)/Unity.iOS.Extensions.Xcode.dll')">$(UnityIosPath)/Unity.iOS.Extensions.Xcode.dll</HintPath>
<HintPath Condition="Exists('$(UnityIosPath)UnityEditor.iOS.Extensions.Xcode.dll')">$(UnityIosPath)UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
<HintPath Condition="Exists('$(UnityIosPath)Unity.iOS.Extensions.Xcode.dll')">$(UnityIosPath)Unity.iOS.Extensions.Xcode.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
<Reference Include="Google.JarResolver">
<HintPath>..\AndroidResolver\bin\Release\Google.JarResolver.dll</HintPath>
</Reference>
<Reference Include="Google.VersionHandler.dll">
<HintPath>..\VersionHandler\bin\Release\Google.VersionHandler.dll</HintPath>
</Reference>
<Reference Include="Google.VersionHandlerImpl.dll">
<HintPath>..\VersionHandler\bin\Release\Google.VersionHandlerImpl.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions source/IntegrationTester/IntegrationTester.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<PropertyGroup>
<UnityHintPath>..\..\unity_dlls</UnityHintPath>
</PropertyGroup>
<PropertyGroup>
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="UnityEditor">
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
9 changes: 6 additions & 3 deletions source/JarResolverLib/JarResolverLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>JarResolverLib</RootNamespace>
<AssemblyName>JarResolverLib</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<ReleaseVersion>1.2</ReleaseVersion>
<ProductVersion>12.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
Expand All @@ -31,12 +31,15 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<PropertyGroup>
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="UnityEditor">
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
Expand Down
10 changes: 5 additions & 5 deletions source/JarResolverTests/JarResolverTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>JarResolverTests</RootNamespace>
<AssemblyName>JarResolverTests</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<ReleaseVersion>1.2</ReleaseVersion>
<ProductVersion>12.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
Expand All @@ -31,14 +31,14 @@
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<PropertyGroup>
<NUnityHintPath>..\packages\NUnit.2.6.3\lib\</NUnityHintPath>
<NUnityHintPath>$(SolutionDir)packages\NUnit.2.6.3\lib\</NUnityHintPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="nunit.framework">
<HintPath>$(NUnityHintPath)/nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>$(NUnityHintPath)nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="src\Google.JarResolver.Tests\DependencyTests.cs" />
Expand Down
16 changes: 5 additions & 11 deletions source/PackageManagerResolver/PackageManagerResolver.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,15 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<PropertyGroup>
<UnityHintPath>..\..\unity_dlls</UnityHintPath>
</PropertyGroup>
<PropertyGroup>
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="UnityEditor">
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="Google.VersionHandler.dll">
<HintPath>..\VersionHandler\bin\Release\Google.VersionHandler.dll</HintPath>
</Reference>
<Reference Include="Google.VersionHandlerImpl.dll">
<HintPath>..\VersionHandler\bin\Release\Google.VersionHandlerImpl.dll</HintPath>
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
85 changes: 44 additions & 41 deletions source/PackageManagerResolver/test/PackageManagerClientIntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Google.PackageManagerClientIntegrationTests</RootNamespace>
<AssemblyName>Google.PackageManagerClientIntegrationTests</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<ReleaseVersion>1.2</ReleaseVersion>
<ProductVersion>12.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
Expand All @@ -22,44 +22,47 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="UnityEditor">
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="PackageManagerClientIntegrationTests\PackageManagerClientIntegrationTests.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\VersionHandler\VersionHandler.csproj">
<Project>{5378B37A-887E-49ED-A8AE-42FA843AA9DC}</Project>
<Name>VersionHandler</Name>
</ProjectReference>
<ProjectReference Include="..\..\VersionHandlerImpl\VersionHandlerImpl.csproj">
<Project>{1E162334-8EA2-440A-9B3A-13FD8FE5C22E}</Project>
<Name>VersionHandlerImpl</Name>
</ProjectReference>
<ProjectReference Include="..\..\IntegrationTester/IntegrationTester.csproj">
<Project>{DBD8D4D9-61AC-4E75-8CDC-CABE7033A040}</Project>
<Name>IntegrationTester</Name>
</ProjectReference>
<ProjectReference Include="..\PackageManagerResolver.csproj">
<Project>{77EBE819-CBE6-4CA8-A791-ED747EA29D30}</Project>
<Name>PackageManagerResolver</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<PropertyGroup>
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="UnityEditor">
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="PackageManagerClientIntegrationTests\PackageManagerClientIntegrationTests.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\VersionHandler\VersionHandler.csproj">
<Project>{5378B37A-887E-49ED-A8AE-42FA843AA9DC}</Project>
<Name>VersionHandler</Name>
</ProjectReference>
<ProjectReference Include="..\..\VersionHandlerImpl\VersionHandlerImpl.csproj">
<Project>{1E162334-8EA2-440A-9B3A-13FD8FE5C22E}</Project>
<Name>VersionHandlerImpl</Name>
</ProjectReference>
<ProjectReference Include="..\..\IntegrationTester\IntegrationTester.csproj">
<Project>{DBD8D4D9-61AC-4E75-8CDC-CABE7033A040}</Project>
<Name>IntegrationTester</Name>
</ProjectReference>
<ProjectReference Include="..\PackageManagerResolver.csproj">
<Project>{77EBE819-CBE6-4CA8-A791-ED747EA29D30}</Project>
<Name>PackageManagerResolver</Name>
</ProjectReference>
</ItemGroup>
</Project>
85 changes: 44 additions & 41 deletions source/PackageManagerResolver/test/PackageMigratorIntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Google.PackageMigratorIntegrationTests</RootNamespace>
<AssemblyName>Google.PackageMigratorIntegrationTests</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<ReleaseVersion>1.2</ReleaseVersion>
<ProductVersion>12.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
Expand All @@ -22,44 +22,47 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="UnityEditor">
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="PackageMigratorIntegrationTests\PackageMigratorIntegrationTests.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\VersionHandler\VersionHandler.csproj">
<Project>{5378B37A-887E-49ED-A8AE-42FA843AA9DC}</Project>
<Name>VersionHandler</Name>
</ProjectReference>
<ProjectReference Include="..\..\VersionHandlerImpl\VersionHandlerImpl.csproj">
<Project>{1E162334-8EA2-440A-9B3A-13FD8FE5C22E}</Project>
<Name>VersionHandlerImpl</Name>
</ProjectReference>
<ProjectReference Include="..\..\IntegrationTester/IntegrationTester.csproj">
<Project>{DBD8D4D9-61AC-4E75-8CDC-CABE7033A040}</Project>
<Name>IntegrationTester</Name>
</ProjectReference>
<ProjectReference Include="..\PackageManagerResolver.csproj">
<Project>{77EBE819-CBE6-4CA8-A791-ED747EA29D30}</Project>
<Name>PackageManagerResolver</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
</PropertyGroup>
<PropertyGroup>
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="UnityEditor">
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="PackageMigratorIntegrationTests\PackageMigratorIntegrationTests.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\VersionHandler\VersionHandler.csproj">
<Project>{5378B37A-887E-49ED-A8AE-42FA843AA9DC}</Project>
<Name>VersionHandler</Name>
</ProjectReference>
<ProjectReference Include="..\..\VersionHandlerImpl\VersionHandlerImpl.csproj">
<Project>{1E162334-8EA2-440A-9B3A-13FD8FE5C22E}</Project>
<Name>VersionHandlerImpl</Name>
</ProjectReference>
<ProjectReference Include="..\..\IntegrationTester\IntegrationTester.csproj">
<Project>{DBD8D4D9-61AC-4E75-8CDC-CABE7033A040}</Project>
<Name>IntegrationTester</Name>
</ProjectReference>
<ProjectReference Include="..\PackageManagerResolver.csproj">
<Project>{77EBE819-CBE6-4CA8-A791-ED747EA29D30}</Project>
<Name>PackageManagerResolver</Name>
</ProjectReference>
</ItemGroup>
</Project>
Loading