update to 8.0.300 SDK (#9826)

dependabot · May 27, 2024 · a219622 · a219622
1 parent c6745da
commit a219622
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 5 deletions.
diff --git a/nuget/Dockerfile b/nuget/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/*
 
 # Install .NET SDK
-ARG DOTNET_SDK_VERSION=8.0.202
+ARG DOTNET_SDK_VERSION=8.0.300
 ARG DOTNET_SDK_INSTALL_URL=https://dot.net/v1/dotnet-install.sh
 ENV DOTNET_INSTALL_DIR=/usr/local/dotnet/current
 ENV DOTNET_NOLOGO=true

diff --git a/.../helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.Project.cs b/.../helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.Project.cs
@@ -91,6 +91,7 @@ await TestDiscoveryAsync(
                           </ItemGroup>
                         </Project>
                         """),
+                    ("Directory.Build.props", "<Project />"),
                     ("Directory.Packages.props", """
                         <Project Sdk="Microsoft.NET.Sdk">
                           <PropertyGroup>
@@ -108,6 +109,7 @@ await TestDiscoveryAsync(
                 expectedResult: new()
                 {
                     FilePath = "",
+                    ExpectedProjectCount = 2,
                     Projects = [
                         new()
                         {

diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.cs
@@ -135,6 +135,7 @@ await TestDiscoveryAsync(
                       </ItemGroup>
                     </Project>
                     """),
+                ("Directory.Build.props", "<Project />"),
                 ("Directory.Packages.props", """
                     <Project>
                       <PropertyGroup>
@@ -151,6 +152,7 @@ await TestDiscoveryAsync(
             expectedResult: new()
             {
                 FilePath = "src",
+                ExpectedProjectCount = 2,
                 Projects = [
                     new()
                     {
@@ -203,6 +205,7 @@ await TestDiscoveryAsync(
                       </ItemGroup>
                     </Project>
                     """),
+                ("Directory.Build.props", "<Project />"),
                 ("Directory.Packages.props", """
                     <Project>
                       <PropertyGroup>
@@ -274,6 +277,7 @@ await TestDiscoveryAsync(
             expectedResult: new()
             {
                 FilePath = "",
+                ExpectedProjectCount = 2,
                 Projects = [
                     new()
                     {

diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TemporaryDirectory.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TemporaryDirectory.cs
@@ -50,9 +50,14 @@ public static async Task<TemporaryDirectory> CreateWithContentsAsync(params Test
         var parentDirectory = Path.GetDirectoryName(temporaryDirectory.DirectoryPath)!;
 
         // prevent directory crawling
-        await File.WriteAllTextAsync(Path.Combine(parentDirectory, "Directory.Build.props"), "<Project />");
+        await File.WriteAllTextAsync(Path.Combine(parentDirectory, "Directory.Build.props"), """
+            <Project>
+              <PropertyGroup>
+                <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+              </PropertyGroup>
+            </Project>
+            """);
         await File.WriteAllTextAsync(Path.Combine(parentDirectory, "Directory.Build.targets"), "<Project />");
-        await File.WriteAllTextAsync(Path.Combine(parentDirectory, "Directory.Packages.props"), "<Project />");
 
         foreach (var (path, contents) in fileContents)
         {

diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.Sdk.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.Sdk.cs
@@ -674,6 +674,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     ("Directory.Packages.props", """
                         <Project>
                           <PropertyGroup>
@@ -739,6 +740,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     ("Directory.Packages.props", """
                         <Project>
                           <PropertyGroup>
@@ -1036,6 +1038,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     ("Directory.Packages.props", """
                         <Project>
                           <PropertyGroup>
@@ -1103,6 +1106,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     ("Directory.Packages.props", """
                         <Project>
                           <PropertyGroup>
@@ -1170,6 +1174,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     ("Directory.Packages.props", """
                         <Project>
                           <PropertyGroup>
@@ -1233,6 +1238,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     ("Directory.Packages.props", """
                         <Project>
                           <PropertyGroup>
@@ -1290,6 +1296,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     ("Directory.Packages.props", """
                         <Project>
                           <PropertyGroup>
@@ -1473,6 +1480,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     // initial props files
                     ("Directory.Packages.props", """
                         <Project>
@@ -1556,6 +1564,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     // initial props files
                     ("Directory.Packages.props", """
                         <Project>
@@ -1641,6 +1650,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     // initial props files
                     ("Directory.Packages.props", """
                         <Project>
@@ -1900,6 +1910,7 @@ await TestUpdateForProject("Some.Package", "1.0.0", "1.1.0",
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     ("Directory.Packages.props", """
                         <Project>
                           <PropertyGroup>
@@ -2174,6 +2185,7 @@ await TestUpdateForProject("Some.Transitive.Dependency", "5.0.0", "5.0.2", isTra
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     // initial props files
                     ("Directory.Packages.props", """
                         <Project>
@@ -2246,6 +2258,7 @@ await TestUpdateForProject("Some.Transitive.Dependency", "5.0.0", "5.0.2", isTra
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     // initial props files
                     ("Directory.Packages.props", """
                         <Project>
@@ -2481,6 +2494,7 @@ await TestUpdateForProject("Some.Package.Extensions", "1.0.0", "1.1.0",
                     """,
                 additionalFiles:
                 [
+                    ("Directory.Build.props", "<Project />"),
                     ("Directory.Packages.props", """
                         <Project>
                           <PropertyGroup>

diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/MSBuildHelper.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/MSBuildHelper.cs
@@ -542,12 +542,12 @@ await File.WriteAllTextAsync(
               <PropertyGroup>
                 <!-- For Windows-specific apps -->
                 <EnableWindowsTargeting>true</EnableWindowsTargeting>
+                <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
               </PropertyGroup>
             </Project>
             """);
 
         await File.WriteAllTextAsync(Path.Combine(tempDir.FullName, "Directory.Build.targets"), "<Project />");
-        await File.WriteAllTextAsync(Path.Combine(tempDir.FullName, "Directory.Packages.props"), "<Project />");
 
         return tempProjectPath;
     }

diff --git a/nuget/helpers/lib/NuGetUpdater/global.json b/nuget/helpers/lib/NuGetUpdater/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.202",
+    "version": "8.0.300",
     "rollForward": "latestMinor"
   }
 }