From a4801e0171f697af699df5f47e9d6379fa11c8dd Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <si1ver1502@gmail.com>
Date: Mon, 13 Apr 2020 13:27:38 +0300
Subject: [PATCH] Cleanup project files.
---
build.gradle | 6 +-
source/AndroidResolver/AndroidResolver.csproj | 6 +-
.../AndroidResolverIntegrationTests.csproj | 10 +--
source/IOSResolver/IOSResolver.csproj | 25 ++----
.../IntegrationTester.csproj | 10 +--
source/JarResolverLib/JarResolverLib.csproj | 9 +-
.../JarResolverTests/JarResolverTests.csproj | 10 +--
.../PackageManagerResolver.csproj | 16 ++--
...ackageManagerClientIntegrationTests.csproj | 85 ++++++++++---------
.../PackageMigratorIntegrationTests.csproj | 85 ++++++++++---------
.../PackageManagerResolverTests.csproj | 70 ++++++++-------
source/VersionHandler/VersionHandler.csproj | 10 +--
.../VersionHandlerImpl.csproj | 10 +--
.../unit_tests/VersionHandlerImplTests.csproj | 62 +++++++-------
14 files changed, 208 insertions(+), 206 deletions(-)
diff --git a/build.gradle b/build.gradle
index f46bb0e6..41e74587 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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),
diff --git a/source/AndroidResolver/AndroidResolver.csproj b/source/AndroidResolver/AndroidResolver.csproj
index 08059780..0407749b 100644
--- a/source/AndroidResolver/AndroidResolver.csproj
+++ b/source/AndroidResolver/AndroidResolver.csproj
@@ -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" />
diff --git a/source/AndroidResolver/test/AndroidResolverIntegrationTests.csproj b/source/AndroidResolver/test/AndroidResolverIntegrationTests.csproj
index 4e6d28a1..80747e3e 100644
--- a/source/AndroidResolver/test/AndroidResolverIntegrationTests.csproj
+++ b/source/AndroidResolver/test/AndroidResolverIntegrationTests.csproj
@@ -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" />
diff --git a/source/IOSResolver/IOSResolver.csproj b/source/IOSResolver/IOSResolver.csproj
index e16e2abf..e8e5f903 100644
--- a/source/IOSResolver/IOSResolver.csproj
+++ b/source/IOSResolver/IOSResolver.csproj
@@ -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>
diff --git a/source/IntegrationTester/IntegrationTester.csproj b/source/IntegrationTester/IntegrationTester.csproj
index 6faa768d..471735d7 100644
--- a/source/IntegrationTester/IntegrationTester.csproj
+++ b/source/IntegrationTester/IntegrationTester.csproj
@@ -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" />
diff --git a/source/JarResolverLib/JarResolverLib.csproj b/source/JarResolverLib/JarResolverLib.csproj
index 2c43e509..1de23b22 100644
--- a/source/JarResolverLib/JarResolverLib.csproj
+++ b/source/JarResolverLib/JarResolverLib.csproj
@@ -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>
@@ -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" />
diff --git a/source/JarResolverTests/JarResolverTests.csproj b/source/JarResolverTests/JarResolverTests.csproj
index 4a9acd0d..0518122a 100644
--- a/source/JarResolverTests/JarResolverTests.csproj
+++ b/source/JarResolverTests/JarResolverTests.csproj
@@ -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>
@@ -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" />
diff --git a/source/PackageManagerResolver/PackageManagerResolver.csproj b/source/PackageManagerResolver/PackageManagerResolver.csproj
index dc3963f5..f5d82a6c 100644
--- a/source/PackageManagerResolver/PackageManagerResolver.csproj
+++ b/source/PackageManagerResolver/PackageManagerResolver.csproj
@@ -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" />
diff --git a/source/PackageManagerResolver/test/PackageManagerClientIntegrationTests.csproj b/source/PackageManagerResolver/test/PackageManagerClientIntegrationTests.csproj
index c3e407bb..9fcf5508 100644
--- a/source/PackageManagerResolver/test/PackageManagerClientIntegrationTests.csproj
+++ b/source/PackageManagerResolver/test/PackageManagerClientIntegrationTests.csproj
@@ -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>
@@ -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>
diff --git a/source/PackageManagerResolver/test/PackageMigratorIntegrationTests.csproj b/source/PackageManagerResolver/test/PackageMigratorIntegrationTests.csproj
index 8b99f876..7727e130 100644
--- a/source/PackageManagerResolver/test/PackageMigratorIntegrationTests.csproj
+++ b/source/PackageManagerResolver/test/PackageMigratorIntegrationTests.csproj
@@ -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>
@@ -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>
diff --git a/source/PackageManagerResolver/unit_tests/PackageManagerResolverTests.csproj b/source/PackageManagerResolver/unit_tests/PackageManagerResolverTests.csproj
index fca6aba1..3abf2a61 100644
--- a/source/PackageManagerResolver/unit_tests/PackageManagerResolverTests.csproj
+++ b/source/PackageManagerResolver/unit_tests/PackageManagerResolverTests.csproj
@@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Google.PackageManagerResolver.Tests</RootNamespace>
<AssemblyName>Google.PackageManagerResolverTests</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<ReleaseVersion>1.2</ReleaseVersion>
<ProductVersion>12.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
@@ -22,34 +22,42 @@
<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>
- <PropertyGroup>
- <NUnityHintPath>..\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>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="src\PackageManifestModifierTest.cs" />
- <Compile Include="src\PackageManagerRegistryTest.cs" />
- <Compile Include="src\XmlPackageManagerRegistriesTest.cs" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <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>
+ <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>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="src\PackageManifestModifierTest.cs" />
+ <Compile Include="src\PackageManagerRegistryTest.cs" />
+ <Compile Include="src\XmlPackageManagerRegistriesTest.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="..\PackageManagerResolver.csproj">
+ <Project>{77EBE819-CBE6-4CA8-A791-ED747EA29D30}</Project>
+ <Name>PackageManagerResolver</Name>
+ </ProjectReference>
+ </ItemGroup>
</Project>
diff --git a/source/VersionHandler/VersionHandler.csproj b/source/VersionHandler/VersionHandler.csproj
index 47e193fc..0dca597a 100644
--- a/source/VersionHandler/VersionHandler.csproj
+++ b/source/VersionHandler/VersionHandler.csproj
@@ -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" />
diff --git a/source/VersionHandlerImpl/VersionHandlerImpl.csproj b/source/VersionHandlerImpl/VersionHandlerImpl.csproj
index b4c08884..c41c0c18 100644
--- a/source/VersionHandlerImpl/VersionHandlerImpl.csproj
+++ b/source/VersionHandlerImpl/VersionHandlerImpl.csproj
@@ -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" />
diff --git a/source/VersionHandlerImpl/unit_tests/VersionHandlerImplTests.csproj b/source/VersionHandlerImpl/unit_tests/VersionHandlerImplTests.csproj
index a9301e0d..f4682f1e 100644
--- a/source/VersionHandlerImpl/unit_tests/VersionHandlerImplTests.csproj
+++ b/source/VersionHandlerImpl/unit_tests/VersionHandlerImplTests.csproj
@@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Google.VersionHandlerImpl.Tests</RootNamespace>
<AssemblyName>Google.VersionHandlerImplTests</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<ReleaseVersion>1.2</ReleaseVersion>
<ProductVersion>12.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
@@ -22,34 +22,34 @@
<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>
- <PropertyGroup>
- <NUnityHintPath>..\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>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="src\EditorMeasurementTest.cs" />
- <Compile Include="src\ProjectSettingsTest.cs" />
- <Compile Include="src\FileUtilsTest.cs" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <ProjectReference Include="..\VersionHandlerImpl.csproj">
- <Project>{1E162334-8EA2-440A-9B3A-13FD8FE5C22E}</Project>
- <Name>VersionHandlerImpl</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>
+ <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>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="src\EditorMeasurementTest.cs" />
+ <Compile Include="src\ProjectSettingsTest.cs" />
+ <Compile Include="src\FileUtilsTest.cs" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <ProjectReference Include="..\VersionHandlerImpl.csproj">
+ <Project>{1E162334-8EA2-440A-9B3A-13FD8FE5C22E}</Project>
+ <Name>VersionHandlerImpl</Name>
+ </ProjectReference>
+ </ItemGroup>
</Project>