Merge pull request #9564 from dotnet/darc-release/8.0.1xx-f6e867c1-48f5-42dd-816b-a2309476fb1f

Author: MiYanni

eng/Version.Details.xml

@@ -17,9 +17,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25563.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25577.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>952abb7faea30d565b847d31411d019904a613a0</Sha>
+      <Sha>1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

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, '') }}:

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

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

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.25577.1"
   }
 }

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";
 

test/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs

@@ -78,7 +78,7 @@ public void Log<TState>(
 
                 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))

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)

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