Skip to content

Commit b929fc7

Browse files
himgoyalmicrohimgoyalmicro
committed
Merged PR 48515: Update dependencies from https://github.com/dotnet/arcade build 20250220.1 (#...
Update dependencies from https://github.com/dotnet/arcade build 20250220.1 (#10561) Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.25111.4 -> To Version 8.0.0-beta.25120.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> ---- #### AI description (iteration 1) #### PR Classification Dependency update #### PR Summary This pull request updates dependencies from the `dotnet/arcade` build 20250220.1 and makes several configuration adjustments. - Updated versions and SHAs for multiple dependencies in `eng/Version.Details.xml`. - Added `HelixProjectArguments` parameter and updated related scripts in `eng/common/templates-official/steps/send-to-helix.yml` and `eng/common/templates/steps/send-to-helix.yml`. - Added new package sources and disabled some in `NuGet.config`. - Updated dependency versions in `eng/Versions.props` and `global.json`. - Added toolchain flags for `s390x` architecture in `eng/common/cross/toolchain.cmake`. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
1 parent 9d1a7bb commit b929fc7

File tree

6 files changed

+26
-20
lines changed

6 files changed

+26
-20
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,25 +156,25 @@
156156
</Dependency>
157157
</ProductDependencies>
158158
<ToolsetDependencies>
159-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25111.4">
159+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25120.1">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
161+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25111.4">
163+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25120.1">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
165+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25111.4">
167+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25120.1">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
169+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.25111.4">
171+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.25120.1">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
173+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25111.4">
175+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25120.1">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
177+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
178178
</Dependency>
179179
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
180180
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/arcade -->
5151
<PropertyGroup>
52-
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.25111.4</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.25111.4</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.25120.1</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.25120.1</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Sourcelink -->
5656
<PropertyGroup>

‎eng/common/cross/toolchain.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
280280
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
281281
add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
282282
endif()
283+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
284+
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
283285
elseif(TARGET_ARCH_NAME STREQUAL "x86")
284286
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
285287
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -327,6 +329,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
327329
if(TARGET_ARCH_NAME STREQUAL "armel")
328330
add_compile_options(-mfloat-abi=softfp)
329331
endif()
332+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
333+
add_compile_options("--target=${TOOLCHAIN}")
330334
elseif(TARGET_ARCH_NAME STREQUAL "x86")
331335
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
332336
add_compile_options(--target=${TOOLCHAIN})

‎eng/common/templates-official/steps/send-to-helix.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ parameters:
88
HelixConfiguration: '' # optional -- additional property attached to a job
99
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
1010
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
11+
HelixProjectArguments: '' # optional -- arguments passed to the build command for helixpublish.proj
1112
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
1213
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
1314
WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
@@ -24,12 +25,12 @@ parameters:
2425
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
2526
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
2627
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
27-
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
28+
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
2829
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
2930
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
3031

3132
steps:
32-
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
33+
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
3334
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
3435
env:
3536
BuildConfig: $(_BuildConfig)
@@ -59,7 +60,7 @@ steps:
5960
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6061
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
6162
continueOnError: ${{ parameters.continueOnError }}
62-
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
63+
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
6364
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
6465
env:
6566
BuildConfig: $(_BuildConfig)

‎eng/common/templates/steps/send-to-helix.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ parameters:
88
HelixConfiguration: '' # optional -- additional property attached to a job
99
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
1010
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
11+
HelixProjectArguments: '' # optional -- arguments passed to the build command for helixpublish.proj
1112
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
1213
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
1314
WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
@@ -24,12 +25,12 @@ parameters:
2425
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
2526
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
2627
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
27-
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
28+
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
2829
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
2930
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
3031

3132
steps:
32-
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
33+
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
3334
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
3435
env:
3536
BuildConfig: $(_BuildConfig)
@@ -59,7 +60,7 @@ steps:
5960
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6061
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
6162
continueOnError: ${{ parameters.continueOnError }}
62-
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
63+
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
6364
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
6465
env:
6566
BuildConfig: $(_BuildConfig)

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25111.4",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25111.4"
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1"
1717
},
1818
"sdk": {
1919
"version": "8.0.113"

0 commit comments

Comments
 (0)