Skip to content

Commit 60e2816

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20251205.2 (#2982)
[main] Update dependencies from dotnet/arcade
1 parent e04fc5a commit 60e2816

File tree

7 files changed

+15
-21
lines changed

7 files changed

+15
-21
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25578.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25605.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
8+
<Sha>65e09c040143048211dcf6b2bd69336cbf27eec6</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25578.1">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25605.2">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
12+
<Sha>65e09c040143048211dcf6b2bd69336cbf27eec6</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25578.1">
14+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25605.2">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
16+
<Sha>65e09c040143048211dcf6b2bd69336cbf27eec6</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
1616
<MicrosoftAspNetCoreTestHostVersion>6.0.36</MicrosoftAspNetCoreTestHostVersion>
1717
<MicrosoftCrankEventSourcesVersion>0.2.0-alpha.24576.2</MicrosoftCrankEventSourcesVersion>
18-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25578.1</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
18+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25605.2</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
1919
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
2020
<MoqVersion>4.18.4</MoqVersion>
2121
<AutofacVersion>4.9.4</AutofacVersion>

eng/common/core-templates/job/job.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ jobs:
7373
templateContext: ${{ parameters.templateContext }}
7474

7575
variables:
76+
- name: AllowPtrToDetectTestRunRetryFiles
77+
value: true
7678
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
7779
- name: DOTNET_CLI_TELEMETRY_PROFILE
7880
value: '$(Build.Repository.Uri)'

eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
44
preSteps: []
55
binlogPath: artifacts/log/Debug/Build.binlog
6-
condition: ''
6+
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
77
dependsOn: ''
88
pool: ''
99
is1ESPipeline: ''
@@ -41,4 +41,4 @@ jobs:
4141

4242
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
4343
parameters:
44-
binLogPath: ${{ parameters.binLogPath }}
44+
binLogPath: ${{ parameters.binLogPath }}

eng/common/tools.ps1

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
157157
return $global:_DotNetInstallDir
158158
}
159159

160-
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
161-
$env:DOTNET_MULTILEVEL_LOOKUP=0
162-
163160
# Disable first run since we do not need all ASP.NET packages restored.
164161
$env:DOTNET_NOLOGO=1
165162

@@ -225,7 +222,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
225222
# Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build
226223
Write-PipelinePrependPath -Path $dotnetRoot
227224

228-
Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
229225
Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1'
230226

231227
return $global:_DotNetInstallDir = $dotnetRoot

eng/common/tools.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,6 @@ function InitializeDotNetCli {
115115

116116
local install=$1
117117

118-
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
119-
export DOTNET_MULTILEVEL_LOOKUP=0
120-
121118
# Disable first run since we want to control all package sources
122119
export DOTNET_NOLOGO=1
123120

@@ -166,7 +163,6 @@ function InitializeDotNetCli {
166163
# build steps from using anything other than what we've downloaded.
167164
Write-PipelinePrependPath -path "$dotnet_root"
168165

169-
Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
170166
Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1"
171167

172168
# return value

global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.2.25502.107"
3+
"version": "10.0.100"
44
},
55
"tools": {
6-
"dotnet": "10.0.100-rc.2.25502.107",
6+
"dotnet": "10.0.100",
77
"runtimes": {
88
"dotnet": [
99
"8.0.13",
@@ -19,7 +19,7 @@
1919
"runner": "Microsoft.Testing.Platform"
2020
},
2121
"msbuild-sdks": {
22-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25578.1",
23-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25578.1"
22+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25605.2",
23+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25605.2"
2424
}
2525
}

0 commit comments

Comments
 (0)