From 38459e5c095f071f0fd22cbc5b66fc8e1104ca06 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 12:55:21 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20210419.2 (#795)
[main] Update dependencies from dotnet/arcade
---
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 edf23bb13..560078099 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 7225ddc66..24c00b5be 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 01bd3b397..7f16c3bf4 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"
}
}