diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 104dad174..6a4b55a0b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -136,14 +136,14 @@
-
+
https://github.com/dotnet/arcade
- 5619c32997ab2d6a5ddf6d2e488c572b882f891b
+ a3377cccde8639089f99107e2ba5df2c8cbe6394
-
+
https://github.com/dotnet/arcade
- 5619c32997ab2d6a5ddf6d2e488c572b882f891b
+ a3377cccde8639089f99107e2ba5df2c8cbe6394
https://github.com/dotnet/source-build-reference-packages
@@ -153,9 +153,9 @@
https://github.com/dotnet/sourcelink
4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc
-
+
https://github.com/dotnet/xliff-tasks
- d4e95f2cca463823ce9c8e3394554883b6e3c091
+ 134daa7f10735efb489cc7c816967da831b22926
diff --git a/eng/Versions.props b/eng/Versions.props
index e7b6f10d3..847f9f0da 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
- 6.0.0-beta.21317.1
+ 6.0.0-beta.21319.2
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index de348a2e2..25e97ac00 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -25,8 +25,15 @@ Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to
# Template files
$jsonFiles = @()
-$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern
-$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
+$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern
+$jsonTemplateFiles | ForEach-Object {
+ $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json
+
+ $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json"
+ $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
+}
+
+$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
$xlfFiles = @()
@@ -44,7 +51,7 @@ $langXlfFiles | ForEach-Object {
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
}
-$locFiles = $jsonFiles + $xlfFiles
+$locFiles = $jsonFiles + $jsonWinformsTemplateFiles + $xlfFiles
$locJson = @{
Projects = @(
diff --git a/global.json b/global.json
index 7f003c45d..01b80fc46 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21317.1",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21319.2",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2"
}
}