From 5774d293d4dd0fbcbfa4cc63811ba81a76499a39 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 13 Jan 2025 16:34:50 +0100 Subject: [PATCH 1/3] Update SDK to 10.0.100-alpha.1.25063.11 --- global.json | 4 ++-- .../Sdk/tools/dotnet-cli/DotNetCli.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index f7fad867935..59a95f2fafd 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "10.0.100-alpha.1.24573.1", + "version": "10.0.100-alpha.1.25063.11", "rollForward": "latestFeature" }, "tools": { - "dotnet": "10.0.100-alpha.1.24573.1" + "dotnet": "10.0.100-alpha.1.25063.11" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25061.1", diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props index 2d8a28a73a2..85386ccdfd0 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props @@ -3,7 +3,7 @@ false - 10.0.0-alpha.2.24572.1 + 10.0.0-alpha.2.25061.1 runtime $(BundledNETCoreAppPackageVersion) From 012406c2352ed057ecd1c70cb0580102612371e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 14 Jan 2025 19:36:18 +0100 Subject: [PATCH 2/3] Don't use obsolete X509Certificate2 ctor in LatestLinksManagerTests.cs The tests don't actually need a certificate instance. --- .../LatestLinksManagerTests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/LatestLinksManagerTests.cs b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/LatestLinksManagerTests.cs index 6b640114b1c..5c0ffcd7f54 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/LatestLinksManagerTests.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/LatestLinksManagerTests.cs @@ -104,7 +104,7 @@ public void GetLatestLinksToCreate_Patterns() flatten: true ); - var manager = new LatestLinksManager("clientId", new System.Security.Cryptography.X509Certificates.X509Certificate2(), "tenant", "groupOwner", "createdBy", "owners", taskLoggingHelper); + var manager = new LatestLinksManager("clientId", null, "tenant", "groupOwner", "createdBy", "owners", taskLoggingHelper); var links = manager.GetLatestLinksToCreate(assetsToPublish, feedConfig, "https://example.com/feed/"); @@ -140,7 +140,7 @@ public void GetLatestLinksToCreate_EmptyPatternsShouldCreateNoLinks() flatten: true ); - var manager = new LatestLinksManager("clientId", new System.Security.Cryptography.X509Certificates.X509Certificate2(), "tenant", "groupOwner", "createdBy", "owners", taskLoggingHelper); + var manager = new LatestLinksManager("clientId", null, "tenant", "groupOwner", "createdBy", "owners", taskLoggingHelper); var links = manager.GetLatestLinksToCreate(assetsToPublish, feedConfig, "https://example.com/feed/"); @@ -170,7 +170,7 @@ public void GetLatestLinksToCreate_OnlyIncludeShouldWork() flatten: true ); - var manager = new LatestLinksManager("clientId", new System.Security.Cryptography.X509Certificates.X509Certificate2(), "tenant", "groupOwner", "createdBy", "owners", taskLoggingHelper); + var manager = new LatestLinksManager("clientId", null, "tenant", "groupOwner", "createdBy", "owners", taskLoggingHelper); var links = manager.GetLatestLinksToCreate(assetsToPublish, feedConfig, "https://example.com/feed/"); @@ -207,7 +207,7 @@ public void GetLatestLinksToCreate_NonFlattenedShouldNotFlatten() flatten: false ); - var manager = new LatestLinksManager("clientId", new System.Security.Cryptography.X509Certificates.X509Certificate2(), "tenant", "groupOwner", "createdBy", "owners", taskLoggingHelper); + var manager = new LatestLinksManager("clientId", null, "tenant", "groupOwner", "createdBy", "owners", taskLoggingHelper); var links = manager.GetLatestLinksToCreate(assetsToPublish, feedConfig, "https://example.com/feed/"); From 01c927b29c40654f2c4bdcbcda6cdd0e360444a3 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 14 Jan 2025 20:45:33 +0100 Subject: [PATCH 3/3] Update SDK and runtime versions --- global.json | 4 ++-- .../Sdk/tools/dotnet-cli/DotNetCli.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index 59a95f2fafd..f5e5c89066b 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "10.0.100-alpha.1.25063.11", + "version": "10.0.100-alpha.1.25064.3", "rollForward": "latestFeature" }, "tools": { - "dotnet": "10.0.100-alpha.1.25063.11" + "dotnet": "10.0.100-alpha.1.25064.3" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25061.1", diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props index 85386ccdfd0..832e426bcac 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props @@ -3,7 +3,7 @@ false - 10.0.0-alpha.2.25061.1 + 10.0.0-alpha.2.25064.1 runtime $(BundledNETCoreAppPackageVersion)