From 9e8e6b18b78121db7e5229ba2c4736551bcf359c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Apr 2021 12:14:55 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20210419.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21216.2 -> To Version 6.0.0-beta.21219.2 --- eng/Version.Details.xml | 4 ++-- eng/common/generate-locproject.ps1 | 17 +++++++++++++---- global.json | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edf23bb13a..5600780994 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c + 1d951297eb7bdd29a31dff3149606152717ed6b4 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 7225ddc666..24c00b5be9 100644 --- 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 index 01bd3b397e..7f16c3bf4d 100644 --- 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" } }