diff --git a/nuget/Dockerfile b/nuget/Dockerfile index b4c1936982..d934d0a29f 100644 --- 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/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.Project.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.Project.cs index 333dcdd5a7..07e31184a8 100644 --- a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.Project.cs +++ b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.Project.cs @@ -91,6 +91,7 @@ await TestDiscoveryAsync( """), + ("Directory.Build.props", ""), ("Directory.Packages.props", """ @@ -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 index f7daf21c15..bc1c813905 100644 --- 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( """), + ("Directory.Build.props", ""), ("Directory.Packages.props", """ @@ -151,6 +152,7 @@ await TestDiscoveryAsync( expectedResult: new() { FilePath = "src", + ExpectedProjectCount = 2, Projects = [ new() { @@ -203,6 +205,7 @@ await TestDiscoveryAsync( """), + ("Directory.Build.props", ""), ("Directory.Packages.props", """ @@ -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 index 0b7ee407f7..a120e58a0b 100644 --- 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 CreateWithContentsAsync(params Test var parentDirectory = Path.GetDirectoryName(temporaryDirectory.DirectoryPath)!; // prevent directory crawling - await File.WriteAllTextAsync(Path.Combine(parentDirectory, "Directory.Build.props"), ""); + await File.WriteAllTextAsync(Path.Combine(parentDirectory, "Directory.Build.props"), """ + + + false + + + """); await File.WriteAllTextAsync(Path.Combine(parentDirectory, "Directory.Build.targets"), ""); - await File.WriteAllTextAsync(Path.Combine(parentDirectory, "Directory.Packages.props"), ""); 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 index e7b2bf5036..422cb895a5 100644 --- 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", ""), ("Directory.Packages.props", """ @@ -739,6 +740,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1", """, additionalFiles: [ + ("Directory.Build.props", ""), ("Directory.Packages.props", """ @@ -1036,6 +1038,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1", """, additionalFiles: [ + ("Directory.Build.props", ""), ("Directory.Packages.props", """ @@ -1103,6 +1106,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1", """, additionalFiles: [ + ("Directory.Build.props", ""), ("Directory.Packages.props", """ @@ -1170,6 +1174,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1", """, additionalFiles: [ + ("Directory.Build.props", ""), ("Directory.Packages.props", """ @@ -1233,6 +1238,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1", """, additionalFiles: [ + ("Directory.Build.props", ""), ("Directory.Packages.props", """ @@ -1290,6 +1296,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1", """, additionalFiles: [ + ("Directory.Build.props", ""), ("Directory.Packages.props", """ @@ -1473,6 +1480,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1", """, additionalFiles: [ + ("Directory.Build.props", ""), // initial props files ("Directory.Packages.props", """ @@ -1556,6 +1564,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1", """, additionalFiles: [ + ("Directory.Build.props", ""), // initial props files ("Directory.Packages.props", """ @@ -1641,6 +1650,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1", """, additionalFiles: [ + ("Directory.Build.props", ""), // initial props files ("Directory.Packages.props", """ @@ -1900,6 +1910,7 @@ await TestUpdateForProject("Some.Package", "1.0.0", "1.1.0", """, additionalFiles: [ + ("Directory.Build.props", ""), ("Directory.Packages.props", """ @@ -2174,6 +2185,7 @@ await TestUpdateForProject("Some.Transitive.Dependency", "5.0.0", "5.0.2", isTra """, additionalFiles: [ + ("Directory.Build.props", ""), // initial props files ("Directory.Packages.props", """ @@ -2246,6 +2258,7 @@ await TestUpdateForProject("Some.Transitive.Dependency", "5.0.0", "5.0.2", isTra """, additionalFiles: [ + ("Directory.Build.props", ""), // initial props files ("Directory.Packages.props", """ @@ -2481,6 +2494,7 @@ await TestUpdateForProject("Some.Package.Extensions", "1.0.0", "1.1.0", """, additionalFiles: [ + ("Directory.Build.props", ""), ("Directory.Packages.props", """ diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/MSBuildHelper.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/MSBuildHelper.cs index 75039ba6f8..84366d1d18 100644 --- 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( true + false """); await File.WriteAllTextAsync(Path.Combine(tempDir.FullName, "Directory.Build.targets"), ""); - await File.WriteAllTextAsync(Path.Combine(tempDir.FullName, "Directory.Packages.props"), ""); return tempProjectPath; } diff --git a/nuget/helpers/lib/NuGetUpdater/global.json b/nuget/helpers/lib/NuGetUpdater/global.json index 82dd9d3bd1..8d0a1c0ac3 100644 --- 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" } } \ No newline at end of file