From 1352eac85749aae36816191465e4577371412940 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 May 2025 02:02:44 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20250513.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25255.5 -> To Version 9.0.0-beta.25263.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a66fd5e1e52..812fef737ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,14 +19,14 @@ - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 diff --git a/global.json b/global.json index 689aeb7cb07..e094734d0b1 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "9.0.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.2" } } From 665a064a569d123ccd3ce03fc4bb97c9f9daab55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 May 2025 21:16:36 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 20250513.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25255.5 -> To Version 9.0.0-beta.25263.5 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 812fef737ea..3bbe186e15e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,14 +19,14 @@ - + https://github.com/dotnet/arcade - ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 + 93823d49ca01742464ad1c0b49ea940e693b1be3 - + https://github.com/dotnet/arcade - ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 + 93823d49ca01742464ad1c0b49ea940e693b1be3 diff --git a/global.json b/global.json index e094734d0b1..abce6818329 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { "tools": { - "dotnet": "9.0.105" + "dotnet": "9.0.106" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.5" } } From 82dd0e7d716f066c5c97658f7816b16d187e70e8 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]);