Skip to content

Commit fbe00bf

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#5006)
[main] Update dependencies from dotnet/arcade
1 parent 76bf8c1 commit fbe00bf

File tree

5 files changed

+23
-26
lines changed

5 files changed

+23
-26
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23107.1">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23110.3">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>b31c4466a49800c2f019690e81182c7ffd584dda</Sha>
9+
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23107.1">
11+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23110.3">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>b31c4466a49800c2f019690e81182c7ffd584dda</Sha>
13+
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23107.1">
15+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23110.3">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>b31c4466a49800c2f019690e81182c7ffd584dda</Sha>
17+
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23107.1">
19+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23110.3">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>b31c4466a49800c2f019690e81182c7ffd584dda</Sha>
21+
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23107.1">
23+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23110.3">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>b31c4466a49800c2f019690e81182c7ffd584dda</Sha>
25+
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
2626
</Dependency>
2727
</ToolsetDependencies>
2828
</Dependencies>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
</PropertyGroup>
2424
<!-- Arcade dependencies -->
2525
<PropertyGroup>
26-
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23107.1</MicrosoftDotNetArcadeSdkPackageVersion>
27-
<MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23107.1</MicrosoftDotNetHelixSdkPackageVersion>
28-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23107.1</MicrosoftDotNetGenFacadesPackageVersion>
29-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23107.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
30-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23107.1</MicrosoftDotNetSignToolVersion>
26+
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23110.3</MicrosoftDotNetArcadeSdkPackageVersion>
27+
<MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23110.3</MicrosoftDotNetHelixSdkPackageVersion>
28+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23110.3</MicrosoftDotNetGenFacadesPackageVersion>
29+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23110.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
30+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23110.3</MicrosoftDotNetSignToolVersion>
3131
</PropertyGroup>
3232
<!-- CoreFx dependencies -->
3333
<PropertyGroup>

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ try {
8383
Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue
8484
if ($NativeTools) {
8585
if ($PathPromotion -eq $True) {
86-
if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build
86+
$ArcadeToolsDirectory = "$env:SYSTEMDRIVE\arcade-tools"
87+
if (Test-Path $ArcadeToolsDirectory) { # if this directory exists, we should use native tools on machine
8788
$NativeTools.PSObject.Properties | ForEach-Object {
8889
$ToolName = $_.Name
8990
$ToolVersion = $_.Value
@@ -93,11 +94,6 @@ try {
9394
if ($ToolVersion -eq "latest") {
9495
$ToolVersion = ""
9596
}
96-
$ArcadeToolsDirectory = "C:\arcade-tools"
97-
if (-not (Test-Path $ArcadeToolsDirectory)) {
98-
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
99-
exit 1
100-
}
10197
$ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)
10298
if ($ToolDirectories -eq $null) {
10399
Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image."
@@ -125,6 +121,7 @@ try {
125121

126122
if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
127123
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding."
124+
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "If this is running on a build machine, the arcade-tools directory was not found, which means there's an error with the image."
128125
}
129126
}
130127
exit 0

‎eng/common/templates/job/job.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
135135
- task: NuGetAuthenticate@0
136136

137-
- ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}:
137+
- ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}:
138138
- task: DownloadPipelineArtifact@2
139139
inputs:
140140
buildType: current
@@ -171,7 +171,7 @@ jobs:
171171
TeamName: $(_TeamName)
172172

173173
- ${{ if ne(parameters.artifacts.publish, '') }}:
174-
- ${{ if or(eq(parameters.artifacts.publish.artifacts, 'true'), ne(parameters.artifacts.publish.artifacts, '')) }}:
174+
- ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
175175
- task: CopyFiles@2
176176
displayName: Gather binaries for publish to artifacts
177177
inputs:
@@ -192,7 +192,7 @@ jobs:
192192
ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
193193
continueOnError: true
194194
condition: always()
195-
- ${{ if or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}:
195+
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
196196
- publish: artifacts/log
197197
artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
198198
displayName: Publish logs

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"version": "8.0.100-alpha.1.23061.8"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23107.1",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23107.1"
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23110.3",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23110.3"
1717
}
1818
}

0 commit comments

Comments
 (0)