Add support for overriding package versions with DotNetPackageVersionPropsPath (#482)

2017-11-22 11:41:44 -06:00 · 2017-11-22 11:41:44 -06:00 · 5bb678e2d7
--- a/BuildTools.sln
+++ b/BuildTools.sln
@ -14,7 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{BF3E9C90
 		build.cmd = build.cmd
 		build.ps1 = build.ps1
 		build.sh = build.sh
-		build\common.props = build\common.props
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
 		CONTRIBUTING.md = CONTRIBUTING.md
 		build\dependencies.props = build\dependencies.props
 		global.json = global.json
@ -60,7 +61,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KoreBuild.FunctionalTests",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{76ABA507-B453-43BA-BA98-FA3FDDC6DD39}"
 	ProjectSection(SolutionItems) = preProject
-		build\common.props = build\common.props
 		build\dependencies.props = build\dependencies.props
 		build\repo.beforecommon.props = build\repo.beforecommon.props
 		build\repo.props = build\repo.props
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -1,11 +1,11 @@
 <Project>
-  <Import Project="sources.props" />
-  <Import Project="dependencies.props" />
-  <Import Project="..\version.props" />
+  <Import Project="version.props" />
+  <Import Project="build\dependencies.props" />
+  <Import Project="build\sources.props" />

  <PropertyGroup>
    <!-- these imports substitute for a package reference to Internal.AspNetCore.Sdk -->
-    <_AspNetToolsSdkPath>$([MSBuild]::GetDirectoryNameOfFileAbove($(MsBuildThisFileDirectory), NuGet.Config))\src\Internal.AspNetCore.Sdk</_AspNetToolsSdkPath>
+    <_AspNetToolsSdkPath>$(MSBuildThisFileDirectory)src\Internal.AspNetCore.Sdk</_AspNetToolsSdkPath>
    <CustomAfterMicrosoftCommonTargets>$(_AspNetToolsSdkPath)\build\Internal.AspNetCore.Sdk.targets</CustomAfterMicrosoftCommonTargets>
    <CustomAfterMicrosoftCommonCrossTargetingTargets>$(_AspNetToolsSdkPath)\buildMultiTargeting\Internal.AspNetCore.Sdk.targets</CustomAfterMicrosoftCommonCrossTargetingTargets>
    <GenerateCommitHashAttribute Condition="'$(CommitHash)'==''">false</GenerateCommitHashAttribute>
@ -23,6 +23,7 @@
  <PropertyGroup>
    <RepositoryUrl>https://github.com/aspnet/BuildTools</RepositoryUrl>
    <RepositoryType>git</RepositoryType>
+    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
  </PropertyGroup>

 </Project>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -0,0 +1 @@
+<Project />
--- a/build/dependencies.props
+++ b/build/dependencies.props
@ -1,20 +1,22 @@
 <Project>
  <PropertyGroup>
-    <HtmlAgilityPackVersion>1.5.1</HtmlAgilityPackVersion>
-    <!-- This one is OK for console tools that bundle their own version of JSON.NET -->
-    <JsonNetVersion>10.0.1</JsonNetVersion>
+    <HtmlAgilityPackPackageVersion>1.5.1</HtmlAgilityPackPackageVersion>
    <MicrosoftDotNetBuildTasksFeedPackageVersion>2.1.0-prerelease-02221-01</MicrosoftDotNetBuildTasksFeedPackageVersion>
    <MicrosoftDotNetPlatformAbstractionsVersion>2.0.0</MicrosoftDotNetPlatformAbstractionsVersion>
    <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
    <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-25907-02</MicrosoftNETCoreApp21PackageVersion>
-    <MonoCecilVersion>0.10.0-beta6</MonoCecilVersion>
-    <MoqVersion>4.7.99</MoqVersion>
-    <NuGetPackagesVersion>4.3.0</NuGetPackagesVersion>
-    <SystemCollectionsImmutableVersion>1.4.0</SystemCollectionsImmutableVersion>
-    <SystemReflectionMetadataVersion>1.5.0</SystemReflectionMetadataVersion>
-    <TestSdkVersion>15.3.0</TestSdkVersion>
+    <MicrosoftNETTestSdkPackageVersion>15.5.0</MicrosoftNETTestSdkPackageVersion>
+    <MonoCecilPackageVersion>0.10.0-beta6</MonoCecilPackageVersion>
+    <MoqPackageVersion>4.7.99</MoqPackageVersion>
+    <!-- This one is OK for console tools that bundle their own version of JSON.NET -->
+    <NewtonsoftJsonPackageVersion>10.0.1</NewtonsoftJsonPackageVersion>
+    <NuGetPackagingPackageVersion>4.3.0</NuGetPackagingPackageVersion>
+    <NuGetProjectModelPackageVersion>4.3.0</NuGetProjectModelPackageVersion>
+    <SystemCollectionsImmutablePackageVersion>1.4.0</SystemCollectionsImmutablePackageVersion>
+    <SystemReflectionMetadataPackageVersion>1.5.0</SystemReflectionMetadataPackageVersion>
    <VSWherePackageVersion>2.2.7</VSWherePackageVersion>
-    <XunitVersion>2.3.1</XunitVersion>
+    <XunitPackageVersion>2.3.1</XunitPackageVersion>
+    <XunitRunnerVisualStudioPackageVersion>2.3.1</XunitRunnerVisualStudioPackageVersion>
  </PropertyGroup>

  <!--
@ -24,8 +26,20 @@
    as long as the version we compile for is binary compatible with what the .NET Core SDK uses.
  -->
  <PropertyGroup>
-    <MicrosoftBuildVersion>15.5.0-preview-000172-1103937</MicrosoftBuildVersion>
-    <JsonNetInMSBuildVersion>9.0.1</JsonNetInMSBuildVersion>
-    <NuGetInMSBuildVersion>4.5.0-preview2-4529</NuGetInMSBuildVersion>
+    <MicrosoftBuildPackageVersion>15.5.0-preview-000172-1103937</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildFrameworkPackageVersion>15.5.0-preview-000172-1103937</MicrosoftBuildFrameworkPackageVersion>
+    <MicrosoftBuildUtilitiesCorePackageVersion>15.5.0-preview-000172-1103937</MicrosoftBuildUtilitiesCorePackageVersion>
+    <MicrosoftBuildTasksCorePackageVersion>15.5.0-preview-000172-1103937</MicrosoftBuildTasksCorePackageVersion>
+    <Tooling_NewtonsoftJsonPackageVersion>9.0.1</Tooling_NewtonsoftJsonPackageVersion>
+    <Tooling_NuGetBuildTasksPackageVersion>4.5.0-preview2-4529</Tooling_NuGetBuildTasksPackageVersion>
  </PropertyGroup>
+
+  <!-- These are set to flow into RepoTasks.csproj -->
+  <PropertyGroup>
+    <MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
+    <JsonInMSBuildVersion>$(Tooling_NewtonsoftJsonPackageVersion)</JsonInMSBuildVersion>
+    <NuGetInMSBuildVersion>$(Tooling_NuGetBuildTasksPackageVersion)</NuGetInMSBuildVersion>
+  </PropertyGroup>
+
+  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
 </Project>
--- a/build/tasks/RepoTasks.csproj
+++ b/build/tasks/RepoTasks.csproj
@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\sources.props" />
  <Import Project="$(RepoTasksSdkPath)\Sdk.props" Condition="'$(RepoTasksSdkPath)' != '' "/>

  <PropertyGroup>
--- a/files/KoreBuild/msbuild/KoreBuild.RepoTasks.Sdk/Sdk/Sdk.props
+++ b/files/KoreBuild/msbuild/KoreBuild.RepoTasks.Sdk/Sdk/Sdk.props
@ -11,14 +11,14 @@
      The dependency versions here don't matter as long as the version is binary compatible with the version of MSBuild and NuGet
      already embedded in Microsoft.NET.Sdk. These are essentially reference assemblies.
    -->
-    <MicrosoftBuildVersion>15.3.409</MicrosoftBuildVersion>
+    <MicrosoftBuildVersion Condition="'$(MicrosoftBuildVersion)' == ''">15.3.409</MicrosoftBuildVersion>

    <!--
      Version must be less than or equal to what ships in with Microsoft.NET.Sdk.
      See https://github.com/dotnet/sdk/blob/release/2.0.0/build/DependencyVersions.props
     -->
-    <JsonInMSBuildVersion>9.0.1</JsonInMSBuildVersion>
-    <NuGetInMSBuildVersion>4.3.0</NuGetInMSBuildVersion>
+    <JsonInMSBuildVersion Condition="'$(JsonInMSBuildVersion)' == ''">9.0.1</JsonInMSBuildVersion>
+    <NuGetInMSBuildVersion Condition="'$(NuGetInMSBuildVersion)' == ''">4.3.0</NuGetInMSBuildVersion>
  </PropertyGroup>

 </Project>
--- a/modules/BuildTools.Tasks/BuildTools.Tasks.csproj
+++ b/modules/BuildTools.Tasks/BuildTools.Tasks.csproj
@ -17,11 +17,11 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" PrivateAssets="All" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetInMSBuildVersion)" />
-    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
-    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(Tooling_NewtonsoftJsonPackageVersion)" />
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" />
  </ItemGroup>

 </Project>
--- a/modules/Directory.Build.props
+++ b/modules/Directory.Build.props
@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\build\common.props" />
+  <Import Project="..\Directory.Build.props" />

  <PropertyGroup>
    <IsPackable>false</IsPackable>
--- a/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj
+++ b/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj
@ -16,12 +16,12 @@

  <ItemGroup>
    <!-- set as private assets all so these assemblies get resolved from the version bundled in the .NET Core SDK -->
-    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" PrivateAssets="All" />
-    <PackageReference Include="NuGet.Build.Tasks" Version="$(NuGetInMSBuildVersion)" PrivateAssets="All" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetInMSBuildVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCorePackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="NuGet.Build.Tasks" Version="$(Tooling_NuGetBuildTasksPackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(Tooling_NewtonsoftJsonPackageVersion)" PrivateAssets="All" />
    <PackageReference Include="vswhere" Version="$(VSWherePackageVersion)" PrivateAssets="All" />
  </ItemGroup>

--- a/modules/NuGetPackageVerifier/console/NuGetPackageVerifier.Console.csproj
+++ b/modules/NuGetPackageVerifier/console/NuGetPackageVerifier.Console.csproj
@ -15,10 +15,10 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="$(HtmlAgilityPackVersion)" />
-    <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
-    <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagesVersion)" />
+    <PackageReference Include="HtmlAgilityPack" Version="$(HtmlAgilityPackPackageVersion)" />
+    <PackageReference Include="Mono.Cecil" Version="$(MonoCecilPackageVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
+    <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingPackageVersion)" />
  </ItemGroup>

  <Target Name="GetRuntimeVersion" Returns="$(RuntimeFrameworkVersion)" />
