Skip to content

Commit 4ac7023

Browse files
HongGitdotnet-maestro[bot]
HongGit
and
dotnet-maestro[bot]
authored
update to 8.0 TFM (#5369)
* Update dependencies from https://github.com/dotnet/arcade build 20231006.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23506.1 * Update dependencies from https://github.com/dotnet/arcade build 20231006.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23506.2 * Update dependencies from https://github.com/dotnet/arcade build 20231006.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23506.2 * Update dependencies from https://github.com/dotnet/arcade build 20231008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23508.1 * Update dependencies from https://github.com/dotnet/arcade build 20231010.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23510.1 * Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23510.4 * Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23510.4 * Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23510.4 * Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23510.4 * Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23510.4 * Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23510.4 * Update dependencies from https://github.com/dotnet/arcade build 20231016.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23516.5 * Update dependencies from https://github.com/dotnet/arcade build 20231017.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23517.7 * Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23518.2 * Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23518.2 * Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23518.2 * Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23518.2 * Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23518.2 * Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23518.2 * Update dependencies from https://github.com/dotnet/arcade build 20231024.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23524.1 * Update dependencies from https://github.com/dotnet/arcade build 20231025.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23525.2 * Update dependencies from https://github.com/dotnet/arcade build 20231027.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23527.1 * Update dependencies from https://github.com/dotnet/arcade build 20231027.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23527.4 * Update dependencies from https://github.com/dotnet/arcade build 20231028.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23528.2 * Update dependencies from https://github.com/dotnet/arcade build 20231028.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23528.2 * Update dependencies from https://github.com/dotnet/arcade build 20231031.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23531.1 * Update dependencies from https://github.com/dotnet/arcade build 20231031.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23531.4 * Update dependencies from https://github.com/dotnet/arcade build 20231101.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23551.1 * Update dependencies from https://github.com/dotnet/arcade build 20231102.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23552.4 * Update dependencies from https://github.com/dotnet/arcade build 20231103.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23553.1 * Update dependencies from https://github.com/dotnet/arcade build 20231103.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23553.1 * Update dependencies from https://github.com/dotnet/arcade build 20231103.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23553.1 * Update dependencies from https://github.com/dotnet/arcade build 20231106.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23556.4 * Update dependencies from https://github.com/dotnet/arcade build 20231107.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23557.7 * Update dependencies from https://github.com/dotnet/arcade build 20231108.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23558.3 * Update dependencies from https://github.com/dotnet/arcade build 20231109.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23559.3 * Update dependencies from https://github.com/dotnet/arcade build 20231110.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> 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.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> 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.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> 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.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> 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.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23564.3 * Update dependencies from https://github.com/dotnet/arcade build 20231115.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23565.1 * Update dependencies from https://github.com/dotnet/arcade build 20231115.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23565.1 * Update dependencies from https://github.com/dotnet/arcade build 20231117.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23567.1 * Update dependencies from https://github.com/dotnet/arcade build 20231117.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23567.1 * Update dependencies from https://github.com/dotnet/arcade build 20231117.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23567.1 * Update dependencies from https://github.com/dotnet/arcade build 20231120.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23570.1 * Update dependencies from https://github.com/dotnet/arcade build 20231120.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23570.1 * Update dependencies from https://github.com/dotnet/arcade build 20231122.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23572.2 * Update dependencies from https://github.com/dotnet/arcade build 20231122.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23572.2 * Update dependencies from https://github.com/dotnet/arcade build 20231122.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23572.2 * Update dependencies from https://github.com/dotnet/arcade build 20231122.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23572.2 * Update dependencies from https://github.com/dotnet/arcade build 20231122.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23572.2 * Update dependencies from https://github.com/dotnet/arcade build 20231127.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23577.2 * Update dependencies from https://github.com/dotnet/arcade build 20231128.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23578.2 * Update dependencies from https://github.com/dotnet/arcade build 20231129.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23579.2 * Update dependencies from https://github.com/dotnet/arcade build 20231130.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23580.7 * Update dependencies from https://github.com/dotnet/arcade build 20231201.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23601.1 * Update dependencies from https://github.com/dotnet/arcade build 20231201.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23601.1 * update to 8.0 TFM * Update dependencies from https://github.com/dotnet/arcade build 20231201.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23504.4 -> To Version 9.0.0-beta.23601.1 * fix various XUnitTest errors * update asp.net core to 8.x * update aspnet core version * update Helix to 8.x * fix a test issue with Linux * update Linux image pool * revert the build image change * update Linux OS IDs * update per code review feedback --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent b5867a1 commit 4ac7023

File tree

87 files changed

+352
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+352
-104
lines changed

‎Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
</ItemGroup>
4141

4242
<PropertyGroup>
43-
<ScenarioTestTargetFrameworks>net6.0;net7.0;net8.0</ScenarioTestTargetFrameworks>
44-
<UnitTestTargetFrameworks>net6.0;net7.0;net8.0</UnitTestTargetFrameworks>
43+
<ScenarioTestTargetFrameworks>net8.0</ScenarioTestTargetFrameworks>
44+
<UnitTestTargetFrameworks>net8.0</UnitTestTargetFrameworks>
4545
<!-- This is the target framework version of the built tests picked up to send to Helix -->
46-
<XUnitPublishTargetFramework>net6.0</XUnitPublishTargetFramework>
46+
<XUnitPublishTargetFramework>net8.0</XUnitPublishTargetFramework>
4747
</PropertyGroup>
4848

4949
<PropertyGroup Condition="'$(IsTestProject)' == 'true'">

‎eng/SendToHelix.proj

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<HelixBuild>$(BUILD_BUILDNUMBER)</HelixBuild>
77
<HelixBuild Condition="'$(HelixBuild)' == ''">123460.01</HelixBuild>
88
<DotNetCliPackageType>sdk</DotNetCliPackageType>
9-
<DotNetCliVersion>6.0.404</DotNetCliVersion>
9+
<DotNetCliVersion>8.0.100</DotNetCliVersion>
1010
<IncludeDotNetCli>true</IncludeDotNetCli>
1111

1212
<EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
@@ -31,16 +31,17 @@
3131

3232
<ItemGroup Condition="'$(TestJob)' == 'Windows' AND '$(RunAsInternal)'" >
3333
<HelixTargetQueue Include="windows.11.amd64.client" />
34-
<HelixTargetQueue Include="(Debian.11.Amd64)ubuntu.2004.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64" />
35-
<HelixTargetQueue Include="RedHat.7.Amd64" />
34+
<HelixTargetQueue Include="(Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64" />
35+
<HelixTargetQueue Include="(Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64" />
3636
</ItemGroup>
3737

3838
<ItemGroup Condition="'$(TestJob)' == 'Linux'" >
39-
<HelixTargetQueue Include="Centos.7.Amd64.Open" />
40-
<HelixTargetQueue Include="(Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64" />
41-
<HelixTargetQueue Include="RedHat.7.Amd64.Open" />
4239
<HelixTargetQueue Include="SLES.15.Amd64.Open" />
43-
<HelixTargetQueue Include="Ubuntu.2004.Amd64.Open" />
40+
<HelixTargetQueue Include="(Fedora.38.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-38-helix" />
41+
<HelixTargetQueue Include="Ubuntu.2204.Amd64.Open" />
42+
<HelixTargetQueue Include="(Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64" />
43+
<HelixTargetQueue Include="(Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64" />
44+
<HelixTargetQueue Include="(openSUSE.15.2.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64" />
4445
</ItemGroup>
4546

4647
<ItemGroup Condition="'$(TestJob)' == 'MacOS'" >

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23504.4">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23601.1">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>f1868a684ed9766d4247d672fd5f96bba4d4bb00</Sha>
9+
<Sha>38aa367e014493c6f6ebfe94d9029bea01d072c4</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23504.4">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23601.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>f1868a684ed9766d4247d672fd5f96bba4d4bb00</Sha>
13+
<Sha>38aa367e014493c6f6ebfe94d9029bea01d072c4</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23504.4">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23601.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>f1868a684ed9766d4247d672fd5f96bba4d4bb00</Sha>
17+
<Sha>38aa367e014493c6f6ebfe94d9029bea01d072c4</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.23504.4</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23504.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.23601.1</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23601.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

‎eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do
105105
-binarylog|-bl)
106106
binary_log=true
107107
;;
108-
-excludeCIBinarylog|-nobl)
108+
-excludecibinarylog|-nobl)
109109
exclude_ci_binary_log=true
110110
;;
111111
-pipelineslog|-pl)

