More build fixes

GitForUnity.sln

@@ -29,10 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommandLine", "tests\Comman
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestWebServer", "tests\TestWebServer\TestWebServer.csproj", "{3DD3451C-30FA-4294-A3A9-1E080342F867}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "packaging", "packaging", "{B50B646C-3B86-4BDA-9F2B-766F96608CE0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreateUnityPackages", "packaging\CreateUnityPackages\CreateUnityPackages.csproj", "{7DEF4226-7740-457F-9199-34174C49A978}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

appveyor.yml

@@ -44,8 +44,8 @@ on_success:
     Add-Content $commitfile $appveyor_repo_commit
 
     $packageDir="$($env:appveyor_build_folder)\build\packages"
-    $gitpackage="com.unity.version-control.git"
+    $gitpackage="com.unity.git.api"
-    $gituipackage="com.unity.version-control.git.ui"
+    $gituipackage="com.unity.git.ui"
 
     $gitzip="$($env:appveyor_build_folder)\$gitpackage-$longVersion.zip"
     $gituizip="$($env:appveyor_build_folder)\$gituipackage-$longVersion.zip"

packaging/CreateUnityPackages/CreateUnityPackages.csproj

@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <SolutionDir Condition=" '$(SolutionDir)' == '' ">..\..\</SolutionDir>
-    <AssemblyName>deleteme</AssemblyName>
-    <TargetFramework>net471</TargetFramework>
-    <ProjectGuid>{7DEF4226-7740-457F-9199-34174C49A978}</ProjectGuid>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\common\packaging.targets" />
-</Project>

packaging/CreateUnityPackages/CreateUnityPackages.v3.ncrunchproject

@@ -1,7 +0,0 @@
-<ProjectConfiguration>
-  <Settings>
-    <HiddenComponentWarnings />
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
-    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
-  </Settings>
-</ProjectConfiguration>

packaging/create-unity-packages/run.ps1

@@ -22,6 +22,10 @@ Param(
     $OutputFolder,
     [string]
     $PackageName,
+    [string]
+    $Version,
+    [string]
+    $Ignores,
     [switch]
     $Trace = $false
 )
@@ -35,7 +39,11 @@ if ($Trace) {
 
 Push-Location $scriptsDirectory
 
-Run-Command -Fatal { & node ..\yarn.js install --prefer-offline }
+try {
-Run-Command -Fatal { & node ..\yarn.js start --path $PathToPackage --out $OutputFolder --file $PackageName }
 
-Pop-Location
+Run-Command -Fatal { & node ..\yarn.js install --prefer-offline }
+Run-Command -Fatal { & node ..\yarn.js start --path "$PathToPackage" --out "$OutputFolder" --name "$PackageName" --version "$Version" --ignores "$Ignores" }
+
+} finally {
+    Pop-Location
+}

tests/IntegrationTests/packages.config

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentAssertions" version="2.2.0.0" targetFramework="net35" requireReinstallation="true" />
-  <package id="NCrunch.Framework" version="3.3.0.6" targetFramework="net35" requireReinstallation="true" />
-  <package id="NSubstitute" version="1.10.0.0" targetFramework="net35" requireReinstallation="true" />
-  <package id="NUnit" version="2.6.4" targetFramework="net35" />
-</packages>

tests/TaskSystemIntegrationTests/packages.config

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentAssertions" version="2.2.0.0" targetFramework="net35" requireReinstallation="true" />
-  <package id="NSubstitute" version="1.10.0.0" targetFramework="net35" requireReinstallation="true" />
-  <package id="NUnit" version="2.6.4" targetFramework="net35" />
-  <package id="NUnit.Runners" version="2.6.4" targetFramework="net35" />
-  <package id="NUnitTestAdapter" version="2.1.1" targetFramework="net35" />
-</packages>

tests/TestUtils/TestUtils.csproj

@@ -12,6 +12,7 @@
     <PackageReference Include="FluentAssertions" Version="5.7.0" />
     <PackageReference Include="NSubstitute" Version="4.2.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.24" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\com.unity.git.api\Api\Api.csproj" />

tests/TestUtils/packages.config

@@ -1,6 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="2.2.0.0" targetFramework="net35" requireReinstallation="true" />
+  <package id="Nerdbank.GitVersioning" version="3.0.24" />
-  <package id="NSubstitute" version="1.10.0.0" targetFramework="net35" requireReinstallation="true" />
-  <package id="NUnit" version="2.6.4" targetFramework="net35" />
 </packages>

tests/TestWebServer/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" requireReinstallation="true" />
-</packages>

tests/UnitTests/packages.config

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentAssertions" version="2.2.0.0" targetFramework="net35" requireReinstallation="true" />
-  <package id="NCrunch.Framework" version="3.3.0.6" targetFramework="net35" requireReinstallation="true" />
-  <package id="NSubstitute" version="1.10.0.0" targetFramework="net35" requireReinstallation="true" />
-  <package id="NUnit" version="2.6.4" targetFramework="net35" />
-</packages>