--- a/modules/NuGetPackageVerifier/msbuild/NuGetPackageVerifier.Task.csproj
+++ b/modules/NuGetPackageVerifier/msbuild/NuGetPackageVerifier.Task.csproj
@ -11,8 +11,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" PrivateAssets="All" />
  </ItemGroup>

 </Project>
--- a/src/ApiCheck.Console/ApiCheck.Console.csproj
+++ b/src/ApiCheck.Console/ApiCheck.Console.csproj
@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\build\common.props" />

  <PropertyGroup>
    <TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks>
@ -23,8 +22,8 @@
  <ItemGroup>
    <Compile Include="..\..\shared\Microsoft.Extensions.CommandLineUtils.Sources\**\*.cs" />

-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
-    <PackageReference Include="NuGet.ProjectModel" Version="$(NuGetPackagesVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
+    <PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelPackageVersion)" />
    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsVersion)" />
  </ItemGroup>

--- a/src/ApiCheck.Task/ApiCheck.Task.csproj
+++ b/src/ApiCheck.Task/ApiCheck.Task.csproj
@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\build\common.props" />

  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
@ -13,7 +12,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
  </ItemGroup>
 </Project>
--- a/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.csproj
+++ b/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <PackageId>Internal.AspNetCore.Sdk</PackageId>
    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
