Use central package versions! (#38)

jeffkl · web-flow · commit 231e5ec6ee6f · 2018-05-31T09:18:21.000-07:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,20 +14,4 @@
     <RepositoryUrl>https://github.com/Microsoft/MSBuildSdks.git</RepositoryUrl>
   </PropertyGroup>
 
-  <ItemDefinitionGroup>
-    <PackageReference>
-      <PrivateAssets>Compile</PrivateAssets>
-    </PackageReference>
-  </ItemDefinitionGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.23" PrivateAssets="All" Condition=" '$(EnableGitVersioning)' != 'false' " />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(EnableStyleCop)' != 'false' ">
-    <PackageReference Include="StyleCop.Analyzers" Version="[1.0.2]" PrivateAssets="All" />
-    <Compile Include="..\GlobalSuppressions.cs" Visible="False" />
-    <AdditionalFiles Include="..\..\stylecop.json" Visible="False" />
-  </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -50,4 +50,6 @@
     </PropertyGroup>
   </Target>
 
+  <Import Project="Sdk.targets" Sdk="Microsoft.Build.CentralPackageVersions" />
+
 </Project>
diff --git a/MSBuildSdks.sln b/MSBuildSdks.sln
@@ -11,9 +11,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DC479DC1
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.rsp = Directory.Build.rsp
 		Directory.Build.targets = Directory.Build.targets
+		dirs.proj = dirs.proj
 		global.json = global.json
 		src\GlobalSuppressions.cs = src\GlobalSuppressions.cs
 		NuGet.config = NuGet.config
+		Packages.props = Packages.props
 		stylecop.json = stylecop.json
 		version.json = version.json
 	EndProjectSection
@@ -28,7 +30,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest.Common", "src\Unit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.NoTargets.UnitTests", "src\NoTargets.UnitTests\Microsoft.Build.NoTargets.UnitTests.csproj", "{FE997E79-94D9-4663-9727-ABF40B67E1CF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.CentralPackageVersions.UnitTests", "src\CentralPackageVersions.UnitTests\Microsoft.Build.CentralPackageVersions.UnitTests.csproj", "{9D14030D-B050-48B0-82A4-9ADE28392533}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.CentralPackageVersions.UnitTests", "src\CentralPackageVersions.UnitTests\Microsoft.Build.CentralPackageVersions.UnitTests.csproj", "{9D14030D-B050-48B0-82A4-9ADE28392533}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Packages.props b/Packages.props
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemDefinitionGroup>
+    <PackageReference>
+      <!-- Do not share compile-time dependencies tranitively.  This requires that all projects reference all packages -->
+      <PrivateAssets>Compile</PrivateAssets>
+    </PackageReference>
+  </ItemDefinitionGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Build" Version="15.7.179" />
+    <PackageReference Update="Microsoft.Build.Framework" Version="15.7.179" />
+    <PackageReference Update="Microsoft.Build.Locator" Version="1.0.18" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Update="MSBuild.ProjectCreation" Version="1.1.4" />
+    <PackageReference Update="Shouldly" Version="3.0.0" />
+    <PackageReference Update="xunit" Version="2.3.1" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="2.1.23" Condition=" '$(EnableGitVersioning)' != 'false' " />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(EnableStyleCop)' != 'false' ">
+    <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
+    <Compile Include="..\GlobalSuppressions.cs" Visible="False" />
+    <AdditionalFiles Include="..\..\stylecop.json" Visible="False" />
+  </ItemGroup>
+
+</Project>
diff --git a/global.json b/global.json
@@ -1,5 +1,6 @@
 {
   "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "1.0.22"
+    "Microsoft.Build.CentralPackageVersions": "2.0.1",
+    "Microsoft.Build.Traversal": "1.0.34"
   }
 }
diff --git a/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj b/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj
@@ -6,14 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="15.7.179" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="15.7.179" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.0.13" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="MSBuild.ProjectCreation" Version="1.1.1" />
-    <PackageReference Include="Shouldly" Version="3.0.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Locator" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="MSBuild.ProjectCreation" />
+    <PackageReference Include="Shouldly" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj b/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj
@@ -6,14 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="15.7.179" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="15.7.179" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.0.13" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="MSBuild.ProjectCreation" Version="1.1.1" />
-    <PackageReference Include="Shouldly" Version="3.0.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Locator" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="MSBuild.ProjectCreation" />
+    <PackageReference Include="Shouldly" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj b/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj
@@ -6,14 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="15.7.179" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="15.7.179" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.0.13" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="MSBuild.ProjectCreation" Version="1.1.1" />
-    <PackageReference Include="Shouldly" Version="3.0.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Locator" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="MSBuild.ProjectCreation" />
+    <PackageReference Include="Shouldly" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/UnitTest.Common/UnitTest.Common.csproj b/src/UnitTest.Common/UnitTest.Common.csproj
@@ -6,13 +6,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.0.13" />
-    <PackageReference Include="MSBuild.ProjectCreation" Version="1.0.11" />
-    <PackageReference Include="Microsoft.Build" Version="15.7.179" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="15.7.179" ExcludeAssets="runtime" />
-    <PackageReference Include="Shouldly" Version="3.0.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.Build.Locator" />
+    <PackageReference Include="MSBuild.ProjectCreation" />
+    <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" />
+    <PackageReference Include="Shouldly" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"msbuild-sdks": {`
`3`		`- "Microsoft.Build.Traversal": "1.0.22"`
	`3`	`+ "Microsoft.Build.CentralPackageVersions": "2.0.1",`
	`4`	`+ "Microsoft.Build.Traversal": "1.0.34"`
`4`	`5`	`}`
`5`	`6`	`}`