From 29cd684f839478a1a437ecd298563263701d1b29 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 12:25:18 +1000
Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#4817)
---
Localize/LocProject.json | 24 ++++++++++++------------
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 6 +++---
eng/common/generate-locproject.ps1 | 17 +++++++++++++----
global.json | 4 ++--
5 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/Localize/LocProject.json b/Localize/LocProject.json
index 9db88e3969f..dfe4e1bdd07 100644
--- a/Localize/LocProject.json
+++ b/Localize/LocProject.json
@@ -4,33 +4,33 @@
"LocItems": [
{
"SourceFile": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsApplication-CSharp\\.template.config\\en\\strings.json",
- "CopyOption": "LangIDOnName",
- "OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsApplication-CSharp\\.template.config\\en\\"
+ "CopyOption": "LangIDOnPath",
+ "OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsApplication-CSharp\\.template.config\\"
},
{
"SourceFile": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsApplication-VisualBasic\\.template.config\\en\\strings.json",
- "CopyOption": "LangIDOnName",
- "OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsApplication-VisualBasic\\.template.config\\en\\"
+ "CopyOption": "LangIDOnPath",
+ "OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsApplication-VisualBasic\\.template.config\\"
},
{
"SourceFile": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsControlLibrary-CSharp\\.template.config\\en\\strings.json",
- "CopyOption": "LangIDOnName",
- "OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsControlLibrary-CSharp\\.template.config\\en\\"
+ "CopyOption": "LangIDOnPath",
+ "OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsControlLibrary-CSharp\\.template.config\\"
},
{
"SourceFile": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsControlLibrary-VisualBasic\\.template.config\\en\\strings.json",
- "CopyOption": "LangIDOnName",
- "OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsControlLibrary-VisualBasic\\.template.config\\en\\"
+ "CopyOption": "LangIDOnPath",
+ "OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsControlLibrary-VisualBasic\\.template.config\\"
},
{
"SourceFile": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsLibrary-CSharp\\.template.config\\en\\strings.json",
- "CopyOption": "LangIDOnName",
- "OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsLibrary-CSharp\\.template.config\\en\\"
+ "CopyOption": "LangIDOnPath",
+ "OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsLibrary-CSharp\\.template.config\\"
},
{
"SourceFile": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsLibrary-VisualBasic\\.template.config\\en\\strings.json",
- "CopyOption": "LangIDOnName",
- "OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsLibrary-VisualBasic\\.template.config\\en\\"
+ "CopyOption": "LangIDOnPath",
+ "OutputPath": ".\\pkg\\Microsoft.Dotnet.WinForms.ProjectTemplates\\content\\WinFormsLibrary-VisualBasic\\.template.config\\"
},
{
"SourceFile": ".\\src\\Microsoft.VisualBasic.Forms\\src\\Resources\\Microsoft\\VisualBasic\\CompilerServices\\xlf\\VBInputBox.xlf",
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6986593a121..7fd1cab641a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -150,25 +150,25 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-
+
https://github.com/dotnet/arcade
- 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c
+ 1d951297eb7bdd29a31dff3149606152717ed6b4
-
+
https://github.com/dotnet/arcade
- 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c
+ 1d951297eb7bdd29a31dff3149606152717ed6b4
-
+
https://github.com/dotnet/arcade
- 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c
+ 1d951297eb7bdd29a31dff3149606152717ed6b4
-
+
https://github.com/dotnet/arcade
- 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c
+ 1d951297eb7bdd29a31dff3149606152717ed6b4
-
+
https://github.com/dotnet/arcade
- 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c
+ 1d951297eb7bdd29a31dff3149606152717ed6b4
diff --git a/eng/Versions.props b/eng/Versions.props
index 3700a491866..ca52c1a95fe 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -53,9 +53,9 @@
- 6.0.0-beta.21216.2
- 6.0.0-beta.21216.2
- 6.0.0-beta.21216.2
+ 6.0.0-beta.21219.2
+ 6.0.0-beta.21219.2
+ 6.0.0-beta.21219.2
16.5.0
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index 7225ddc6669..24c00b5be98 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 06f30dde014..15c6b5022b2 100644
--- a/global.json
+++ b/global.json
@@ -14,9 +14,9 @@
"version": "6.0.100-preview.2.21155.3"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21216.2",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21219.2",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21076.1",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21216.2",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21219.2",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21219.10"
},