Update dependencies from https://github.com/dotnet/arcade build 20230218.1 (#46764)

dotnet-maestro[bot] · web-flow · commit 738dea8fa159 · 2023-02-24T22:41:59.000Z
[main] Update dependencies from dotnet/arcade
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -302,26 +302,26 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>c72a060e67453703172be1f886b651f1f89de562</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23110.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23118.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
+      <Sha>38d3196e1596eb525367ec8d65fcc1f30a58261c</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23110.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23118.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
+      <Sha>38d3196e1596eb525367ec8d65fcc1f30a58261c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23110.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23118.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
+      <Sha>38d3196e1596eb525367ec8d65fcc1f30a58261c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23110.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23118.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
+      <Sha>38d3196e1596eb525367ec8d65fcc1f30a58261c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23110.3">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23118.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
+      <Sha>38d3196e1596eb525367ec8d65fcc1f30a58261c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -135,9 +135,9 @@
     <MicrosoftEntityFrameworkCoreVersion>8.0.0-preview.2.23122.1</MicrosoftEntityFrameworkCoreVersion>
     <MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-preview.2.23122.1</MicrosoftEntityFrameworkCoreDesignVersion>
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23110.3</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23110.3</MicrosoftDotNetBuildTasksTemplatingVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23110.3</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23118.1</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23118.1</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23118.1</MicrosoftDotNetRemoteExecutorVersion>
     <!-- Packages from dotnet/source-build-externals -->
     <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23110.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
     <!-- Packages from dotnet/xdt -->
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
@@ -45,7 +45,7 @@ if (-not $wxlFiles) {
     }
 }
 
-$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
+$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html$" } # add installer HTML files
 $macosHtmlFiles = @()
 if ($macosHtmlEnFiles) {
     $macosHtmlEnFiles | ForEach-Object {
@@ -148,12 +148,17 @@ $locJson = @{
                         }
                     }
                     $sourceFile = ($_.FullName | Resolve-Path -Relative)
+                    $lciFile = $sourceFile + ".lci"
                     if ($continue) {
-                        return @{
+                        $result = @{
                             SourceFile = $sourceFile
                             CopyOption = "LangIDOnPath"
                             OutputPath = $outputPath
                         }
+                        if (Test-Path $lciFile -PathType Leaf) {
+                            $result["LciFile"] = $lciFile
+                        }
+                        return $result
                     }
                 }
             )
diff --git a/global.json b/global.json
@@ -27,7 +27,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.22.10",
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23110.3",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23110.3"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23118.1",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23118.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ if (-not $wxlFiles) {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`-$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" \| Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files`
	`48`	`+$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" \| Where-Object { $_.FullName -Match "en\.lproj\\.+\.html$" } # add installer HTML files`
`49`	`49`	`$macosHtmlFiles = @()`
`50`	`50`	`if ($macosHtmlEnFiles) {`
`51`	`51`	`$macosHtmlEnFiles \| ForEach-Object {`
`@@ -148,12 +148,17 @@ $locJson = @{`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`	`$sourceFile = ($_.FullName \| Resolve-Path -Relative)`
	`151`	`+ $lciFile = $sourceFile + ".lci"`
`151`	`152`	`if ($continue) {`
`152`		`- return @{`
	`153`	`+ $result = @{`
`153`	`154`	`SourceFile = $sourceFile`
`154`	`155`	`CopyOption = "LangIDOnPath"`
`155`	`156`	`OutputPath = $outputPath`
`156`	`157`	`}`
	`158`	`+ if (Test-Path $lciFile -PathType Leaf) {`
	`159`	`+ $result["LciFile"] = $lciFile`
	`160`	`+ }`
	`161`	`+ return $result`
`157`	`162`	`}`
`158`	`163`	`}`
`159`	`164`	`)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`},`
`28`	`28`	`"msbuild-sdks": {`
`29`	`29`	`"Yarn.MSBuild": "1.22.10",`
`30`		`- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23110.3",`
`31`		`- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23110.3"`
	`30`	`+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23118.1",`
	`31`	`+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23118.1"`
`32`	`32`	`}`
`33`	`33`	`}`