Build: Use GlobalPackageReference; NR: Update packages

jbe2277 · Jan 26, 2025 · a32c46b · a32c46b
1 parent 5ad7247
commit a32c46b
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 37 deletions.
diff --git a/src/NewsReader/Directory.Build.props b/src/NewsReader/Directory.Build.props
@@ -20,7 +20,7 @@
         <PackageReference Include="GitHubActionsTestLogger" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
         <PackageReference Include="xunit.v3" />
-        <PackageReference Include="xunit.runner.visualstudio" />
+        <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
       </ItemGroup>
     </When>
     <Otherwise>
@@ -30,13 +30,6 @@
     </Otherwise>
   </Choose>
 
-  <ItemGroup>
-    <PackageReference Include="MinVer" >
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup>
     <Using Include="System.Collections.ObjectModel" />
     <Using Include="System.Collections.Specialized" />

diff --git a/src/NewsReader/Directory.Packages.props b/src/NewsReader/Directory.Packages.props
@@ -4,9 +4,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- Build -->
-    <PackageVersion Include="MinVer" Version="6.0.0" />
-
     <!-- App -->
     <PackageVersion Include="Autofac" Version="8.2.0" />
     <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
@@ -20,8 +17,12 @@
     <!-- Unit tests -->
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageVersion Include="xunit.v3" Version="1.0.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
+    <PackageVersion Include="xunit.v3" Version="1.0.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
     <PackageVersion Include="System.Waf.UnitTesting.Core" Version="8.0.2-alpha.0.81" />
   </ItemGroup>
+
+  <ItemGroup>
+    <GlobalPackageReference Include="MinVer" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/src/Samples.UITest/BookLibrary.Test/BookLibrary.Test.csproj b/src/Samples.UITest/BookLibrary.Test/BookLibrary.Test.csproj
@@ -7,10 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit.runner.visualstudio">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="xunit.v3" />
   </ItemGroup>
 

diff --git a/src/Samples.UITest/InformationManager.Test/InformationManager.Test.csproj b/src/Samples.UITest/InformationManager.Test/InformationManager.Test.csproj
@@ -7,10 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit.runner.visualstudio">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="xunit.v3" />
   </ItemGroup>
 

diff --git a/src/Samples.UITest/Writer.Test/Writer.Test.csproj b/src/Samples.UITest/Writer.Test/Writer.Test.csproj
@@ -7,10 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit.runner.visualstudio">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="xunit.v3" />
   </ItemGroup>
 

diff --git a/src/System.Waf/Directory.Build.props b/src/System.Waf/Directory.Build.props
@@ -10,10 +10,6 @@
     <MinVerTagPrefix>v</MinVerTagPrefix>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MinVer" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-  </ItemGroup>
-
   <Choose>
     <When Condition="$(MSBuildProjectName.EndsWith('Test'))">
       <PropertyGroup>

diff --git a/src/System.Waf/Directory.Packages.props b/src/System.Waf/Directory.Packages.props
@@ -4,10 +4,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- Build -->    
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="MinVer" Version="6.0.0" />
-
     <!-- WAF -->
     <PackageVersion Include="System.ComponentModel.Annotations" Version="4.5.0" />
     <PackageVersion Include="System.ComponentModel.Composition" Version="4.7.0" />
@@ -26,4 +22,9 @@
     <PackageVersion Include="MSTest.TestAdapter" Version="3.6.4" />
     <PackageVersion Include="MSTest.TestFramework" Version="3.6.4" />
   </ItemGroup>
+
+  <ItemGroup>
+    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <GlobalPackageReference Include="MinVer" Version="6.0.0" />    
+  </ItemGroup>
 </Project>
diff --git a/src/System.Waf/System.Waf/Directory.Build.props b/src/System.Waf/System.Waf/Directory.Build.props
@@ -19,10 +19,6 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)../NullableAttributes.cs" />
   </ItemGroup>