Skip to content

Commit 52fbc9b

Browse files
author
Mirroring
committed
Merge commit 'dbd43c6ac6d24767f8103eba6f3e723d79db7111'
2 parents 6c18a6f + dbd43c6 commit 52fbc9b

File tree

6 files changed

+30
-24
lines changed

6 files changed

+30
-24
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,29 +151,29 @@
151151
</Dependency>
152152
</ProductDependencies>
153153
<ToolsetDependencies>
154-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25111.4">
154+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25120.1">
155155
<Uri>https://github.com/dotnet/arcade</Uri>
156-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
156+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25111.4">
158+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25120.1">
159159
<Uri>https://github.com/dotnet/arcade</Uri>
160-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
160+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
161161
</Dependency>
162-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25111.4">
162+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25120.1">
163163
<Uri>https://github.com/dotnet/arcade</Uri>
164-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
164+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25111.4">
166+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25120.1">
167167
<Uri>https://github.com/dotnet/arcade</Uri>
168-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
168+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
169169
</Dependency>
170-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25111.4">
170+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25120.1">
171171
<Uri>https://github.com/dotnet/arcade</Uri>
172-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
172+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25111.4">
174+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25120.1">
175175
<Uri>https://github.com/dotnet/arcade</Uri>
176-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
176+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
177177
</Dependency>
178178
</ToolsetDependencies>
179179
</Dependencies>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
</PropertyGroup>
1313
<PropertyGroup>
1414
<!-- arcade -->
15-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25111.4</MicrosoftDotNetBuildTasksFeedVersion>
16-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25111.4</MicrosoftDotNetBuildTasksArchivesVersion>
17-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25111.4</MicrosoftDotNetBuildTasksInstallersVersion>
18-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25111.4</MicrosoftDotNetVersionToolsTasksVersion>
15+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksFeedVersion>
16+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksArchivesVersion>
17+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksInstallersVersion>
18+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25120.1</MicrosoftDotNetVersionToolsTasksVersion>
1919
<!-- corefx -->
2020
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
2121
<SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>

‎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
@@ -3,8 +3,8 @@
33
"dotnet": "8.0.113"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25111.4",
7-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25111.4",
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25120.1",
88
"Microsoft.Build.NoTargets": "3.7.0",
99
"Microsoft.Build.Traversal": "3.4.0"
1010
}

0 commit comments

Comments
 (0)