diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bae44b0..cb416097 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 28a6403ee97077256fcdc60f599f0ad9e38e3cfa - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 28a6403ee97077256fcdc60f599f0ad9e38e3cfa - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 28a6403ee97077256fcdc60f599f0ad9e38e3cfa - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 28a6403ee97077256fcdc60f599f0ad9e38e3cfa - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 28a6403ee97077256fcdc60f599f0ad9e38e3cfa https://github.com/dotnet/arcade-services diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index de348a2e..25e97ac0 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 d9728763..fe4b9a20 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21317.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.2" } }