‎eng/common/cross/build-rootfs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
487487
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
488488
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
489489
-U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \
490-
search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')"
490+
search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')"
491491
fi
492492

493493
# install all packages in one go

‎eng/common/cross/riscv64/tizen/tizen.patch

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
2+
--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf64-littleriscv)
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) )

‎eng/common/cross/tizen-build-rootfs.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ case "$ARCH" in
2222
TIZEN_ARCH="x86_64"
2323
LINK_ARCH="x86"
2424
;;
25+
riscv64)
26+
TIZEN_ARCH="riscv64"
27+
LINK_ARCH="riscv"
28+
;;
2529
*)
2630
echo "Unsupported architecture for tizen: $ARCH"
2731
exit 1
@@ -58,4 +62,21 @@ rm -rf $TIZEN_TMP_DIR
5862
echo ">>Start configuring Tizen rootfs"
5963
ln -sfn asm-${LINK_ARCH} ./usr/include/asm
6064
patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
65+
if [[ "$TIZEN_ARCH" == "riscv64" ]]; then
66+
echo "Fixing broken symlinks in $PWD"
67+
rm ./usr/lib64/libresolv.so
68+
ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so
69+
rm ./usr/lib64/libpthread.so
70+
ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so
71+
rm ./usr/lib64/libdl.so
72+
ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so
73+
rm ./usr/lib64/libutil.so
74+
ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so
75+
rm ./usr/lib64/libm.so
76+
ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so
77+
rm ./usr/lib64/librt.so
78+
ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so
79+
rm ./lib/ld-linux-riscv64-lp64d.so.1
80+
ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1
81+
fi
6182
echo "<<Finish configuring Tizen rootfs"

