From 7c240ee239f7d16ea3cd82faaff1534d7c75fdb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Nov 2025 02:01:53 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/arcade build 20251120.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25563.4 -> To Version 8.0.0-beta.25570.4 --- eng/Version.Details.xml | 4 ++-- eng/common/templates-official/job/source-build.yml | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 268a12a1cc4..4eba37851d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ - + https://github.com/dotnet/arcade - 952abb7faea30d565b847d31411d019904a613a0 + b03a7214ed5a36d5267894adf9f8f55067962fdb diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 7b9c58a90c5..f75400757d1 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -61,7 +61,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: 1es-azurelinux-3 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/global.json b/global.json index 15b431498c1..8fee3071841 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "8.0.122" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25563.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25570.4" } } From f64a05e13b1437f4eedb62c1e35db1766a83bf23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Nov 2025 02:01:43 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/arcade build 20251121.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25563.4 -> To Version 8.0.0-beta.25571.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 4eba37851d4..01826250f77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ - + https://github.com/dotnet/arcade - b03a7214ed5a36d5267894adf9f8f55067962fdb + be61e5dbdc68d586c5a479486c2342f0f4161c38 diff --git a/global.json b/global.json index 8fee3071841..c430dddca75 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "8.0.122" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25570.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25571.1" } } From 4b12d6434e97930e173edb1d1cc6837c1a2dbda3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Nov 2025 02:02:24 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/arcade build 20251124.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25563.4 -> To Version 8.0.0-beta.25574.4 --- 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 01826250f77..be3ef1d074e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ - + https://github.com/dotnet/arcade - be61e5dbdc68d586c5a479486c2342f0f4161c38 + f95859accbb8e8312e39c1dcd7d1639c4d2c0c51 diff --git a/global.json b/global.json index c430dddca75..233ca29b058 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "8.0.122" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25571.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25574.4" } } From 80822aa39fa3cb29ae4214c83b4955e04d942dbb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Nov 2025 02:01:27 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/arcade build 20251127.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25563.4 -> To Version 8.0.0-beta.25577.1 --- eng/Version.Details.xml | 4 ++-- eng/common/templates-official/steps/source-build.yml | 2 +- eng/common/templates/steps/source-build.yml | 2 +- global.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be3ef1d074e..5474e43b545 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ - + https://github.com/dotnet/arcade - f95859accbb8e8312e39c1dcd7d1639c4d2c0c51 + 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index b63043da4b9..c307825c912 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -47,7 +47,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ae06b26ea37..d08a0e92caa 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -47,7 +47,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index 233ca29b058..50459e44500 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "8.0.122" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25574.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25577.1" } } From 48c0f5ecf256110088605c66f391a93544e01499 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 30 Nov 2025 20:12:55 -0800 Subject: [PATCH 5/7] Fix the IDE warnings --- test/Microsoft.TemplateEngine.Mocks/MockInstallerFactory.cs | 2 +- test/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.TemplateEngine.Mocks/MockInstallerFactory.cs b/test/Microsoft.TemplateEngine.Mocks/MockInstallerFactory.cs index 667f5d08560..c82ae1fd659 100644 --- a/test/Microsoft.TemplateEngine.Mocks/MockInstallerFactory.cs +++ b/test/Microsoft.TemplateEngine.Mocks/MockInstallerFactory.cs @@ -9,7 +9,7 @@ namespace Microsoft.TemplateEngine.Mocks { public class MockInstallerFactory : IInstallerFactory { - private Guid _factoryId = new Guid("00000000-0000-0000-0000-000000000000"); + private readonly Guid _factoryId = new Guid("00000000-0000-0000-0000-000000000000"); public string Name => "MockInstallerFactory"; diff --git a/test/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs b/test/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs index b7a78be1a14..7513fa2014c 100644 --- a/test/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs +++ b/test/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs @@ -78,7 +78,7 @@ public void Log( var firstLinePrefix = $"| [{timestamp}] {_category} {logLevel}: "; var lines = formatter(state, exception).Split(NewLineChars, StringSplitOptions.RemoveEmptyEntries); - messageBuilder.AppendLine(firstLinePrefix + lines.FirstOrDefault() ?? string.Empty); + messageBuilder.AppendLine(firstLinePrefix + (lines.FirstOrDefault() ?? string.Empty)); var additionalLinePrefix = "|" + new string(' ', firstLinePrefix.Length - 1); foreach (var line in lines.Skip(1)) From d23c1e6ec35c94d8a2549440546bbeb723fa12b4 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 2 Dec 2025 13:55:44 -0800 Subject: [PATCH 6/7] Add parentheses --- .../AdditionalData/CliHostDataProducer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Microsoft.TemplateSearch.TemplateDiscovery/AdditionalData/CliHostDataProducer.cs b/tools/Microsoft.TemplateSearch.TemplateDiscovery/AdditionalData/CliHostDataProducer.cs index c6359163e83..b750855c500 100644 --- a/tools/Microsoft.TemplateSearch.TemplateDiscovery/AdditionalData/CliHostDataProducer.cs +++ b/tools/Microsoft.TemplateSearch.TemplateDiscovery/AdditionalData/CliHostDataProducer.cs @@ -77,7 +77,7 @@ public bool Equals(ITemplatePackageInfo? x, ITemplatePackageInfo? y) } return x.Name.Equals(y.Name, StringComparison.OrdinalIgnoreCase) - && (x.Version?.Equals(y.Version, StringComparison.OrdinalIgnoreCase) ?? x.Version == y.Version); + && (x.Version?.Equals(y.Version, StringComparison.OrdinalIgnoreCase) ?? (x.Version == y.Version)); } public int GetHashCode([DisallowNull] ITemplatePackageInfo obj) From c9238309888ba47703be1069eec63f47db2d6439 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 2 Dec 2025 13:56:09 -0800 Subject: [PATCH 7/7] Add parentheses --- .../AdditionalData/CliHostTemplateDataLoader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Microsoft.TemplateSearch.TemplateDiscovery/AdditionalData/CliHostTemplateDataLoader.cs b/tools/Microsoft.TemplateSearch.TemplateDiscovery/AdditionalData/CliHostTemplateDataLoader.cs index 7a0f09b1dc5..2e0bc908d9e 100644 --- a/tools/Microsoft.TemplateSearch.TemplateDiscovery/AdditionalData/CliHostTemplateDataLoader.cs +++ b/tools/Microsoft.TemplateSearch.TemplateDiscovery/AdditionalData/CliHostTemplateDataLoader.cs @@ -67,7 +67,7 @@ internal CliHostTemplateData ReadHostSpecificTemplateData(ITemplateInfo template Console.Error.WriteLine( "Failed to load dotnet CLI host data for template {0} from {1}. The host data will be ignored.", templateInfo.ShortNameList?[0] ?? templateInfo.Name, - file?.GetDisplayPath() ?? templateInfo.MountPointUri + templateInfo.HostConfigPlace); + file?.GetDisplayPath() ?? (templateInfo.MountPointUri + templateInfo.HostConfigPlace)); Console.Error.WriteLine("Details: {0}", e); } finally