Update to .NET 7 RC 2
Resolves: RHBZ#2134641
This commit is contained in:
Omair Majid
parent
a3e3de73c6
commit
3e3fe3b505
3
.gitignore
vendored
3
.gitignore
vendored
@ -4,3 +4,6 @@
|
|||||||
/dotnet-v7.0.100-rc.1.22431.12-x64-bootstrap.tar.xz
|
/dotnet-v7.0.100-rc.1.22431.12-x64-bootstrap.tar.xz
|
||||||
/dotnet-arm64-prebuilts-2022-09-17.tar.gz
|
/dotnet-arm64-prebuilts-2022-09-17.tar.gz
|
||||||
/dotnet-s390x-prebuilts-2022-08-24.tar.gz
|
/dotnet-s390x-prebuilts-2022-08-24.tar.gz
|
||||||
|
/dotnet-v7.0.100-rc.2.22477.23-x64-bootstrap.tar.xz
|
||||||
|
/dotnet-arm64-prebuilts-2022-10-12.tar.gz
|
||||||
|
/dotnet-s390x-prebuilts-2022-10-12.tar.gz
|
||||||
|
|||||||
@ -6,12 +6,12 @@
|
|||||||
# until that's done, disable LTO. This has to happen before setting the flags below.
|
# until that's done, disable LTO. This has to happen before setting the flags below.
|
||||||
%define _lto_cflags %{nil}
|
%define _lto_cflags %{nil}
|
||||||
|
|
||||||
%global host_version 7.0.0-rc.1.22426.10
|
%global host_version 7.0.0-rc.2.22472.3
|
||||||
%global runtime_version 7.0.0-rc.1.22426.10
|
%global runtime_version 7.0.0-rc.2.22472.3
|
||||||
%global aspnetcore_runtime_version 7.0.0-rc.1.22427.2
|
%global aspnetcore_runtime_version 7.0.0-rc.2.22476.2
|
||||||
%global sdk_version 7.0.100-rc.1.22464.1
|
%global sdk_version 7.0.100-rc.2.22511.1
|
||||||
%global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
|
%global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
|
||||||
%global templates_version 7.0.0-rc.1.22427.2
|
%global templates_version 7.0.0-rc.2.22476.2
|
||||||
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
|
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
|
||||||
|
|
||||||
%global host_rpm_version 7.0.0
|
%global host_rpm_version 7.0.0
|
||||||
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
# upstream can update releases without revving the SDK version so these don't always match
|
# upstream can update releases without revving the SDK version so these don't always match
|
||||||
#%%global upstream_tag v%%{sdk_version}
|
#%%global upstream_tag v%%{sdk_version}
|
||||||
%global upstream_tag v7.0.100-rc.1.22431.12
|
%global upstream_tag v7.0.100-rc.2.22477.23
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} < 8
|
%if 0%{?fedora} || 0%{?rhel} < 8
|
||||||
%global use_bundled_libunwind 0
|
%global use_bundled_libunwind 0
|
||||||
@ -47,7 +47,7 @@
|
|||||||
|
|
||||||
Name: dotnet7.0
|
Name: dotnet7.0
|
||||||
Version: %{sdk_rpm_version}
|
Version: %{sdk_rpm_version}
|
||||||
Release: 0.2.rc1%{?dist}
|
Release: 0.3.rc2%{?dist}
|
||||||
Summary: .NET Runtime and SDK
|
Summary: .NET Runtime and SDK
|
||||||
License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
|
License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
|
||||||
URL: https://github.com/dotnet/
|
URL: https://github.com/dotnet/
|
||||||
@ -57,9 +57,9 @@ URL: https://github.com/dotnet/
|
|||||||
# ./build-dotnet-tarball --bootstrap %%{upstream_tag}
|
# ./build-dotnet-tarball --bootstrap %%{upstream_tag}
|
||||||
Source0: dotnet-%{upstream_tag}-x64-bootstrap.tar.xz
|
Source0: dotnet-%{upstream_tag}-x64-bootstrap.tar.xz
|
||||||
# Generated via ./build-arm64-bootstrap-tarball
|
# Generated via ./build-arm64-bootstrap-tarball
|
||||||
Source1: dotnet-arm64-prebuilts-2022-09-17.tar.gz
|
Source1: dotnet-arm64-prebuilts-2022-10-12.tar.gz
|
||||||
# Generated manually, same pattern as the arm64 tarball
|
# Generated manually, same pattern as the arm64 tarball
|
||||||
Source2: dotnet-s390x-prebuilts-2022-08-24.tar.gz
|
Source2: dotnet-s390x-prebuilts-2022-10-12.tar.gz
|
||||||
%else
|
%else
|
||||||
# The source is generated on a Fedora box via:
|
# The source is generated on a Fedora box via:
|
||||||
# ./build-dotnet-tarball %%{upstream_tag}
|
# ./build-dotnet-tarball %%{upstream_tag}
|
||||||
@ -69,9 +69,12 @@ Source0: dotnet-%{upstream_tag}.tar.gz
|
|||||||
Source10: check-debug-symbols.py
|
Source10: check-debug-symbols.py
|
||||||
Source11: dotnet.sh.in
|
Source11: dotnet.sh.in
|
||||||
|
|
||||||
Patch1: razor-compiler-apphost.patch
|
# https://github.com/dotnet/runtime/pull/76916
|
||||||
# https://github.com/dotnet/runtime/pull/74147
|
Patch1: runtime-76916-mono-s390x-opcheckthis.patch
|
||||||
Patch2: runtime-74147-no-pgo-with-mono.patch
|
# https://github.com/microsoft/vstest/pull/4028
|
||||||
|
Patch2: vstest-4028-ppc64le.patch
|
||||||
|
# https://github.com/microsoft/vstest/pull/4066
|
||||||
|
Patch3: vstest-4066-s390x-ppc64le.patch
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||||
@ -368,6 +371,7 @@ rm -rf packages/source-built
|
|||||||
|
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
# Fix bad hardcoded path in build
|
# Fix bad hardcoded path in build
|
||||||
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp
|
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp
|
||||||
@ -592,6 +596,10 @@ export COMPlus_LTTng=0
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 13 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.3.rc2
|
||||||
|
- Update to .NET 7 RC 2
|
||||||
|
- Resolves: RHBZ#2134641
|
||||||
|
|
||||||
* Sat Sep 17 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.2.rc1
|
* Sat Sep 17 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.2.rc1
|
||||||
- Update to .NET 7 RC 1
|
- Update to .NET 7 RC 1
|
||||||
- Enable s390x builds
|
- Enable s390x builds
|
||||||
|
|||||||
@ -1,26 +0,0 @@
|
|||||||
Don't use an apphost for RazorSyntaxGenerator
|
|
||||||
|
|
||||||
The RazorSyntaxGenerator tool is excluded from source-build, but the build
|
|
||||||
system tries to find the apphost matching the TFM anyway. This project targets
|
|
||||||
netcoreapp3.1, so the build fails on s390x because the no apphost exists for
|
|
||||||
that on s390x.
|
|
||||||
--- a/src/razor-compiler/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj
|
|
||||||
+++ a/src/razor-compiler/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj
|
|
||||||
@@ -10,6 +10,7 @@
|
|
||||||
<!-- No need to track public APIs of this tool. -->
|
|
||||||
<AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
|
|
||||||
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
|
||||||
+ <UseAppHost>false</UseAppHost>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
--- a/src/razor-compiler/src/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj
|
|
||||||
+++ a/src/razor-compiler/src/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj
|
|
||||||
@@ -7,6 +7,7 @@
|
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
|
||||||
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
|
||||||
<IsPackable>false</IsPackable>
|
|
||||||
+ <UseAppHost>false</UseAppHost>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
From 98c1b3a803cb01232ee40bb4192679fcab3232e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jo Shields <directhex@apebox.org>
|
|
||||||
Date: Thu, 18 Aug 2022 09:08:36 -0400
|
|
||||||
Subject: [PATCH] Don't try to build PGO tools on platforms with no CoreCLR
|
|
||||||
port.
|
|
||||||
|
|
||||||
Closes: #74102
|
|
||||||
---
|
|
||||||
eng/Subsets.props | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/runtime/eng/Subsets.props b/src/runtime/eng/Subsets.props
|
|
||||||
index 911c24dbde6..1e8e5801e57 100644
|
|
||||||
--- a/src/runtime/eng/Subsets.props
|
|
||||||
+++ b/src/runtime/eng/Subsets.props
|
|
||||||
@@ -62,7 +62,8 @@
|
|
||||||
<DefaultMonoSubsets Condition="'$(MonoAOTEnableLLVM)' == 'true' and '$(MonoAOTLLVMDir)' == ''">mono.llvm+</DefaultMonoSubsets>
|
|
||||||
<DefaultMonoSubsets Condition="'$(TargetOS)' == 'Browser'">$(DefaultMonoSubsets)mono.wasmruntime+</DefaultMonoSubsets>
|
|
||||||
<DefaultMonoSubsets Condition="'$(MonoCrossAOTTargetOS)' != ''">$(DefaultMonoSubsets)mono.aotcross+</DefaultMonoSubsets>
|
|
||||||
- <DefaultMonoSubsets>$(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+mono.tools+</DefaultMonoSubsets>
|
|
||||||
+ <DefaultMonoSubsets>$(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+</DefaultMonoSubsets>
|
|
||||||
+ <DefaultMonoSubsets Condition="'$(PrimaryRuntimeFlavor)' != 'Mono'">$(DefaultMonoSubsets)mono.tools+</DefaultMonoSubsets>
|
|
||||||
<DefaultMonoSubsets Condition="'$(TargetsMobile)' != 'true'">$(DefaultMonoSubsets)host.native+</DefaultMonoSubsets>
|
|
||||||
|
|
||||||
<DefaultLibrariesSubsets Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or
|
|
||||||
--
|
|
||||||
2.37.2
|
|
||||||
28
runtime-76916-mono-s390x-opcheckthis.patch
Normal file
28
runtime-76916-mono-s390x-opcheckthis.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From 7b46eae144e3a6a430155e824fc33e3f38fab427 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ulrich Weigand <ulrich.weigand@de.ibm.com>
|
||||||
|
Date: Wed, 12 Oct 2022 09:53:09 +0200
|
||||||
|
Subject: [PATCH] [mono][s390x] Fix wrong implementation of OP_CHECK_THIS
|
||||||
|
|
||||||
|
* Only access a single byte in memory for OP_CHECK_THIS
|
||||||
|
|
||||||
|
* Remove unnecessary ltgr instruction
|
||||||
|
|
||||||
|
* Fixes https://github.com/dotnet/runtime/issues/76915
|
||||||
|
---
|
||||||
|
src/mono/mono/mini/mini-s390x.c | 3 +--
|
||||||
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/runtime/src/mono/mono/mini/mini-s390x.c b/src/runtime/src/mono/mono/mini/mini-s390x.c
|
||||||
|
index 7c7a936ed9701..26e6ba1d32a3b 100644
|
||||||
|
--- a/src/runtime/src/mono/mono/mini/mini-s390x.c
|
||||||
|
+++ b/src/runtime/src/mono/mono/mini/mini-s390x.c
|
||||||
|
@@ -3594,8 +3594,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
|
||||||
|
break;
|
||||||
|
case OP_CHECK_THIS: {
|
||||||
|
/* ensure ins->sreg1 is not NULL */
|
||||||
|
- s390_lg (code, s390_r0, 0, ins->sreg1, 0);
|
||||||
|
- s390_ltgr (code, s390_r0, s390_r0);
|
||||||
|
+ s390_llgc (code, s390_r0, 0, ins->sreg1, 0);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case OP_ARGLIST: {
|
||||||
6
sources
6
sources
@ -1,3 +1,3 @@
|
|||||||
SHA512 (dotnet-v7.0.100-rc.1.22431.12-x64-bootstrap.tar.xz) = 5614a934759254899fdebada43aa01c6873fd8f44878cd0c8620253f40595ddc60da510e7f13e22374d4f54a25eb0139bc7844d63307a8e8516fff32cb8de6c2
|
SHA512 (dotnet-v7.0.100-rc.2.22477.23-x64-bootstrap.tar.xz) = c6e99e9df70731858102f41b3332cb378c6bd82e6aeb41a4f86e395c80dd2d26de5647a1f799285db4f96dacb36081a6eea76c0be712eccce740dc755575cf92
|
||||||
SHA512 (dotnet-arm64-prebuilts-2022-09-17.tar.gz) = 2cb96760450428f952259ed40fb4cee080e4ce7f0c6ce38c3d653a943b43106e598c8ea7c46fd8d269b34f955e1d452757dbc2ebe4b28e38572960ac346c89aa
|
SHA512 (dotnet-arm64-prebuilts-2022-10-12.tar.gz) = 00f2202d7e2831f4f5da9fa02238b35d5ad340efd8ecd7c8d5c69206236f3de374772275c629de0f16ded93b2368e4b357927173ff7046cef145a966ea6e5c0d
|
||||||
SHA512 (dotnet-s390x-prebuilts-2022-08-24.tar.gz) = b0312750701fdcf450e32c71155abbbb77d74d6709335e9b043b0acd3284c4d15e23ec74aa751f920966ed2d6f9e1144611e18b6a23c6a3cb5413766ca0d1a5f
|
SHA512 (dotnet-s390x-prebuilts-2022-10-12.tar.gz) = e19a989cafcf7e9a7be3381202653e9f9b9954b81ff2babcef494b5d06b8babf1996b74bd1f08dee90c6feffcf5130becbf7bfb59457d5b6926a6cf5d0e4a504
|
||||||
|
|||||||
294
vstest-4028-ppc64le.patch
Normal file
294
vstest-4028-ppc64le.patch
Normal file
@ -0,0 +1,294 @@
|
|||||||
|
From 96591cb1ac589021b9f31854a13f8fe3dd565f25 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sapana Khemkar <Sapana.Khemkar@ibm.com>
|
||||||
|
Date: Tue, 27 Sep 2022 13:08:43 +0530
|
||||||
|
Subject: [PATCH 1/4] add support for ppc64le processor architecture
|
||||||
|
|
||||||
|
---
|
||||||
|
src/Microsoft.TestPlatform.ObjectModel/Architecture.cs | 3 ++-
|
||||||
|
.../Interfaces/System/PlatformArchitecture.cs | 1 +
|
||||||
|
.../netcore/System/PlatformEnvironment.cs | 1 +
|
||||||
|
.../netcore/System/ProcessHelper.cs | 1 +
|
||||||
|
.../Hosting/DefaultTestHostManager.cs | 1 +
|
||||||
|
src/vstest.console/TestPlatformHelpers/TestRequestManager.cs | 2 ++
|
||||||
|
.../Processors/PlatformArgumentProcessorTests.cs | 4 ++--
|
||||||
|
7 files changed, 10 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs b/src/vstest/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs
|
||||||
|
index 6c9b9bcde5..7879358840 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs
|
||||||
|
@@ -11,5 +11,6 @@ public enum Architecture
|
||||||
|
ARM,
|
||||||
|
AnyCPU,
|
||||||
|
ARM64,
|
||||||
|
- S390x
|
||||||
|
+ S390x,
|
||||||
|
+ PPC64le
|
||||||
|
}
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs
|
||||||
|
index b1d477c7d3..aa81ca0ffc 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs
|
||||||
|
@@ -13,4 +13,5 @@ public enum PlatformArchitecture
|
||||||
|
ARM,
|
||||||
|
ARM64,
|
||||||
|
S390x,
|
||||||
|
+ PPC64le,
|
||||||
|
}
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs
|
||||||
|
index 10d4a61570..14d1234ef6 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs
|
||||||
|
@@ -28,6 +28,7 @@ public PlatformArchitecture Architecture
|
||||||
|
// preview 6 or later, so use the numerical value for now.
|
||||||
|
// case System.Runtime.InteropServices.Architecture.S390x:
|
||||||
|
(Architecture)5 => PlatformArchitecture.S390x,
|
||||||
|
+ (Architecture)6 => PlatformArchitecture.PPC64le,
|
||||||
|
_ => throw new NotSupportedException(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs
|
||||||
|
index 6cf4b0f91b..d1e31bb0f6 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs
|
||||||
|
@@ -41,6 +41,7 @@ public PlatformArchitecture GetCurrentProcessArchitecture()
|
||||||
|
// preview 6 or later, so use the numerical value for now.
|
||||||
|
// case System.Runtime.InteropServices.Architecture.S390x:
|
||||||
|
(Architecture)5 => PlatformArchitecture.S390x,
|
||||||
|
+ (Architecture)6 => PlatformArchitecture.PPC64le,
|
||||||
|
_ => throw new NotSupportedException(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs b/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
|
||||||
|
index 2eca302b43..54fa36e344 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
|
||||||
|
@@ -274,6 +274,7 @@ private static string GetTestHostName(Architecture architecture, Framework targe
|
||||||
|
PlatformArchitecture.ARM => Architecture.ARM,
|
||||||
|
PlatformArchitecture.ARM64 => Architecture.ARM64,
|
||||||
|
PlatformArchitecture.S390x => Architecture.S390x,
|
||||||
|
+ PlatformArchitecture.PPC64le => Architecture.PPC64le,
|
||||||
|
_ => throw new NotSupportedException(),
|
||||||
|
};
|
||||||
|
|
||||||
|
diff --git a/src/vstest/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs b/src/vstest/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
|
||||||
|
index 642e36bb9e..c7a0f93927 100644
|
||||||
|
--- a/src/vstest/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
|
||||||
|
+++ b/src/vstest/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
|
||||||
|
@@ -841,6 +841,8 @@ static Architecture TranslateToArchitecture(PlatformArchitecture targetArchitect
|
||||||
|
return Architecture.ARM64;
|
||||||
|
case PlatformArchitecture.S390x:
|
||||||
|
return Architecture.S390x;
|
||||||
|
+ case PlatformArchitecture.PPC64le:
|
||||||
|
+ return Architecture.PPC64le;
|
||||||
|
default:
|
||||||
|
EqtTrace.Error($"TestRequestManager.TranslateToArchitecture: Unhandled architecture '{targetArchitecture}'.");
|
||||||
|
break;
|
||||||
|
diff --git a/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs b/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs
|
||||||
|
index 207e4590fd..472688248d 100644
|
||||||
|
--- a/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs
|
||||||
|
+++ b/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs
|
||||||
|
@@ -85,7 +85,7 @@ public void InitializeShouldThrowIfArgumentIsNotAnArchitecture()
|
||||||
|
{
|
||||||
|
ExceptionUtilities.ThrowsException<CommandLineException>(
|
||||||
|
() => _executor.Initialize("foo"),
|
||||||
|
- "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x.",
|
||||||
|
+ "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, PPC64le.",
|
||||||
|
"foo");
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -94,7 +94,7 @@ public void InitializeShouldThrowIfArgumentIsNotASupportedArchitecture()
|
||||||
|
{
|
||||||
|
ExceptionUtilities.ThrowsException<CommandLineException>(
|
||||||
|
() => _executor.Initialize("AnyCPU"),
|
||||||
|
- "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x.",
|
||||||
|
+ "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, PPC64le.",
|
||||||
|
"AnyCPU");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
From 750b193e964a446dad5fc5927b745861eb19a9a9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sapana Khemkar <Sapana.Khemkar@ibm.com>
|
||||||
|
Date: Wed, 28 Sep 2022 11:06:08 +0530
|
||||||
|
Subject: [PATCH 2/4] change enum name from PPC64le to Ppc64le to match with
|
||||||
|
System.Runtime.InteropServices.Architecture enum name
|
||||||
|
|
||||||
|
---
|
||||||
|
src/Microsoft.TestPlatform.ObjectModel/Architecture.cs | 2 +-
|
||||||
|
.../Interfaces/System/PlatformArchitecture.cs | 2 +-
|
||||||
|
.../netcore/System/PlatformEnvironment.cs | 2 +-
|
||||||
|
.../netcore/System/ProcessHelper.cs | 2 +-
|
||||||
|
.../Hosting/DefaultTestHostManager.cs | 2 +-
|
||||||
|
src/vstest.console/TestPlatformHelpers/TestRequestManager.cs | 4 ++--
|
||||||
|
.../Processors/PlatformArgumentProcessorTests.cs | 4 ++--
|
||||||
|
7 files changed, 9 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs b/src/vstest/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs
|
||||||
|
index 7879358840..f3d59e7ae4 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs
|
||||||
|
@@ -12,5 +12,5 @@ public enum Architecture
|
||||||
|
AnyCPU,
|
||||||
|
ARM64,
|
||||||
|
S390x,
|
||||||
|
- PPC64le
|
||||||
|
+ Ppc64le
|
||||||
|
}
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs
|
||||||
|
index aa81ca0ffc..907ec721dd 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs
|
||||||
|
@@ -13,5 +13,5 @@ public enum PlatformArchitecture
|
||||||
|
ARM,
|
||||||
|
ARM64,
|
||||||
|
S390x,
|
||||||
|
- PPC64le,
|
||||||
|
+ Ppc64le,
|
||||||
|
}
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs
|
||||||
|
index 14d1234ef6..f2163db898 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs
|
||||||
|
@@ -28,7 +28,7 @@ public PlatformArchitecture Architecture
|
||||||
|
// preview 6 or later, so use the numerical value for now.
|
||||||
|
// case System.Runtime.InteropServices.Architecture.S390x:
|
||||||
|
(Architecture)5 => PlatformArchitecture.S390x,
|
||||||
|
- (Architecture)6 => PlatformArchitecture.PPC64le,
|
||||||
|
+ (Architecture)8 => PlatformArchitecture.Ppc64le,
|
||||||
|
_ => throw new NotSupportedException(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs
|
||||||
|
index d1e31bb0f6..d2d048e355 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs
|
||||||
|
@@ -41,7 +41,7 @@ public PlatformArchitecture GetCurrentProcessArchitecture()
|
||||||
|
// preview 6 or later, so use the numerical value for now.
|
||||||
|
// case System.Runtime.InteropServices.Architecture.S390x:
|
||||||
|
(Architecture)5 => PlatformArchitecture.S390x,
|
||||||
|
- (Architecture)6 => PlatformArchitecture.PPC64le,
|
||||||
|
+ (Architecture)8 => PlatformArchitecture.Ppc64le,
|
||||||
|
_ => throw new NotSupportedException(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs b/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
|
||||||
|
index 54fa36e344..02001d23ab 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
|
||||||
|
@@ -274,7 +274,7 @@ private static string GetTestHostName(Architecture architecture, Framework targe
|
||||||
|
PlatformArchitecture.ARM => Architecture.ARM,
|
||||||
|
PlatformArchitecture.ARM64 => Architecture.ARM64,
|
||||||
|
PlatformArchitecture.S390x => Architecture.S390x,
|
||||||
|
- PlatformArchitecture.PPC64le => Architecture.PPC64le,
|
||||||
|
+ PlatformArchitecture.Ppc64le => Architecture.Ppc64le,
|
||||||
|
_ => throw new NotSupportedException(),
|
||||||
|
};
|
||||||
|
|
||||||
|
diff --git a/src/vstest/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs b/src/vstest/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
|
||||||
|
index c7a0f93927..25cca0ca07 100644
|
||||||
|
--- a/src/vstest/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
|
||||||
|
+++ b/src/vstest/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
|
||||||
|
@@ -841,8 +841,8 @@ static Architecture TranslateToArchitecture(PlatformArchitecture targetArchitect
|
||||||
|
return Architecture.ARM64;
|
||||||
|
case PlatformArchitecture.S390x:
|
||||||
|
return Architecture.S390x;
|
||||||
|
- case PlatformArchitecture.PPC64le:
|
||||||
|
- return Architecture.PPC64le;
|
||||||
|
+ case PlatformArchitecture.Ppc64le:
|
||||||
|
+ return Architecture.Ppc64le;
|
||||||
|
default:
|
||||||
|
EqtTrace.Error($"TestRequestManager.TranslateToArchitecture: Unhandled architecture '{targetArchitecture}'.");
|
||||||
|
break;
|
||||||
|
diff --git a/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs b/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs
|
||||||
|
index 472688248d..f33166ae6c 100644
|
||||||
|
--- a/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs
|
||||||
|
+++ b/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs
|
||||||
|
@@ -85,7 +85,7 @@ public void InitializeShouldThrowIfArgumentIsNotAnArchitecture()
|
||||||
|
{
|
||||||
|
ExceptionUtilities.ThrowsException<CommandLineException>(
|
||||||
|
() => _executor.Initialize("foo"),
|
||||||
|
- "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, PPC64le.",
|
||||||
|
+ "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, ppc64le.",
|
||||||
|
"foo");
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -94,7 +94,7 @@ public void InitializeShouldThrowIfArgumentIsNotASupportedArchitecture()
|
||||||
|
{
|
||||||
|
ExceptionUtilities.ThrowsException<CommandLineException>(
|
||||||
|
() => _executor.Initialize("AnyCPU"),
|
||||||
|
- "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, PPC64le.",
|
||||||
|
+ "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, ppc64le.",
|
||||||
|
"AnyCPU");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
From 4d97db82c39caf0aa6ca7bd3f47f1c3714aa6f2c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sapana Khemkar <Sapana.Khemkar@ibm.com>
|
||||||
|
Date: Wed, 28 Sep 2022 17:58:27 +0530
|
||||||
|
Subject: [PATCH 3/4] add defination of enum
|
||||||
|
Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.Ppc64le
|
||||||
|
and Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.Ppc64le in
|
||||||
|
Microsoft.TestPlatform.ObjectModel and
|
||||||
|
/Microsoft.TestPlatform.PlatformAbstractions PublicAPI.Shipped.txt file.
|
||||||
|
|
||||||
|
---
|
||||||
|
.../PublicAPI/PublicAPI.Shipped.txt | 1 +
|
||||||
|
.../PublicAPI/PublicAPI.Shipped.txt | 1 +
|
||||||
|
2 files changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt b/src/vstest/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt
|
||||||
|
index 9df7e09b00..5d69e70774 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt
|
||||||
|
@@ -113,6 +113,7 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM = 3 -> Microsof
|
||||||
|
Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
|
||||||
|
Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.Default = 0 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
|
||||||
|
Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.S390x = 6 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
|
||||||
|
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.Ppc64le = 7 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
|
||||||
|
Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.X64 = 2 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
|
||||||
|
Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.X86 = 1 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
|
||||||
|
Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt
|
||||||
|
index 696ed76517..8f0f763f94 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt
|
||||||
|
@@ -67,6 +67,7 @@ Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
|
||||||
|
Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.ARM = 2 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
|
||||||
|
Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.ARM64 = 3 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
|
||||||
|
Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.S390x = 4 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
|
||||||
|
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.Ppc64le = 5 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
|
||||||
|
Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.X64 = 1 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
|
||||||
|
Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.X86 = 0 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
|
||||||
|
Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyExtensions
|
||||||
|
|
||||||
|
From 389b923569be952cfa6875af209e70d9490bfd73 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sapana Khemkar <Sapana.Khemkar@ibm.com>
|
||||||
|
Date: Wed, 28 Sep 2022 19:45:55 +0530
|
||||||
|
Subject: [PATCH 4/4] corrected typo in ppc64le arch name
|
||||||
|
|
||||||
|
---
|
||||||
|
.../Processors/PlatformArgumentProcessorTests.cs | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs b/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs
|
||||||
|
index f33166ae6c..b452b48408 100644
|
||||||
|
--- a/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs
|
||||||
|
+++ b/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs
|
||||||
|
@@ -85,7 +85,7 @@ public void InitializeShouldThrowIfArgumentIsNotAnArchitecture()
|
||||||
|
{
|
||||||
|
ExceptionUtilities.ThrowsException<CommandLineException>(
|
||||||
|
() => _executor.Initialize("foo"),
|
||||||
|
- "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, ppc64le.",
|
||||||
|
+ "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, Ppc64le.",
|
||||||
|
"foo");
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -94,7 +94,7 @@ public void InitializeShouldThrowIfArgumentIsNotASupportedArchitecture()
|
||||||
|
{
|
||||||
|
ExceptionUtilities.ThrowsException<CommandLineException>(
|
||||||
|
() => _executor.Initialize("AnyCPU"),
|
||||||
|
- "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, ppc64le.",
|
||||||
|
+ "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, Ppc64le.",
|
||||||
|
"AnyCPU");
|
||||||
|
}
|
||||||
|
|
||||||
37
vstest-4066-s390x-ppc64le.patch
Normal file
37
vstest-4066-s390x-ppc64le.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From 7ea33be2e1949d9c63ff58b59deb5b1a84105aae Mon Sep 17 00:00:00 2001
|
||||||
|
From: Giridhar Trivedi <giridhar.trivedi@ibm.com>
|
||||||
|
Date: Wed, 12 Oct 2022 14:14:40 +0200
|
||||||
|
Subject: [PATCH] Fix Invalid target architecture 'S390x' error
|
||||||
|
|
||||||
|
In commit 3ae5c4aef823 ("Add support for s390x processor architecture")
|
||||||
|
support for S390x architecture was provided for .NET6. This is broken
|
||||||
|
in .NET7. Add missing case statements to fix this for S390x and also
|
||||||
|
Power architectures.
|
||||||
|
---
|
||||||
|
.../Hosting/DotnetTestHostManager.cs | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs b/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
|
||||||
|
index b4fa53776f..deadfcb684 100644
|
||||||
|
--- a/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
|
||||||
|
+++ b/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
|
||||||
|
@@ -536,6 +536,10 @@ PlatformArchitecture TranslateToPlatformArchitecture(Architecture targetArchitec
|
||||||
|
return PlatformArchitecture.ARM;
|
||||||
|
case Architecture.ARM64:
|
||||||
|
return PlatformArchitecture.ARM64;
|
||||||
|
+ case Architecture.S390x:
|
||||||
|
+ return PlatformArchitecture.S390x;
|
||||||
|
+ case Architecture.Ppc64le:
|
||||||
|
+ return PlatformArchitecture.Ppc64le;
|
||||||
|
case Architecture.AnyCPU:
|
||||||
|
case Architecture.Default:
|
||||||
|
default:
|
||||||
|
@@ -552,6 +556,8 @@ static bool IsSameArchitecture(Architecture targetArchitecture, PlatformArchitec
|
||||||
|
Architecture.X64 => platformAchitecture == PlatformArchitecture.X64,
|
||||||
|
Architecture.ARM => platformAchitecture == PlatformArchitecture.ARM,
|
||||||
|
Architecture.ARM64 => platformAchitecture == PlatformArchitecture.ARM64,
|
||||||
|
+ Architecture.S390x => platformAchitecture == PlatformArchitecture.S390x,
|
||||||
|
+ Architecture.Ppc64le => platformAchitecture == PlatformArchitecture.Ppc64le,
|
||||||
|
_ => throw new TestPlatformException($"Invalid target architecture '{targetArchitecture}'"),
|
||||||
|
};
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user