‎eng/common/cross/tizen-fetch.sh

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,28 @@ fetch_tizen_pkgs()
156156
done
157157
}
158158

159+
if [ "$TIZEN_ARCH" == "riscv64" ]; then
160+
BASE="Tizen-Base-RISCV"
161+
UNIFIED="Tizen-Unified-RISCV"
162+
else
163+
BASE="Tizen-Base"
164+
UNIFIED="Tizen-Unified"
165+
fi
166+
159167
Inform "Initialize ${TIZEN_ARCH} base"
160-
fetch_tizen_pkgs_init standard Tizen-Base
168+
fetch_tizen_pkgs_init standard $BASE
161169
Inform "fetch common packages"
162170
fetch_tizen_pkgs ${TIZEN_ARCH} gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
163171
Inform "fetch coreclr packages"
164-
fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
172+
fetch_tizen_pkgs ${TIZEN_ARCH} libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
173+
if [ "$TIZEN_ARCH" != "riscv64" ]; then
174+
fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel
175+
fi
165176
Inform "fetch corefx packages"
166177
fetch_tizen_pkgs ${TIZEN_ARCH} libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
167178

168179
Inform "Initialize standard unified"
169-
fetch_tizen_pkgs_init standard Tizen-Unified
180+
fetch_tizen_pkgs_init standard $UNIFIED
170181
Inform "fetch corefx packages"
171182
fetch_tizen_pkgs ${TIZEN_ARCH} gssdp gssdp-devel tizen-release
172183

‎eng/common/cross/toolchain.cmake

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
8080
set(TOOLCHAIN "riscv64-alpine-linux-musl")
8181
else()
8282
set(TOOLCHAIN "riscv64-linux-gnu")
83+
if(TIZEN)
84+
set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0")
85+
endif()
8386
endif()
8487
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
8588
set(CMAKE_SYSTEM_PROCESSOR s390x)
@@ -144,6 +147,10 @@ if(TIZEN)
144147
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
145148
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
146149
endif()
150+
if(TARGET_ARCH_NAME STREQUAL "riscv64")
151+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
152+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu)
153+
endif()
147154
endif()
148155

149156
if(ANDROID)
@@ -270,7 +277,7 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
270277
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
271278
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
272279
endif()
273-
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
280+
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
274281
if(TIZEN)
275282
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
276283
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
@@ -281,6 +288,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
281288
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
282289
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
283290
endif()
291+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
292+
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
284293
elseif(TARGET_ARCH_NAME STREQUAL "x86")
285294
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
286295
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -328,6 +337,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
328337
if(TARGET_ARCH_NAME STREQUAL "armel")
329338
add_compile_options(-mfloat-abi=softfp)
330339
endif()
340+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
341+
add_compile_options("--target=${TOOLCHAIN}")
331342
elseif(TARGET_ARCH_NAME STREQUAL "x86")
332343
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
333344
add_compile_options(--target=${TOOLCHAIN})

0 commit comments

Comments
 (0)