diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a744dd260b389c365ec8caadf80bc8081615cb27..262212ec4fb0040ddff73f3b7b477d8bd5cb782d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f https://github.com/microsoft/vstest @@ -254,9 +254,9 @@ https://github.com/dotnet/xharness 7871eb473366b7246d628ba30bfc70dd84f8dbb9 - + https://github.com/dotnet/arcade - a264eb13fea14125f3ef8d4056586cd66fa55309 + 54a00a84b53b63a74d232498a9d1476ff2000b7f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index f7dff1ed0f5e565d8c171bd9fbaba3e96001dc48..8a29bb1701519b30770b250103ce3458a9435094 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-preview.4.22252.4 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 - 2.5.1-beta.22327.2 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 - 7.0.0-beta.22327.2 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 + 2.5.1-beta.22358.3 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 + 7.0.0-beta.22358.3 6.0.0-preview.1.102 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 25e97ac00772d7c208ca115c518c8ab887752e6f..afdd175029092395f81e8e61c3e0963cceb2a20c 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/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 24a5e65de1b3e38d4489a7dd3b6933c9bb426fe1..8d48ec5680fc4ccba9504ad8093de0a4e8d53892 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -87,6 +87,7 @@ try { $NativeTools.PSObject.Properties | ForEach-Object { $ToolName = $_.Name $ToolVersion = $_.Value + $InstalledTools = @{} if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { if ($ToolVersion -eq "latest") { @@ -111,9 +112,10 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } - exit 0 + return $InstalledTools } else { $NativeTools.PSObject.Properties | ForEach-Object { $ToolName = $_.Name diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 6d7ba15e5f2b5d4ce44b13b54cb151bfaa77dd7e..4b99a9cad3b77213a8d14f83ed559e1b1954804e 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 395b43eebb662a7a7f60431d11ed8b3c9720da60..9638c63c7258b52ca3d511a15b07b4c035f81860 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -635,7 +635,7 @@ function InitializeNativeTools() { InstallDirectory = "$ToolsDir" } } - if (Test-Path variable:NativeToolsOnMachine) { + if ($env:NativeToolsOnMachine) { Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..." $nativeArgs += @{ PathPromotion = $true } } diff --git a/global.json b/global.json index 04e949df1ca57245f40ee7aaa4f2494fab5391d0..962334051578f95c58e8617400bebc6bacdb6908 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.5.22307.18" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22327.2", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22327.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22358.3", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.6.22354.1"