From bee9f747100f2bae1769d0f64ef8a4e8f152b9bb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:10:00 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20210419.2 (#10263)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- XliffTasks: from 1.0.0-beta.21215.1 to 1.0.0-beta.21217.1 (parent: Microsoft.DotNet.Arcade.Sdk)
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 2 +-
eng/common/generate-locproject.ps1 | 17 +++++++++++++----
global.json | 2 +-
4 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7506b3e92..b60f07087 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -136,14 +136,14 @@
-
+
https://github.com/dotnet/arcade
- 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c
+ 1d951297eb7bdd29a31dff3149606152717ed6b4
-
+
https://github.com/dotnet/arcade
- 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c
+ 1d951297eb7bdd29a31dff3149606152717ed6b4
https://github.com/dotnet/source-build-reference-packages
@@ -153,9 +153,9 @@
https://github.com/dotnet/sourcelink
4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc
-
+
https://github.com/dotnet/xliff-tasks
- 3d9b37d56a7ca805f4e361092bf699dd2428e895
+ 6251f8148102088975a685bea7f44800954a9a48
diff --git a/eng/Versions.props b/eng/Versions.props
index 75ca46076..15032cf0f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
- 6.0.0-beta.21216.2
+ 6.0.0-beta.21219.2
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 bfbfd90e3..9c5eeb65e 100644
--- a/global.json
+++ b/global.json
@@ -8,6 +8,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21216.2"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21219.2"
}
}