diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5dad2b74c..f4b7ee516 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -196,32 +196,32 @@ - + https://github.com/dotnet/arcade - 9f45238c23d89cf44a10705db1217e66a441ba5a + 78adce7e3545bf5a5252fd9963969d8950fadea6 - + https://github.com/dotnet/arcade - 9f45238c23d89cf44a10705db1217e66a441ba5a + 78adce7e3545bf5a5252fd9963969d8950fadea6 - + https://github.com/dotnet/arcade - 9f45238c23d89cf44a10705db1217e66a441ba5a + 78adce7e3545bf5a5252fd9963969d8950fadea6 https://github.com/dotnet/source-build-reference-packages 2288850ad99cac4de5968ed609144bfdc81567ce - + https://github.com/dotnet/sourcelink 39d159f2a663d836dc54704cfa74414be3e3338f - + https://github.com/dotnet/xliff-tasks - ed12ca72fa781b3bdb1f4ca20bfc9467350e893c + 03edf62ccaba877b7cc24f939de2cf1bcb5d069e diff --git a/eng/Versions.props b/eng/Versions.props index 2cc2d3b1d..454704962 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22355.4 + 7.0.0-beta.22356.3 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 25e97ac00..afdd17502 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -10,9 +10,7 @@ Param( Set-StrictMode -Version 2.0 $ErrorActionPreference = "Stop" -. $PSScriptRoot\tools.ps1 - -Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') +. $PSScriptRoot\pipeline-logging-functions.ps1 $exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json" $exclusions = @{ Exclusions = @() } @@ -28,7 +26,7 @@ $jsonFiles = @() $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 } @@ -46,7 +44,7 @@ if ($allXlfFiles) { } $langXlfFiles | ForEach-Object { $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf - + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru } @@ -59,7 +57,7 @@ $locJson = @{ LanguageSet = $LanguageSet LocItems = @( $locFiles | ForEach-Object { - $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" + $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { if ($outputPath.Contains($exclusion)) @@ -108,10 +106,10 @@ else { if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) { Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." - + exit 1 } else { Write-Host "Generated LocProject.json and current LocProject.json are identical." } -} \ No newline at end of file +} diff --git a/global.json b/global.json index 54ba2b356..3d8ede800 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22355.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22355.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22356.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22356.3" } }