Update dependencies from https://github.com/dotnet/arcade build 20210…

…419.2 (#795) [main] Update dependencies from dotnet/arcade
dotnet · Apr 20, 2021 · 38459e5 · 38459e5
1 parent 8835cb7
commit 38459e5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21216.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21219.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c</Sha>
+      <Sha>1d951297eb7bdd29a31dff3149606152717ed6b4</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
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/global.json b/global.json
@@ -17,6 +17,6 @@
     "xcopy-msbuild": "16.8.0-preview2.1"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21216.2"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21219.2"
   }
 }