@ -24,11 +22,11 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetInMSBuildVersion)" />
-    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" PrivateAssets="All" />
-    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(Tooling_NewtonsoftJsonPackageVersion)" />
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" PrivateAssets="All" />
  </ItemGroup>

  <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
--- a/test/ApiCheck.Test/ApiCheck.Test.csproj
+++ b/test/ApiCheck.Test/ApiCheck.Test.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
@ -14,9 +12,9 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
  </ItemGroup>

 </Project>
--- a/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj
+++ b/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <TargetFrameworks>netstandard1.6;net452;netcoreapp2.1</TargetFrameworks>
    <IsPackable>false</IsPackable>
--- a/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj
+++ b/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <TargetFrameworks>netstandard1.6;net452;netcoreapp2.1</TargetFrameworks>
    <IsPackable>false</IsPackable>
--- a/test/BuildTools.Tasks.Tests/BuildTools.Tasks.Tests.csproj
+++ b/test/BuildTools.Tasks.Tests/BuildTools.Tasks.Tests.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <TargetFramework>netcoreapp2.0</TargetFramework>
  </PropertyGroup>
@ -13,12 +11,12 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
  </ItemGroup>

  <ItemGroup>
--- a/test/KoreBuild.FunctionalTests/KoreBuild.FunctionalTests.csproj
+++ b/test/KoreBuild.FunctionalTests/KoreBuild.FunctionalTests.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-<Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <TargetFramework>netcoreapp2.0</TargetFramework>
  </PropertyGroup>
@ -11,9 +9,9 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
  </ItemGroup>

 </Project>
--- a/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj
+++ b/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <TargetFramework>netcoreapp2.0</TargetFramework>
  </PropertyGroup>
@ -13,16 +11,16 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="NuGet.Build.Tasks" Version="$(NuGetInMSBuildVersion)" />
+    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCorePackageVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="NuGet.Build.Tasks" Version="$(Tooling_NuGetBuildTasksPackageVersion)" />
    <PackageReference Include="vswhere" Version="$(VsWherePackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
  </ItemGroup>

  <ItemGroup>