Update dependencies from https://github.com/dotnet/arcade build 20210422.1 (#32175)

dotnet-maestro[bot] · web-flow · commit 4681108d2877 · 2021-04-26T14:04:33.000Z
[main] Update dependencies from dotnet/arcade
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -308,18 +308,18 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>3782e6e41cfaf76ec9ae4117722f835596026b1a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21216.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21222.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c</Sha>
+      <Sha>b7279bb45342c948ab46fea2d08ec17ae2f2a1bf</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21216.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21222.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c</Sha>
+      <Sha>b7279bb45342c948ab46fea2d08ec17ae2f2a1bf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21216.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21222.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c</Sha>
+      <Sha>b7279bb45342c948ab46fea2d08ec17ae2f2a1bf</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -141,7 +141,7 @@
     <MicrosoftEntityFrameworkCoreVersion>6.0.0-preview.5.21224.4</MicrosoftEntityFrameworkCoreVersion>
     <MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-preview.5.21224.4</MicrosoftEntityFrameworkCoreDesignVersion>
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21216.2</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21222.1</MicrosoftDotNetBuildTasksInstallersVersion>
   </PropertyGroup>
   <!--
 
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
@@ -66,10 +66,19 @@ $locJson = @{
                     }
                     if ($continue)
                     {
-                        return @{
-                            SourceFile = $sourceFile
-                            CopyOption = "LangIDOnName"
-                            OutputPath = $outputPath
+                        if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') {
+                            return @{
+                                SourceFile = $sourceFile
+                                CopyOption = "LangIDOnPath"
+                                OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
+                            }
+                        }
+                        else {
+                            return @{
+                                SourceFile = $sourceFile
+                                CopyOption = "LangIDOnName"
+                                OutputPath = $outputPath
+                            }
                         }
                     }
                 }
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
@@ -1,6 +1,6 @@
 parameters:
   runAsPublic: false
-  sourceIndexPackageVersion: 1.0.1-20210225.1
+  sourceIndexPackageVersion: 1.0.1-20210421.1
   sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
   preSteps: []
diff --git a/global.json b/global.json
@@ -30,7 +30,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.22.10",
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21216.2",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21216.2"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21222.1",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21222.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,19 @@ $locJson = @{`
`66`	`66`	`}`
`67`	`67`	`if ($continue)`
`68`	`68`	`{`
`69`		`- return @{`
`70`		`- SourceFile = $sourceFile`
`71`		`- CopyOption = "LangIDOnName"`
`72`		`- OutputPath = $outputPath`
	`69`	`+ if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') {`
	`70`	`+ return @{`
	`71`	`+ SourceFile = $sourceFile`
	`72`	`+ CopyOption = "LangIDOnPath"`
	`73`	`+ OutputPath = "$($_.Directory.Parent.FullName \| Resolve-Path -Relative)\"`
	`74`	`+ }`
	`75`	`+ }`
	`76`	`+ else {`
	`77`	`+ return @{`
	`78`	`+ SourceFile = $sourceFile`
	`79`	`+ CopyOption = "LangIDOnName"`
	`80`	`+ OutputPath = $outputPath`
	`81`	`+ }`
`73`	`82`	`}`
`74`	`83`	`}`
`75`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`},`
`31`	`31`	`"msbuild-sdks": {`
`32`	`32`	`"Yarn.MSBuild": "1.22.10",`
`33`		`- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21216.2",`
`34`		`- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21216.2"`
	`33`	`+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21222.1",`
	`34`	`+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21222.1"`
`35`	`35`	`}`
`36`	`36`	`}`