Skip to content

Commit 4986423

Browse files
[main] Update dependencies from dotnet/arcade (dotnet#7563)
* Update dependencies from https://github.com/dotnet/arcade build 20251205.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25578.1 -> To Version 11.0.0-beta.25605.2 * Update dependencies from https://github.com/dotnet/arcade build 20251212.6 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25578.1 -> To Version 11.0.0-beta.25612.6 * Update dependencies from https://github.com/dotnet/arcade build 20251217.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25578.1 -> To Version 11.0.0-beta.25617.1 * Update dependencies from https://github.com/dotnet/arcade build 20251226.7 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25578.1 -> To Version 11.0.0-beta.25626.7 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent adf0cec commit 4986423

File tree

13 files changed

+43
-42
lines changed

13 files changed

+43
-42
lines changed

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25578.1">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25626.7">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
12+
<Sha>47888ab45fbdd0e6c0fe5e7f82eb1fe47cd7b7f0</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25578.1">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25626.7">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
16+
<Sha>47888ab45fbdd0e6c0fe5e7f82eb1fe47cd7b7f0</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="11.0.0-beta.25578.1">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="11.0.0-beta.25626.7">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
20+
<Sha>47888ab45fbdd0e6c0fe5e7f82eb1fe47cd7b7f0</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25578.1">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25626.7">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
24+
<Sha>47888ab45fbdd0e6c0fe5e7f82eb1fe47cd7b7f0</Sha>
2525
</Dependency>
2626
<!-- Stay on package 8.0 until we stop testing for net6.0
2727
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
2929
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
3030
</Dependency> -->
31-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="11.0.0-beta.25578.1">
31+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="11.0.0-beta.25626.7">
3232
<Uri>https://github.com/dotnet/arcade</Uri>
33-
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
33+
<Sha>47888ab45fbdd0e6c0fe5e7f82eb1fe47cd7b7f0</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.25578.1">
35+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.25626.7">
3636
<Uri>https://github.com/dotnet/arcade</Uri>
37-
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
37+
<Sha>47888ab45fbdd0e6c0fe5e7f82eb1fe47cd7b7f0</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25578.1">
39+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25626.7">
4040
<Uri>https://github.com/dotnet/arcade</Uri>
41-
<Sha>846929727a388f2b1fd3ccf21f67694f44b91b4d</Sha>
41+
<Sha>47888ab45fbdd0e6c0fe5e7f82eb1fe47cd7b7f0</Sha>
4242
</Dependency>
4343
</ToolsetDependencies>
4444
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
9999
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
100100
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
101-
<MicrosoftDotNetXUnitExtensionsVersion>11.0.0-beta.25578.1</MicrosoftDotNetXUnitExtensionsVersion>
101+
<MicrosoftDotNetXUnitExtensionsVersion>11.0.0-beta.25626.7</MicrosoftDotNetXUnitExtensionsVersion>
102102
<MicrosoftExtensionsDependencyModelVersion>9.0.4</MicrosoftExtensionsDependencyModelVersion>
103103
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
104104
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>

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/core-templates/steps/install-microbuild-impl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ parameters:
1818
type: boolean
1919

2020
steps:
21-
- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
21+
- ${{ if eq(parameters.enablePreviewMicrobuild, true) }}:
2222
- task: MicroBuildSigningPluginPreview@4
2323
displayName: Install Preview MicroBuild plugin
2424
inputs: ${{ parameters.microbuildTaskInputs }}

eng/common/core-templates/steps/source-index-stage1-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ steps:
1414
workingDirectory: $(Agent.TempDirectory)
1515

1616
- script: |
17-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
18-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
17+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
18+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
1919
displayName: "Source Index: Download netsourceindex Tools"
2020
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
2121
workingDirectory: $(Agent.TempDirectory)

eng/common/cross/build-rootfs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ __AlpinePackages+=" krb5-dev"
7272
__AlpinePackages+=" openssl-dev"
7373
__AlpinePackages+=" zlib-dev"
7474

75-
__FreeBSDBase="13.4-RELEASE"
75+
__FreeBSDBase="13.5-RELEASE"
7676
__FreeBSDPkg="1.21.3"
7777
__FreeBSDABI="13"
7878
__FreeBSDPackages="libunwind"
@@ -383,7 +383,7 @@ while :; do
383383
;;
384384
freebsd14)
385385
__CodeName=freebsd
386-
__FreeBSDBase="14.2-RELEASE"
386+
__FreeBSDBase="14.3-RELEASE"
387387
__FreeBSDABI="14"
388388
__SkipUnmount=1
389389
;;

eng/common/internal-feed-operations.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function SetupCredProvider {
2626
$url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1'
2727

2828
Write-Host "Writing the contents of 'installcredprovider.ps1' locally..."
29-
Invoke-WebRequest $url -OutFile installcredprovider.ps1
29+
Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1
3030

3131
Write-Host 'Installing plugin...'
3232
.\installcredprovider.ps1 -Force

eng/common/native/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ case "$os" in
2727
libssl-dev libkrb5-dev pigz cpio
2828

2929
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
30-
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then
30+
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then
3131
pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
3232
$pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
3333
elif [ "$ID" = "amzn" ]; then

eng/common/post-build/nuget-verification.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ if ($NuGetExePath) {
6565
Write-Host "Downloading nuget.exe from $nugetExeUrl..."
6666
$ProgressPreference = 'SilentlyContinue'
6767
try {
68-
Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
68+
Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe
6969
$ProgressPreference = 'Continue'
7070
} catch {
7171
$ProgressPreference = 'Continue'

0 commit comments

Comments
 (0)