Skip to content

Commit a4801e0

Browse files
Si1verSi1ver
committed
Cleanup project files.
1 parent 8ef8dc9 commit a4801e0

14 files changed

+208
-206
lines changed

Diff for: ‎build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -744,13 +744,13 @@ Task createXbuildTask(String taskName, String taskDescription,
744744
executable project.ext.xbuildExe
745745
workingDir projectToBuild.parentFile.absolutePath
746746
args ([sprintf("/target:%s", target),
747-
sprintf("/property:UnityHintPath=%s",
747+
sprintf("/property:UnityHintPath=%s" + File.separator,
748748
project.ext.unityDllPath.absolutePath),
749-
sprintf("/property:UnityIosPath=%s",
749+
sprintf("/property:UnityIosPath=%s" + File.separator,
750750
project.ext.unityIosPath.absolutePath),
751751
sprintf("/property:NUnityHintPath=%s",
752752
project.ext.unityNUnitDll ?
753-
project.ext.unityNUnitDll.absolutePath: ""),
753+
project.ext.unityNUnitDll.absolutePath + File.separator: ""),
754754
sprintf("/property:BaseIntermediateOutputPath=%s%s",
755755
intermediatesDir.absolutePath,
756756
File.separator),

Diff for: ‎source/AndroidResolver/AndroidResolver.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
<ConsolePause>False</ConsolePause>
3434
</PropertyGroup>
3535
<PropertyGroup>
36-
<UnityHintPath>..\..\unity_dlls</UnityHintPath>
36+
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="UnityEditor">
40-
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
40+
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
4141
</Reference>
4242
<Reference Include="UnityEngine">
43-
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
43+
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
4444
</Reference>
4545
<Reference Include="System" />
4646
<Reference Include="System.Core" />

Diff for: ‎source/AndroidResolver/test/AndroidResolverIntegrationTests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
<WarningLevel>4</WarningLevel>
3333
<ConsolePause>False</ConsolePause>
3434
</PropertyGroup>
35-
<PropertyGroup>
36-
<UnityHintPath>..\..\unity_dlls</UnityHintPath>
37-
</PropertyGroup>
35+
<PropertyGroup>
36+
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
37+
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="UnityEditor">
40-
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
40+
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
4141
</Reference>
4242
<Reference Include="UnityEngine">
43-
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
43+
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
4444
</Reference>
4545
<Reference Include="System" />
4646
<Reference Include="System.Core" />

Diff for: ‎source/IOSResolver/IOSResolver.csproj

+8-17
Original file line numberDiff line numberDiff line change
@@ -32,33 +32,24 @@
3232
<WarningLevel>4</WarningLevel>
3333
<ConsolePause>False</ConsolePause>
3434
</PropertyGroup>
35-
<PropertyGroup>
36-
<UnityHintPath>..\..\unity_dlls</UnityHintPath>
37-
<UnityIosPath>..\..\unity_dlls</UnityIosPath>
38-
</PropertyGroup>
35+
<PropertyGroup>
36+
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
37+
<UnityIosPath>$(SolutionDir)..\unity_dlls\</UnityIosPath>
38+
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="UnityEditor">
41-
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
41+
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
4242
</Reference>
4343
<Reference Include="UnityEngine">
44-
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
44+
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
4545
</Reference>
4646
<Reference Include="UnityEditor.iOS.Extensions.Xcode">
47-
<HintPath Condition="Exists('$(UnityIosPath)/UnityEditor.iOS.Extensions.Xcode.dll')">$(UnityIosPath)/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
48-
<HintPath Condition="Exists('$(UnityIosPath)/Unity.iOS.Extensions.Xcode.dll')">$(UnityIosPath)/Unity.iOS.Extensions.Xcode.dll</HintPath>
47+
<HintPath Condition="Exists('$(UnityIosPath)UnityEditor.iOS.Extensions.Xcode.dll')">$(UnityIosPath)UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
48+
<HintPath Condition="Exists('$(UnityIosPath)Unity.iOS.Extensions.Xcode.dll')">$(UnityIosPath)Unity.iOS.Extensions.Xcode.dll</HintPath>
4949
</Reference>
5050
<Reference Include="System" />
5151
<Reference Include="System.Core" />
5252
<Reference Include="System.Xml" />
53-
<Reference Include="Google.JarResolver">
54-
<HintPath>..\AndroidResolver\bin\Release\Google.JarResolver.dll</HintPath>
55-
</Reference>
56-
<Reference Include="Google.VersionHandler.dll">
57-
<HintPath>..\VersionHandler\bin\Release\Google.VersionHandler.dll</HintPath>
58-
</Reference>
59-
<Reference Include="Google.VersionHandlerImpl.dll">
60-
<HintPath>..\VersionHandler\bin\Release\Google.VersionHandlerImpl.dll</HintPath>
61-
</Reference>
6253
</ItemGroup>
6354
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
6455
<ItemGroup>

Diff for: ‎source/IntegrationTester/IntegrationTester.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
<WarningLevel>4</WarningLevel>
3333
<ConsolePause>False</ConsolePause>
3434
</PropertyGroup>
35-
<PropertyGroup>
36-
<UnityHintPath>..\..\unity_dlls</UnityHintPath>
37-
</PropertyGroup>
35+
<PropertyGroup>
36+
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
37+
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="UnityEditor">
40-
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
40+
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
4141
</Reference>
4242
<Reference Include="UnityEngine">
43-
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
43+
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
4444
</Reference>
4545
<Reference Include="System" />
4646
<Reference Include="System.Core" />

Diff for: ‎source/JarResolverLib/JarResolverLib.csproj

+6-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<OutputType>Library</OutputType>
88
<RootNamespace>JarResolverLib</RootNamespace>
99
<AssemblyName>JarResolverLib</AssemblyName>
10-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
10+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1111
<ReleaseVersion>1.2</ReleaseVersion>
1212
<ProductVersion>12.0.0</ProductVersion>
1313
<SchemaVersion>2.0</SchemaVersion>
@@ -31,12 +31,15 @@
3131
<WarningLevel>4</WarningLevel>
3232
<ConsolePause>False</ConsolePause>
3333
</PropertyGroup>
34+
<PropertyGroup>
35+
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
36+
</PropertyGroup>
3437
<ItemGroup>
3538
<Reference Include="UnityEditor">
36-
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
39+
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
3740
</Reference>
3841
<Reference Include="UnityEngine">
39-
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
42+
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
4043
</Reference>
4144
<Reference Include="System" />
4245
<Reference Include="System.Xml" />

Diff for: ‎source/JarResolverTests/JarResolverTests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<OutputType>Library</OutputType>
88
<RootNamespace>JarResolverTests</RootNamespace>
99
<AssemblyName>JarResolverTests</AssemblyName>
10-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
10+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1111
<ReleaseVersion>1.2</ReleaseVersion>
1212
<ProductVersion>12.0.0</ProductVersion>
1313
<SchemaVersion>2.0</SchemaVersion>
@@ -31,14 +31,14 @@
3131
<ConsolePause>False</ConsolePause>
3232
</PropertyGroup>
3333
<PropertyGroup>
34-
<NUnityHintPath>..\packages\NUnit.2.6.3\lib\</NUnityHintPath>
34+
<NUnityHintPath>$(SolutionDir)packages\NUnit.2.6.3\lib\</NUnityHintPath>
3535
</PropertyGroup>
3636
<ItemGroup>
3737
<Reference Include="System" />
3838
<Reference Include="System.Core" />
39-
<Reference Include="nunit.framework">
40-
<HintPath>$(NUnityHintPath)/nunit.framework.dll</HintPath>
41-
</Reference>
39+
<Reference Include="nunit.framework">
40+
<HintPath>$(NUnityHintPath)nunit.framework.dll</HintPath>
41+
</Reference>
4242
</ItemGroup>
4343
<ItemGroup>
4444
<Compile Include="src\Google.JarResolver.Tests\DependencyTests.cs" />

Diff for: ‎source/PackageManagerResolver/PackageManagerResolver.csproj

+5-11
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,15 @@
3232
<WarningLevel>4</WarningLevel>
3333
<ConsolePause>False</ConsolePause>
3434
</PropertyGroup>
35-
<PropertyGroup>
36-
<UnityHintPath>..\..\unity_dlls</UnityHintPath>
37-
</PropertyGroup>
35+
<PropertyGroup>
36+
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
37+
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="UnityEditor">
40-
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
40+
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
4141
</Reference>
4242
<Reference Include="UnityEngine">
43-
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
44-
</Reference>
45-
<Reference Include="Google.VersionHandler.dll">
46-
<HintPath>..\VersionHandler\bin\Release\Google.VersionHandler.dll</HintPath>
47-
</Reference>
48-
<Reference Include="Google.VersionHandlerImpl.dll">
49-
<HintPath>..\VersionHandler\bin\Release\Google.VersionHandlerImpl.dll</HintPath>
43+
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
5044
</Reference>
5145
<Reference Include="System" />
5246
<Reference Include="System.Core" />

Diff for: ‎source/PackageManagerResolver/test/PackageManagerClientIntegrationTests.csproj

+44-41
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<OutputType>Library</OutputType>
88
<RootNamespace>Google.PackageManagerClientIntegrationTests</RootNamespace>
99
<AssemblyName>Google.PackageManagerClientIntegrationTests</AssemblyName>
10-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
10+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1111
<ReleaseVersion>1.2</ReleaseVersion>
1212
<ProductVersion>12.0.0</ProductVersion>
1313
<SchemaVersion>2.0</SchemaVersion>
@@ -22,44 +22,47 @@
2222
<WarningLevel>4</WarningLevel>
2323
<ConsolePause>False</ConsolePause>
2424
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>none</DebugType>
27-
<Optimize>True</Optimize>
28-
<OutputPath>bin\Release</OutputPath>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
<ConsolePause>False</ConsolePause>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="UnityEditor">
35-
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
36-
</Reference>
37-
<Reference Include="UnityEngine">
38-
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
39-
</Reference>
40-
<Reference Include="System" />
41-
<Reference Include="System.Core" />
42-
</ItemGroup>
43-
<ItemGroup>
44-
<Compile Include="PackageManagerClientIntegrationTests\PackageManagerClientIntegrationTests.cs" />
45-
</ItemGroup>
46-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
47-
<ItemGroup>
48-
<ProjectReference Include="..\..\VersionHandler\VersionHandler.csproj">
49-
<Project>{5378B37A-887E-49ED-A8AE-42FA843AA9DC}</Project>
50-
<Name>VersionHandler</Name>
51-
</ProjectReference>
52-
<ProjectReference Include="..\..\VersionHandlerImpl\VersionHandlerImpl.csproj">
53-
<Project>{1E162334-8EA2-440A-9B3A-13FD8FE5C22E}</Project>
54-
<Name>VersionHandlerImpl</Name>
55-
</ProjectReference>
56-
<ProjectReference Include="..\..\IntegrationTester/IntegrationTester.csproj">
57-
<Project>{DBD8D4D9-61AC-4E75-8CDC-CABE7033A040}</Project>
58-
<Name>IntegrationTester</Name>
59-
</ProjectReference>
60-
<ProjectReference Include="..\PackageManagerResolver.csproj">
61-
<Project>{77EBE819-CBE6-4CA8-A791-ED747EA29D30}</Project>
62-
<Name>PackageManagerResolver</Name>
63-
</ProjectReference>
64-
</ItemGroup>
25+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26+
<DebugType>none</DebugType>
27+
<Optimize>True</Optimize>
28+
<OutputPath>bin\Release</OutputPath>
29+
<ErrorReport>prompt</ErrorReport>
30+
<WarningLevel>4</WarningLevel>
31+
<ConsolePause>False</ConsolePause>
32+
</PropertyGroup>
33+
<PropertyGroup>
34+
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
35+
</PropertyGroup>
36+
<ItemGroup>
37+
<Reference Include="UnityEditor">
38+
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
39+
</Reference>
40+
<Reference Include="UnityEngine">
41+
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
42+
</Reference>
43+
<Reference Include="System" />
44+
<Reference Include="System.Core" />
45+
</ItemGroup>
46+
<ItemGroup>
47+
<Compile Include="PackageManagerClientIntegrationTests\PackageManagerClientIntegrationTests.cs" />
48+
</ItemGroup>
49+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
50+
<ItemGroup>
51+
<ProjectReference Include="..\..\VersionHandler\VersionHandler.csproj">
52+
<Project>{5378B37A-887E-49ED-A8AE-42FA843AA9DC}</Project>
53+
<Name>VersionHandler</Name>
54+
</ProjectReference>
55+
<ProjectReference Include="..\..\VersionHandlerImpl\VersionHandlerImpl.csproj">
56+
<Project>{1E162334-8EA2-440A-9B3A-13FD8FE5C22E}</Project>
57+
<Name>VersionHandlerImpl</Name>
58+
</ProjectReference>
59+
<ProjectReference Include="..\..\IntegrationTester\IntegrationTester.csproj">
60+
<Project>{DBD8D4D9-61AC-4E75-8CDC-CABE7033A040}</Project>
61+
<Name>IntegrationTester</Name>
62+
</ProjectReference>
63+
<ProjectReference Include="..\PackageManagerResolver.csproj">
64+
<Project>{77EBE819-CBE6-4CA8-A791-ED747EA29D30}</Project>
65+
<Name>PackageManagerResolver</Name>
66+
</ProjectReference>
67+
</ItemGroup>
6568
</Project>

Diff for: ‎source/PackageManagerResolver/test/PackageMigratorIntegrationTests.csproj

+44-41
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<OutputType>Library</OutputType>
88
<RootNamespace>Google.PackageMigratorIntegrationTests</RootNamespace>
99
<AssemblyName>Google.PackageMigratorIntegrationTests</AssemblyName>
10-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
10+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1111
<ReleaseVersion>1.2</ReleaseVersion>
1212
<ProductVersion>12.0.0</ProductVersion>
1313
<SchemaVersion>2.0</SchemaVersion>
@@ -22,44 +22,47 @@
2222
<WarningLevel>4</WarningLevel>
2323
<ConsolePause>False</ConsolePause>
2424
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>none</DebugType>
27-
<Optimize>True</Optimize>
28-
<OutputPath>bin\Release</OutputPath>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
<ConsolePause>False</ConsolePause>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="UnityEditor">
35-
<HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
36-
</Reference>
37-
<Reference Include="UnityEngine">
38-
<HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
39-
</Reference>
40-
<Reference Include="System" />
41-
<Reference Include="System.Core" />
42-
</ItemGroup>
43-
<ItemGroup>
44-
<Compile Include="PackageMigratorIntegrationTests\PackageMigratorIntegrationTests.cs" />
45-
</ItemGroup>
46-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
47-
<ItemGroup>
48-
<ProjectReference Include="..\..\VersionHandler\VersionHandler.csproj">
49-
<Project>{5378B37A-887E-49ED-A8AE-42FA843AA9DC}</Project>
50-
<Name>VersionHandler</Name>
51-
</ProjectReference>
52-
<ProjectReference Include="..\..\VersionHandlerImpl\VersionHandlerImpl.csproj">
53-
<Project>{1E162334-8EA2-440A-9B3A-13FD8FE5C22E}</Project>
54-
<Name>VersionHandlerImpl</Name>
55-
</ProjectReference>
56-
<ProjectReference Include="..\..\IntegrationTester/IntegrationTester.csproj">
57-
<Project>{DBD8D4D9-61AC-4E75-8CDC-CABE7033A040}</Project>
58-
<Name>IntegrationTester</Name>
59-
</ProjectReference>
60-
<ProjectReference Include="..\PackageManagerResolver.csproj">
61-
<Project>{77EBE819-CBE6-4CA8-A791-ED747EA29D30}</Project>
62-
<Name>PackageManagerResolver</Name>
63-
</ProjectReference>
64-
</ItemGroup>
25+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26+
<DebugType>none</DebugType>
27+
<Optimize>True</Optimize>
28+
<OutputPath>bin\Release</OutputPath>
29+
<ErrorReport>prompt</ErrorReport>
30+
<WarningLevel>4</WarningLevel>
31+
<ConsolePause>False</ConsolePause>
32+
</PropertyGroup>
33+
<PropertyGroup>
34+
<UnityHintPath>$(SolutionDir)..\unity_dlls\</UnityHintPath>
35+
</PropertyGroup>
36+
<ItemGroup>
37+
<Reference Include="UnityEditor">
38+
<HintPath>$(UnityHintPath)UnityEditor.dll</HintPath>
39+
</Reference>
40+
<Reference Include="UnityEngine">
41+
<HintPath>$(UnityHintPath)UnityEngine.dll</HintPath>
42+
</Reference>
43+
<Reference Include="System" />
44+
<Reference Include="System.Core" />
45+
</ItemGroup>
46+
<ItemGroup>
47+
<Compile Include="PackageMigratorIntegrationTests\PackageMigratorIntegrationTests.cs" />
48+
</ItemGroup>
49+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
50+
<ItemGroup>
51+
<ProjectReference Include="..\..\VersionHandler\VersionHandler.csproj">
52+
<Project>{5378B37A-887E-49ED-A8AE-42FA843AA9DC}</Project>
53+
<Name>VersionHandler</Name>
54+
</ProjectReference>
55+
<ProjectReference Include="..\..\VersionHandlerImpl\VersionHandlerImpl.csproj">
56+
<Project>{1E162334-8EA2-440A-9B3A-13FD8FE5C22E}</Project>
57+
<Name>VersionHandlerImpl</Name>
58+
</ProjectReference>
59+
<ProjectReference Include="..\..\IntegrationTester\IntegrationTester.csproj">
60+
<Project>{DBD8D4D9-61AC-4E75-8CDC-CABE7033A040}</Project>
61+
<Name>IntegrationTester</Name>
62+
</ProjectReference>
63+
<ProjectReference Include="..\PackageManagerResolver.csproj">
64+
<Project>{77EBE819-CBE6-4CA8-A791-ED747EA29D30}</Project>
65+
<Name>PackageManagerResolver</Name>
66+
</ProjectReference>
67+
</ItemGroup>
6568
</Project>

0 commit comments

Comments
 (0)