[main] Update dependencies from dotnet/arcade (#5014)

dotnet-maestro[bot] · web-flow · commit f837a93c6e2e · 2023-02-19T13:38:55.000Z
[main] Update dependencies from dotnet/arcade
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -4,25 +4,25 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23115.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23118.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
+      <Sha>38d3196e1596eb525367ec8d65fcc1f30a58261c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23115.1">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23118.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
+      <Sha>38d3196e1596eb525367ec8d65fcc1f30a58261c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23115.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23118.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
+      <Sha>38d3196e1596eb525367ec8d65fcc1f30a58261c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23115.1">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23118.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
+      <Sha>38d3196e1596eb525367ec8d65fcc1f30a58261c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23115.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23118.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
+      <Sha>38d3196e1596eb525367ec8d65fcc1f30a58261c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -23,11 +23,11 @@
   </PropertyGroup>
   <!-- Arcade dependencies -->
   <PropertyGroup>
-    <MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23115.1</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23115.1</MicrosoftDotNetHelixSdkPackageVersion>
-    <MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23115.1</MicrosoftDotNetGenFacadesPackageVersion>
-    <MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23115.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.23115.1</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23118.1</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23118.1</MicrosoftDotNetHelixSdkPackageVersion>
+    <MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23118.1</MicrosoftDotNetGenFacadesPackageVersion>
+    <MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23118.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.23118.1</MicrosoftDotNetSignToolVersion>
   </PropertyGroup>
   <!-- CoreFx dependencies -->
   <PropertyGroup>
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
@@ -12,7 +12,7 @@
     "version": "8.0.100-alpha.1.23061.8"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23115.1",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23115.1"
+    "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
`@@ -12,7 +12,7 @@`
`12`	`12`	`"version": "8.0.100-alpha.1.23061.8"`
`13`	`13`	`},`
`14`	`14`	`"msbuild-sdks": {`
`15`		`- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23115.1",`
`16`		`- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23115.1"`
	`15`	`+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23118.1",`
	`16`	`+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23118.1"`
`17`	`17`	`}`
`18`	`18`	`}`