From cac525cfcc9d027fe9190413a382175c0def8cf4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 May 2025 02:02:24 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20250513.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25230.1 -> To Version 8.0.0-beta.25263.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2876c81a44d..7ab3bbb6035 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ - + https://github.com/dotnet/arcade - 4246a31e5de9de87f760218c4f588cebf4661f45 + abb15166a8da9284d6ed177924cfd9b6f74c9f08 diff --git a/global.json b/global.json index 36a2b1bcfa6..798a939e166 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "8.0.115" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25230.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25263.1" } } From 60acd5de5ad2602c885023f1dd2ff66a2d1cc128 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 May 2025 21:15:14 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 20250513.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25230.1 -> To Version 8.0.0-beta.25263.4 --- eng/Version.Details.xml | 4 ++-- global.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ab3bbb6035..90584d84e64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ - + https://github.com/dotnet/arcade - abb15166a8da9284d6ed177924cfd9b6f74c9f08 + 20ab70a74d52b68f4271bd946884e24049b14f83 diff --git a/global.json b/global.json index 798a939e166..2225c7fc09d 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { "tools": { - "dotnet": "8.0.115" + "dotnet": "8.0.116" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25263.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25263.4" } } From b9e42420e807edc7f2e6524156f597dac1c79556 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 14 May 2025 18:25:14 -0700 Subject: [PATCH 3/3] Use System.Text.Json in tests instead of unlisted log4net --- .../NuGetApiPackageManagerTests.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/Microsoft.TemplateEngine.Edge.UnitTests/NuGetApiPackageManagerTests.cs b/test/Microsoft.TemplateEngine.Edge.UnitTests/NuGetApiPackageManagerTests.cs index b2b80d56102..5c71d02937c 100644 --- a/test/Microsoft.TemplateEngine.Edge.UnitTests/NuGetApiPackageManagerTests.cs +++ b/test/Microsoft.TemplateEngine.Edge.UnitTests/NuGetApiPackageManagerTests.cs @@ -146,13 +146,13 @@ internal async Task DownloadPackage_HasVulnerabilities() var exception = await Assert.ThrowsAsync(() => packageManager.DownloadPackageAsync( installPath, - "log4net", - "2.0.3", + "System.Text.Json", + "8.0.4", // add the source for getting vulnerability info additionalSources: _additionalSources)); - exception.PackageIdentifier.Should().Be("log4net"); - exception.PackageVersion.Should().Be("2.0.3"); + exception.PackageIdentifier.Should().Be("System.Text.Json"); + exception.PackageVersion.Should().Be("8.0.4"); exception.Vulnerabilities.Should().NotBeNullOrEmpty(); } @@ -167,15 +167,15 @@ internal async Task DownloadPackage_HasVulnerabilitiesForce() var result = await packageManager.DownloadPackageAsync( installPath, - "log4net", - "2.0.3", + "System.Text.Json", + "8.0.4", // add the source for getting vulnerability info additionalSources: _additionalSources, force: true); - result.PackageIdentifier.Should().Be("log4net"); - result.Author.Should().Be("Apache Software Foundation"); - result.PackageVersion.Should().Be("2.0.3"); + result.PackageIdentifier.Should().Be("System.Text.Json"); + result.Author.Should().Be("Microsoft"); + result.PackageVersion.Should().Be("8.0.4"); Assert.True(File.Exists(result.FullPath)); result.PackageVulnerabilities.Should().NotBeNullOrEmpty(); result.NuGetSource.Should().Be(_additionalSources[0]);