Merge pull request #454 from dotnet/dev/jmarolf/central-package-mange…

…ment use central package management
dotnet · Oct 3, 2022 · 7c7e770 · 7c7e770
2 parents 3fa980a + 51e29cb
commit 7c7e770
Show file tree

Hide file tree

Showing 13 changed files with 106 additions and 25 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -15,4 +15,13 @@
     <DiscoverEditorConfigFiles>true</DiscoverEditorConfigFiles>
   </PropertyGroup>
 
+  <!-- Nuget settings -->
+  <PropertyGroup>
+    <!-- Use Directory.Packages.props for nuget package versions -->
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <!-- Enable faster restore times -->
+    <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -0,0 +1,18 @@
+<Project>
+
+  <ItemGroup>
+    <PackageVersion Include="coverlet.collector" Version="1.3.0" />
+    <PackageVersion Include="Microsoft.Build.Locator" Version="1.4.1" />
+    <PackageVersion Include="Microsoft.Build" Version="16.7" />
+    <PackageVersion Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.21" />
+    <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" />
+    <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0-rc.1.20451.14" />
+    <PackageVersion Include="Moq" Version="4.14.6" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageVersion Include="NuGet.Versioning" Version="5.8.0-preview.3.6823" />
+    <PackageVersion Include="System.Collections.Immutable" Version="5.0.0-rc.1.20451.14" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta1.20371.2" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="5.0.0-rc.1.20451.14" />
+    <PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0-rc.1.20451.14" />
+  </ItemGroup>
+</Project>
diff --git a/src/MSBuild.Abstractions/MSBuild.Abstractions.csproj b/src/MSBuild.Abstractions/MSBuild.Abstractions.csproj
@@ -5,18 +5,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
-    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
+    <PackageReference Include="Microsoft.Build.Locator" />
+    <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Win32.Registry" />
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" />
+    <PackageReference Include="System.Security.Principal.Windows" />
 
     <!-- These packages are only available on .NET Framework, but are solely there to call into a COM service and work fine on .NET Core -->
-    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" PrivateAssets="all">
+    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets="all">
       <NoWarn>NU1701</NoWarn>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.21" PrivateAssets="all">
+    <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" PrivateAssets="all">
       <NoWarn>NU1701</NoWarn>
     </PackageReference>
   </ItemGroup>

diff --git a/src/MSBuild.Conversion.Facts/MSBuild.Conversion.Facts.csproj b/src/MSBuild.Conversion.Facts/MSBuild.Conversion.Facts.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
+    <PackageReference Include="System.Collections.Immutable" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MSBuild.Conversion.Project/MSBuild.Conversion.Project.csproj b/src/MSBuild.Conversion.Project/MSBuild.Conversion.Project.csproj
@@ -17,10 +17,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
-    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
+    <PackageReference Include="Microsoft.Win32.Registry" />
+    <PackageReference Include="System.Collections.Immutable" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" />
+    <PackageReference Include="System.Security.Principal.Windows" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MSBuild.Conversion.SDK/MSBuild.Conversion.SDK.csproj b/src/MSBuild.Conversion.SDK/MSBuild.Conversion.SDK.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
-    <PackageReference Include="NuGet.Versioning" Version="$(NuGetVersioningVersion)" />
+    <PackageReference Include="Microsoft.Build.Locator" />
+    <PackageReference Include="NuGet.Versioning" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/try-convert/try-convert.csproj b/src/try-convert/try-convert.csproj
@@ -20,12 +20,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
-    <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
+    <PackageReference Include="System.CommandLine" />
+    <PackageReference Include="Microsoft.Build.Locator" />
+    <PackageReference Include="Microsoft.Win32.Registry" />
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" />
+    <PackageReference Include="System.Security.Principal.Windows" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/end-to-end/Directory.Build.props b/tests/end-to-end/Directory.Build.props
@@ -14,4 +14,13 @@
     <DiscoverEditorConfigFiles>true</DiscoverEditorConfigFiles>
   </PropertyGroup>
 
+  <!-- Nuget settings -->
+  <PropertyGroup>
+    <!-- Use Directory.Packages.props for nuget package versions -->
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <!-- Enable faster restore times -->
+    <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
+  </PropertyGroup>
+
 </Project>
diff --git a/tests/end-to-end/Directory.Packages.props b/tests/end-to-end/Directory.Packages.props
@@ -0,0 +1,18 @@
+<Project>
+
+  <ItemGroup>
+    <PackageVersion Include="coverlet.collector" Version="1.3.0" />
+    <PackageVersion Include="Microsoft.Build.Locator" Version="1.4.1" />
+    <PackageVersion Include="Microsoft.Build" Version="16.7" />
+    <PackageVersion Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.21" />
+    <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" />
+    <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0-rc.1.20451.14" />
+    <PackageVersion Include="Moq" Version="4.14.6" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageVersion Include="NuGet.Versioning" Version="5.8.0-preview.3.6823" />
+    <PackageVersion Include="System.Collections.Immutable" Version="5.0.0-rc.1.20451.14" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta1.20371.2" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="5.0.0-rc.1.20451.14" />
+    <PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0-rc.1.20451.14" />
+  </ItemGroup>
+</Project>
diff --git a/tests/unit/Directory.Build.props b/tests/unit/Directory.Build.props
@@ -14,4 +14,13 @@
     <DiscoverEditorConfigFiles>true</DiscoverEditorConfigFiles>
   </PropertyGroup>
 
+  <!-- Nuget settings -->
+  <PropertyGroup>
+    <!-- Use Directory.Packages.props for nuget package versions -->
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <!-- Enable faster restore times -->
+    <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
+  </PropertyGroup>
+
 </Project>
diff --git a/tests/unit/Directory.Packages.props b/tests/unit/Directory.Packages.props
@@ -0,0 +1,18 @@
+<Project>
+
+  <ItemGroup>
+    <PackageVersion Include="coverlet.collector" Version="1.3.0" />
+    <PackageVersion Include="Microsoft.Build.Locator" Version="1.4.1" />
+    <PackageVersion Include="Microsoft.Build" Version="16.7" />
+    <PackageVersion Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.21" />
+    <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" />
+    <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0-rc.1.20451.14" />
+    <PackageVersion Include="Moq" Version="4.14.6" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageVersion Include="NuGet.Versioning" Version="5.8.0-preview.3.6823" />
+    <PackageVersion Include="System.Collections.Immutable" Version="5.0.0-rc.1.20451.14" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta1.20371.2" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="5.0.0-rc.1.20451.14" />
+    <PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0-rc.1.20451.14" />
+  </ItemGroup>
+</Project>
diff --git a/tests/unit/PackageConversion.Tests/PackageConversion.Tests.csproj b/tests/unit/PackageConversion.Tests/PackageConversion.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
+    <PackageReference Include="coverlet.collector" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/unit/ProjectConversion.Tests/ProjectConversion.Tests.csproj b/tests/unit/ProjectConversion.Tests/ProjectConversion.Tests.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
+    <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="System.Collections.Immutable" />
   </ItemGroup>
 
   <ItemGroup>