Skip to content

Commit 4ba6e00

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#4923)
[main] Update dependencies from dotnet/arcade
1 parent b223cbe commit 4ba6e00

6 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
</Dependency>
3434
</ProductDependencies>
3535
<ToolsetDependencies>
36-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22327.2">
36+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22358.3">
3737
<Uri>https://github.com/dotnet/arcade</Uri>
38-
<Sha>a264eb13fea14125f3ef8d4056586cd66fa55309</Sha>
38+
<Sha>54a00a84b53b63a74d232498a9d1476ff2000b7f</Sha>
3939
<SourceBuild RepoName="arcade" ManagedOnly="true" />
4040
</Dependency>
4141
</ToolsetDependencies>

‎eng/common/generate-locproject.ps1‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ Param(
1010

1111
Set-StrictMode -Version 2.0
1212
$ErrorActionPreference = "Stop"
13-
. $PSScriptRoot\tools.ps1
14-
15-
Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
13+
. $PSScriptRoot\pipeline-logging-functions.ps1
1614

1715
$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json"
1816
$exclusions = @{ Exclusions = @() }
@@ -28,7 +26,7 @@ $jsonFiles = @()
2826
$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern
2927
$jsonTemplateFiles | ForEach-Object {
3028
$null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json
31-
29+
3230
$destinationFile = "$($_.Directory.FullName)\$($Matches.1).json"
3331
$jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
3432
}
@@ -46,7 +44,7 @@ if ($allXlfFiles) {
4644
}
4745
$langXlfFiles | ForEach-Object {
4846
$null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf
49-
47+
5048
$destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
5149
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
5250
}
@@ -59,7 +57,7 @@ $locJson = @{
5957
LanguageSet = $LanguageSet
6058
LocItems = @(
6159
$locFiles | ForEach-Object {
62-
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
60+
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
6361
$continue = $true
6462
foreach ($exclusion in $exclusions.Exclusions) {
6563
if ($outputPath.Contains($exclusion))
@@ -108,10 +106,10 @@ else {
108106

109107
if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) {
110108
Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
111-
109+
112110
exit 1
113111
}
114112
else {
115113
Write-Host "Generated LocProject.json and current LocProject.json are identical."
116114
}
117-
}
115+
}

‎eng/common/init-tools-native.ps1‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ try {
8787
$NativeTools.PSObject.Properties | ForEach-Object {
8888
$ToolName = $_.Name
8989
$ToolVersion = $_.Value
90+
$InstalledTools = @{}
9091

9192
if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
9293
if ($ToolVersion -eq "latest") {
@@ -111,9 +112,10 @@ try {
111112
$ToolPath = Convert-Path -Path $BinPath
112113
Write-Host "Adding $ToolName to the path ($ToolPath)..."
113114
Write-Host "##vso[task.prependpath]$ToolPath"
115+
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
114116
}
115117
}
116-
exit 0
118+
return $InstalledTools
117119
} else {
118120
$NativeTools.PSObject.Properties | ForEach-Object {
119121
$ToolName = $_.Name

‎eng/common/native/init-compiler.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
7171
# Set default versions
7272
if [[ -z "$majorVersion" ]]; then
7373
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
74-
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 )
74+
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 )
7575
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
7676

7777
for version in "${versions[@]}"; do

‎eng/common/tools.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ function InitializeNativeTools() {
635635
InstallDirectory = "$ToolsDir"
636636
}
637637
}
638-
if (Test-Path variable:NativeToolsOnMachine) {
638+
if ($env:NativeToolsOnMachine) {
639639
Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..."
640640
$nativeArgs += @{ PathPromotion = $true }
641641
}

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"tools": {
3-
"dotnet": "7.0.100-preview.4.22178.9",
3+
"dotnet": "7.0.100-preview.5.22307.18",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
77
]
88
}
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.2"
11+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3"
1212
}
1313
}

0 commit comments

Comments
 (0)