Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (dotnet#94630)
Browse files Browse the repository at this point in the history 
* Update dependencies from https://github.com/dotnet/arcade build 20231110.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23559.3 -> To Version 9.0.0-beta.23560.1

* Update dependencies from https://github.com/dotnet/arcade build 20231110.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23559.3 -> To Version 9.0.0-beta.23560.1

* Update dependencies from https://github.com/dotnet/arcade build 20231110.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23559.3 -> To Version 9.0.0-beta.23560.1

* Update dependencies from https://github.com/dotnet/arcade build 20231113.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23559.3 -> To Version 9.0.0-beta.23563.1

* Update dependencies from https://github.com/dotnet/arcade build 20231114.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23559.3 -> To Version 9.0.0-beta.23564.3

* Update to VS preview images

* Update dependencies from https://github.com/dotnet/arcade build 20231115.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23559.3 -> To Version 9.0.0-beta.23565.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <[email protected]>
  • Loading branch information
@dotnet-maestro @ViktorHofer
3 people authored Nov 16, 2023
1 parent 2e912a3 commit 7f42ffa
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 62 deletions.
80 changes: 40 additions & 40 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,82 +111,82 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.3-beta.23559.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.3-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23530.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -333,9 +333,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e74a52e487efdf4f1dfcb7540abf5dd529ce2e4e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.23559.3">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.23565.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
<Sha>0f16479e1811ef3b5c9fc251563c6181f9083c34</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23559.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-alpha.1.23551.3</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.23559.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.23559.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.23559.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.23559.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>9.0.0-beta.23559.3</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.23559.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.3-beta.23559.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.23559.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23559.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.23559.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.23559.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23559.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.23559.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23559.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.23559.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.23559.3</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.23565.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.23565.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.23565.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.23565.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>9.0.0-beta.23565.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.23565.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.3-beta.23565.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.23565.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23565.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.23565.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.23565.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23565.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.23565.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23565.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.23565.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.23565.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
4 changes: 4 additions & 0 deletions eng/common/cross/toolchain.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
endif()
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
elseif(TARGET_ARCH_NAME STREQUAL "x86")
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
Expand Down Expand Up @@ -335,6 +337,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
if(TARGET_ARCH_NAME STREQUAL "armel")
add_compile_options(-mfloat-abi=softfp)
endif()
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
add_compile_options("--target=${TOOLCHAIN}")
elseif(TARGET_ARCH_NAME STREQUAL "x86")
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
add_compile_options(--target=${TOOLCHAIN})
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/xplat-setup.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ jobs:
# Public Windows Build Pool
${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')), eq(variables['System.TeamProject'], 'public')) }}:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64.open
demands: ImageOverride -equals windows.vs2022preview.amd64.open


${{ if eq(parameters.helixQueuesTemplate, '') }}:
Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "8.0.100-rtm.23506.1",
"version": "8.0.100",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "8.0.100-rtm.23506.1"
"dotnet": "8.0.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23559.3",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23559.3",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23559.3",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23565.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23565.1",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23565.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23529.4"
Expand Down

0 comments on commit 7f42ffa

Please sign in to comment.