diff --git a/README.en.md b/README.en.md index 9f3bc0e5787e43ee7f7075ca05a7fabf057d16ad..e4ba07782bf80978307a50754b07f013fc82aef2 100644 --- a/README.en.md +++ b/README.en.md @@ -1,36 +1,4 @@ # dotnet #### Description -Cross-platform development framework by Microsoft - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) +.NET Runtime and SDK diff --git a/README.md b/README.md index 83f18c22cf800142373735b9ba4c7afef9c320dd..9f5d31d0c2cabea6e68286a8ff8f478b2c883015 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,4 @@ # dotnet #### 介绍 -Cross-platform development framework by Microsoft - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) +.NET Runtime and SDK diff --git a/check-debug-symbols.py b/check-debug-symbols.py new file mode 100755 index 0000000000000000000000000000000000000000..4e26535e5b2654aa8390ef6b6845488dac472e51 --- /dev/null +++ b/check-debug-symbols.py @@ -0,0 +1,135 @@ +#!/usr/bin/python3 + +""" +Check debug symbols are present in shared object and can identify +code. + +It starts scanning from a directory and recursively scans all ELF +files found in it for various symbols to ensure all debuginfo is +present and nothing has been stripped. + +Usage: + +./check-debug-symbols /path/of/dir/to/scan/ + + +Example: + +./check-debug-symbols /usr/lib64 +""" + +# This technique was explained to me by Mark Wielaard (mjw). + +import collections +import os +import re +import subprocess +import sys + +ScanResult = collections.namedtuple('ScanResult', + 'file_name debug_info debug_abbrev file_symbols gnu_debuglink') + + +def scan_file(file): + "Scan the provided file and return a ScanResult containing results of the scan." + + # Test for .debug_* sections in the shared object. This is the main test. + # Stripped objects will not contain these. + readelf_S_result = subprocess.run(['readelf', '-S', file], + stdout=subprocess.PIPE, encoding='utf-8', check=True) + has_debug_info = any(line for line in readelf_S_result.stdout.split('\n') if '] .debug_info' in line) + + has_debug_abbrev = any(line for line in readelf_S_result.stdout.split('\n') if '] .debug_abbrev' in line) + + # Test FILE symbols. These will most likely be removed by anyting that + # manipulates symbol tables because it's generally useless. So a nice test + # that nothing has messed with symbols. + def contains_file_symbols(line): + parts = line.split() + if len(parts) < 8: + return False + return \ + parts[2] == '0' and parts[3] == 'FILE' and parts[4] == 'LOCAL' and parts[5] == 'DEFAULT' and \ + parts[6] == 'ABS' and re.match(r'((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx))?', parts[7]) + + readelf_s_result = subprocess.run(["readelf", '-s', file], + stdout=subprocess.PIPE, encoding='utf-8', check=True) + has_file_symbols = any(line for line in readelf_s_result.stdout.split('\n') if contains_file_symbols(line)) + + # Test that there are no .gnu_debuglink sections pointing to another + # debuginfo file. There shouldn't be any debuginfo files, so the link makes + # no sense either. + has_gnu_debuglink = any(line for line in readelf_s_result.stdout.split('\n') if '] .gnu_debuglink' in line) + + return ScanResult(file, has_debug_info, has_debug_abbrev, has_file_symbols, has_gnu_debuglink) + +def is_elf(file): + result = subprocess.run(['file', file], stdout=subprocess.PIPE, encoding='utf-8', check=True) + return re.search(r'ELF 64-bit [LM]SB (?:pie )?(?:executable|shared object)', result.stdout) + +def scan_file_if_sensible(file): + if is_elf(file): + return scan_file(file) + return None + +def scan_dir(dir): + results = [] + for root, _, files in os.walk(dir): + for name in files: + result = scan_file_if_sensible(os.path.join(root, name)) + if result: + results.append(result) + return results + +def scan(file): + file = os.path.abspath(file) + if os.path.isdir(file): + return scan_dir(file) + elif os.path.isfile(file): + return [scan_file_if_sensible(file)] + +def is_bad_result(result): + return not result.debug_info or not result.debug_abbrev or not result.file_symbols or result.gnu_debuglink + +def print_scan_results(results, verbose): + # print(results) + for result in results: + file_name = result.file_name + found_issue = False + if not result.debug_info: + found_issue = True + print('error: missing .debug_info section in', file_name) + if not result.debug_abbrev: + found_issue = True + print('error: missing .debug_abbrev section in', file_name) + if not result.file_symbols: + found_issue = True + print('error: missing FILE symbols in', file_name) + if result.gnu_debuglink: + found_issue = True + print('error: unexpected .gnu_debuglink section in', file_name) + if verbose and not found_issue: + print('OK: ', file_name) + +def main(args): + verbose = False + files = [] + for arg in args: + if arg == '--verbose' or arg == '-v': + verbose = True + else: + files.append(arg) + + results = [] + for file in files: + results.extend(scan(file)) + + print_scan_results(results, verbose) + + if any(is_bad_result(result) for result in results): + return 1 + return 0 + + +if __name__ == '__main__': + sys.exit(main(sys.argv[1:])) diff --git a/dotnet-8.0.4.tar.gz b/dotnet-8.0.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b499cc3afafc1c7716051b94a2efc56178f7ef95 Binary files /dev/null and b/dotnet-8.0.4.tar.gz differ diff --git a/dotnet-8.0.4.tar.gz.sig b/dotnet-8.0.4.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000..5b6f6533f448eca7f04b55c41b7da12b0b7ce4de --- /dev/null +++ b/dotnet-8.0.4.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: BSN Pgp v1.0.0.0 + +iQIcBAABCAAGBQJmBFuCAAoJEP2/U8JNtIcu+McP/RkPiiLwEr0k4xGd6mIsgvco +hHL6I3f/1f4/dSYkyr1edqeCynrwU6hYfMyLm71XrwkYHxQCbDvXpo4FekW/kfTR +LrAhJuhDRMzGfjZU81h4PCHAcktJWPuY2IC5EPw9R4h/UToobYBPqsxayyXpu1hK +iCm+g+iKxXKPO2ujG4Kj9NSiWg8NMZeDVgAvh4q5Xi+GMiiwQ67VwO/WzZss0HNt +pAMePhuKp5V5zJXMIf0FwIa3TJZuC4xnCSz2EfKz8Y1tS+ez0p8gAiWzwmR7W705 +p7UouNEEzBiVoTq17DrCOx7+51hyP2gygDy0DbD/2kMJVICCPnECIyU8V42a0KPJ +w2cPxh/2w1KgUp3gvdVaKAJunHsqvXlNU+8/PvWeVN3yzd40VCiqmuS2HVqpkAZ8 +Lq5hPdxAJmHDdnL4ptLmI3R2PMba/5GYWP0Cr/kQut96drfaDFhHZD8M2wFjsRG2 +Pwkfds+8xcdkYYJpfECz15BZAo7lCF2TjjMkREREfmdBn46UgS9MmAQJWm1D5PBV +IhXSfX4p6KuxmiMBjovuagoebSiePEh5EnvYLv3Czx073WcZI7Hk4BnqdSc0DjqF +A2TVS8noAaVlHVIqncLyDS61oVCBoMNyxSPDqcDQNI+6NNeZpbwdj9RJ9d83AepZ +5VajM4GlJzjwooXCsSNc +=dp1h +-----END PGP SIGNATURE----- diff --git a/dotnet-missing-pdbs-okay.patch b/dotnet-missing-pdbs-okay.patch new file mode 100644 index 0000000000000000000000000000000000000000..f239d1783db48541ce12eab4a9a80a36ac7b452a --- /dev/null +++ b/dotnet-missing-pdbs-okay.patch @@ -0,0 +1,20 @@ +Allow builders to override failing on pdb mismatch +--- a/build.proj ++++ b/build.proj +@@ -114,6 +114,7 @@ + $(OutputPath)dotnet-symbols-sdk-$(MicrosoftSourceBuildIntermediateInstallerVersion)-$(TargetRid).tar.gz + $(ArtifactsTmpDir)Sdk + %(SdkTarballItem.Identity) ++ true + + + +@@ -123,7 +124,7 @@ + ++ FailOnMissingPDBs="$(FailOnMissingPDBs)" /> + + diff --git a/dotnet.sh.in b/dotnet.sh.in new file mode 100644 index 0000000000000000000000000000000000000000..65b92a014e0b395c500e3c3e31612c10577a3c7f --- /dev/null +++ b/dotnet.sh.in @@ -0,0 +1,14 @@ + +# Set location for AppHost lookup +[ -z "$DOTNET_ROOT" ] && export DOTNET_ROOT=@LIBDIR@/dotnet + +# Add dotnet tools directory to PATH +DOTNET_TOOLS_PATH="$HOME/.dotnet/tools" +case "$PATH" in + *"$DOTNET_TOOLS_PATH"* ) true ;; + * ) PATH="$PATH:$DOTNET_TOOLS_PATH" ;; +esac + +# Extract self-contained executables under HOME +# to avoid multi-user issues from using the default '/var/tmp'. +[ -z "$DOTNET_BUNDLE_EXTRACT_BASE_DIR" ] && export DOTNET_BUNDLE_EXTRACT_BASE_DIR="${XDG_CACHE_HOME:-"$HOME"/.cache}/dotnet_bundle_extract" diff --git a/dotnet.spec b/dotnet.spec new file mode 100644 index 0000000000000000000000000000000000000000..b44579430e2f9d4fb7f767b29e5416f357ba2f9d --- /dev/null +++ b/dotnet.spec @@ -0,0 +1,672 @@ +%bcond_with bootstrap_dotnet + +# LTO triggers a compilation error for a source level issue. Given that LTO should not +# change the validity of any given source and the nature of the error (undefined enum), I +# suspect a generator program is mis-behaving in some way. This needs further debugging, +# until that's done, disable LTO. This has to happen before setting the flags below. +%define _lto_cflags %{nil} + +%global dotnetver 8.0 + +%global host_version 8.0.4 +%global runtime_version 8.0.4 +%global aspnetcore_runtime_version %{runtime_version} +%global sdk_version 8.0.104 +%global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') +%global templates_version %{runtime_version} +#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') + +# upstream can produce releases with a different tag than the SDK version +%global upstream_tag v%{runtime_version} +%global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') + +%global host_rpm_version %{host_version} +%global runtime_rpm_version %{runtime_version} +%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version} +%global sdk_rpm_version %{sdk_version} + +%global use_bundled_libunwind 1 + +%ifarch aarch64 +%global runtime_arch arm64 +%endif +%ifarch ppc64le +%global runtime_arch ppc64le +%endif +%ifarch s390x +%global runtime_arch s390x +%endif +%ifarch x86_64 +%global runtime_arch x64 +%endif + +%global mono_archs s390x ppc64le + +%{!?runtime_id:%global runtime_id %(. /etc/os-release ; ID="$(echo $ID | tr "[:upper:]" "[:lower:]")" ; echo "${ID}.${VERSION_ID}")-%{runtime_arch}} + +Name: dotnet%{dotnetver} +Version: %{sdk_rpm_version} +Release: 1.0.1 +Summary: .NET Runtime and SDK +License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib + +URL: https://github.com/dotnet/ + +%if %{with bootstrap_dotnet} +%global bootstrap_sdk_version 8.0.100-rc.1.23410.12 +%global tarball_name dotnet-%{upstream_tag}-x64-bootstrap +# The source is generated on a Fedora box via: +# ./build-dotnet-tarball --bootstrap %%{upstream_tag} +Source0: %{tarball_name}.tar.xz +# Generated via ./build-arm64-bootstrap-tarball +Source1: dotnet-prebuilts-%{bootstrap_sdk_version}-arm64.tar.gz +# Generated manually, same pattern as the arm64 tarball +Source2: dotnet-prebuilts-%{bootstrap_sdk_version}-ppc64le.tar.gz +# Generated manually, same pattern as the arm64 tarball +Source3: dotnet-prebuilts-%{bootstrap_sdk_version}-s390x.tar.gz +%else +# For non-releases, the source is generated on a Fedora box via: +# ./build-dotnet-tarball %%{upstream_tag} or commit +%global tarball_name dotnet-sdk-source-%{upstream_tag} +Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag_without_v}.tar.gz +Source1: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz.sig#/dotnet-%{upstream_tag_without_v}.tar.gz.sig +Source2: https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc +%endif +Source5: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/release.json + +#Source10: %%{tarball_name}-nm-dev.tgz +#Source11: %%{tarball_name}-nm-prod.tgz + +Source20: check-debug-symbols.py +Source21: dotnet.sh.in + +# Disable apphost; there's no net6.0 apphost for ppc64le +Patch1: roslyn-analyzers-ppc64le-apphost.patch +# https://github.com/dotnet/source-build/discussions/3481 +Patch2: vstest-intent-net8.0.patch +# We are failing to build 8.0.101 on s390x due to pdb errors that are under investigation +Patch3: dotnet-missing-pdbs-okay.patch +# https://github.com/dotnet/runtime/pull/95216#issuecomment-1842799314 +Patch4: runtime-re-enable-implicit-rejection.patch +# https://github.com/dotnet/msbuild/pull/9449 +Patch5: msbuild-9449-exec-stop-setting-a-locale.patch + + +# openEuler patches +Patch1001: openEuler-sdk-8.patch +Patch1002: openEuler-runtime-8.patch +Patch1003: openEuler-source-build-reference-packages-8.patch +Patch1004: openEuler-dotnet-8.patch + +ExclusiveArch: aarch64 ppc64le s390x x86_64 + +BuildRequires: clang +BuildRequires: cmake +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: git +BuildRequires: glibc-all-langpacks +BuildRequires: gnupg2 +BuildRequires: hostname +BuildRequires: krb5-devel +BuildRequires: libicu-devel +%if ! %{use_bundled_libunwind} +BuildRequires: libunwind-devel +%endif +# If the build ever crashes, then having lldb installed might help the +# runtime generate a backtrace for the crash +BuildRequires: lldb +BuildRequires: llvm +BuildRequires: lttng-ust-devel +BuildRequires: make +BuildRequires: openssl-devel +BuildRequires: python3 +BuildRequires: tar +BuildRequires: util-linux +BuildRequires: zlib-devel + + +# The tracing support in CoreCLR is optional. It has a run-time +# dependency on some additional libraries like lttng-ust. The runtime +# gracefully disables tracing if the dependencies are missing. +%global __requires_exclude_from ^(%{_libdir}/dotnet/.*/libcoreclrtraceptprovider\\.so)$ + +# Avoid generating provides and requires for private libraries +%global privlibs libhostfxr +%global privlibs %{privlibs}|libclrgc +%global privlibs %{privlibs}|libclrjit +%global privlibs %{privlibs}|libcoreclr +%global privlibs %{privlibs}|libcoreclrtraceptprovider +%global privlibs %{privlibs}|libhostpolicy +%global privlibs %{privlibs}|libmscordaccore +%global privlibs %{privlibs}|libmscordbi +%global privlibs %{privlibs}|libnethost +%global privlibs %{privlibs}|libSystem.Globalization.Native +%global privlibs %{privlibs}|libSystem.IO.Compression.Native +%global privlibs %{privlibs}|libSystem.Native +%global privlibs %{privlibs}|libSystem.Net.Security.Native +%global privlibs %{privlibs}|libSystem.Security.Cryptography.Native.OpenSsl +%global __provides_exclude ^(%{privlibs})\\.so +%global __requires_exclude ^(%{privlibs})\\.so + + +%description +.NET is a fast, lightweight and modular platform for creating +cross platform applications that work on Linux, macOS and Windows. + +It particularly focuses on creating console applications, web +applications and micro-services. + +.NET contains a runtime conforming to .NET Standards a set of +framework libraries, an SDK containing compilers and a 'dotnet' +application to drive everything. + + +%package -n dotnet-host + +Version: %{host_rpm_version} +Summary: .NET command line launcher + +%description -n dotnet-host +The .NET host is a command line program that runs a standalone +.NET application or launches the SDK. + +.NET is a fast, lightweight and modular platform for creating +cross platform applications that work on Linux, Mac and Windows. + +It particularly focuses on creating console applications, web +applications and micro-services. + + +%package -n dotnet-hostfxr-%{dotnetver} + +Version: %{host_rpm_version} +Summary: .NET command line host resolver + +# Theoretically any version of the host should work. But lets aim for the one +# provided by this package, or from a newer version of .NET +Requires: dotnet-host%{?_isa} >= %{host_rpm_version}-%{release} + +%description -n dotnet-hostfxr-%{dotnetver} +The .NET host resolver contains the logic to resolve and select +the right version of the .NET SDK or runtime to use. + +.NET is a fast, lightweight and modular platform for creating +cross platform applications that work on Linux, Mac and Windows. + +It particularly focuses on creating console applications, web +applications and micro-services. + + +%package -n dotnet-runtime-%{dotnetver} + +Version: %{runtime_rpm_version} +Summary: NET %{dotnetver} runtime + +Requires: dotnet-hostfxr-%{dotnetver}%{?_isa} >= %{host_rpm_version}-%{release} + +# libicu is dlopen()ed +Requires: libicu%{?_isa} + +# See src/runtime/src/libraries/Native/AnyOS/brotli-version.txt +Provides: bundled(libbrotli) = 1.0.9 +%if %{use_bundled_libunwind} +# See src/runtime/src/coreclr/pal/src/libunwind/libunwind-version.txt +Provides: bundled(libunwind) = 1.5.rc1.28.g9165d2a1 +%endif + +%description -n dotnet-runtime-%{dotnetver} +The .NET runtime contains everything needed to run .NET applications. +It includes a high performance Virtual Machine as well as the framework +libraries used by .NET applications. + +.NET is a fast, lightweight and modular platform for creating +cross platform applications that work on Linux, Mac and Windows. + +It particularly focuses on creating console applications, web +applications and micro-services. + + +%package -n dotnet-runtime-dbg-%{dotnetver} + +Version: %{runtime_rpm_version} +Summary: Managed debug symbols NET %{dotnetver} runtime + +Requires: dotnet-runtime-%{dotnetver}%{?_isa} = %{runtime_rpm_version}-%{release} + +%description -n dotnet-runtime-dbg-%{dotnetver} +This package contains the managed symbol (pdb) files useful to debug the +managed parts of the .NET runtime itself. + + +%package -n aspnetcore-runtime-%{dotnetver} + +Version: %{aspnetcore_runtime_rpm_version} +Summary: ASP.NET Core %{dotnetver} runtime + +Requires: dotnet-runtime-%{dotnetver}%{?_isa} = %{runtime_rpm_version}-%{release} + +%description -n aspnetcore-runtime-%{dotnetver} +The ASP.NET Core runtime contains everything needed to run .NET +web applications. It includes a high performance Virtual Machine as +well as the framework libraries used by .NET applications. + +ASP.NET Core is a fast, lightweight and modular platform for creating +cross platform web applications that work on Linux, Mac and Windows. + +It particularly focuses on creating console applications, web +applications and micro-services. + + +%package -n aspnetcore-runtime-dbg-%{dotnetver} + +Version: %{aspnetcore_runtime_rpm_version} +Summary: Managed debug symbols for the ASP.NET Core %{dotnetver} runtime + +Requires: aspnetcore-runtime-%{dotnetver}%{?_isa} = %{aspnetcore_runtime_rpm_version}-%{release} + +%description -n aspnetcore-runtime-dbg-%{dotnetver} +This package contains the managed symbol (pdb) files useful to debug the +managed parts of the ASP.NET Core runtime itself. + + +%package -n dotnet-templates-%{dotnetver} + +Version: %{sdk_rpm_version} +Summary: .NET %{dotnetver} templates + +# Theoretically any version of the host should work. But lets aim for the one +# provided by this package, or from a newer version of .NET +Requires: dotnet-host%{?_isa} >= %{host_rpm_version}-%{release} + +%description -n dotnet-templates-%{dotnetver} +This package contains templates used by the .NET SDK. + +.NET is a fast, lightweight and modular platform for creating +cross platform applications that work on Linux, Mac and Windows. + +It particularly focuses on creating console applications, web +applications and micro-services. + + +%package -n dotnet-sdk-%{dotnetver} + +Version: %{sdk_rpm_version} +Summary: .NET %{dotnetver} Software Development Kit + +Provides: bundled(js-jquery) + +Requires: dotnet-runtime-%{dotnetver}%{?_isa} >= %{runtime_rpm_version}-%{release} +Requires: aspnetcore-runtime-%{dotnetver}%{?_isa} >= %{aspnetcore_runtime_rpm_version}-%{release} + +Requires: dotnet-apphost-pack-%{dotnetver}%{?_isa} >= %{runtime_rpm_version}-%{release} +Requires: dotnet-targeting-pack-%{dotnetver}%{?_isa} >= %{runtime_rpm_version}-%{release} +Requires: aspnetcore-targeting-pack-%{dotnetver}%{?_isa} >= %{aspnetcore_runtime_rpm_version}-%{release} +Requires: netstandard-targeting-pack-2.1%{?_isa} >= %{sdk_rpm_version}-%{release} + +Requires: dotnet-templates-%{dotnetver}%{?_isa} >= %{sdk_rpm_version}-%{release} + +%description -n dotnet-sdk-%{dotnetver} +The .NET SDK is a collection of command line applications to +create, build, publish and run .NET applications. + +.NET is a fast, lightweight and modular platform for creating +cross platform applications that work on Linux, Mac and Windows. + +It particularly focuses on creating console applications, web +applications and micro-services. + + +%package -n dotnet-sdk-dbg-%{dotnetver} + +Version: %{sdk_rpm_version} +Summary: Managed debug symbols for the .NET %{dotnetver} Software Development Kit + +Requires: dotnet-sdk-%{dotnetver}%{?_isa} = %{sdk_rpm_version}-%{release} + +%description -n dotnet-sdk-dbg-%{dotnetver} +This package contains the managed symbol (pdb) files useful to debug the .NET +Software Development Kit (SDK) itself. + + +%global dotnet_targeting_pack() %{expand: +%package -n %{1} + +Version: %{2} +Summary: Targeting Pack for %{3} %{4} + +Requires: dotnet-host%{?_isa} + +%description -n %{1} +This package provides a targeting pack for %{3} %{4} +that allows developers to compile against and target %{3} %{4} +applications using the .NET SDK. + +%files -n %{1} +%dir %{_libdir}/dotnet/packs +%{_libdir}/dotnet/packs/%{5} +} + +%dotnet_targeting_pack dotnet-apphost-pack-%{dotnetver} %{runtime_rpm_version} Microsoft.NETCore.App %{dotnetver} Microsoft.NETCore.App.Host.%{runtime_id} +%dotnet_targeting_pack dotnet-targeting-pack-%{dotnetver} %{runtime_rpm_version} Microsoft.NETCore.App %{dotnetver} Microsoft.NETCore.App.Ref +%dotnet_targeting_pack aspnetcore-targeting-pack-%{dotnetver} %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App %{dotnetver} Microsoft.AspNetCore.App.Ref +%dotnet_targeting_pack netstandard-targeting-pack-2.1 %{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref + + +%package -n dotnet-sdk-%{dotnetver}-source-built-artifacts + +Version: %{sdk_rpm_version} +Summary: Internal package for building .NET %{dotnetver} Software Development Kit + +%description -n dotnet-sdk-%{dotnetver}-source-built-artifacts +The .NET source-built archive is a collection of packages needed +to build the .NET SDK itself. + +These are not meant for general use. + + +%prep + +release_json_tag=$(grep tag %{SOURCE5} | cut -d: -f2 | sed -E 's/[," ]*//g') +if [[ ${release_json_tag} != %{upstream_tag} ]]; then + echo "error: tag in release.json doesn't match tag in spec file" + exit 1 +fi + +%if %{without bootstrap_dotnet} +%setup -q -n dotnet-%{upstream_tag_without_v} + +# Remove all prebuilts +find -iname '*.dll' -type f -delete +find -iname '*.so' -type f -delete +find -iname '*.tar.gz' -type f -delete +find -iname '*.nupkg' -type f -delete +find -iname '*.zip' -type f -delete + +rm -rf .dotnet/ +rm -rf packages/source-built + +mkdir -p prereqs/packages/archive + +%else + +%setup -q -T -b 0 -n dotnet-%{upstream_tag}-x64-bootstrap + +%ifnarch x86_64 + +rm -rf .dotnet +%ifarch aarch64 +tar -x --strip-components=1 -f %{SOURCE1} -C prereqs/packages/prebuilt/ +%endif +%ifarch ppc64le +tar -x --strip-components=1 -f %{SOURCE2} -C prereqs/packages/prebuilt/ +%endif +%ifarch s390x +tar -x --strip-components=1 -f %{SOURCE3} -C prereqs/packages/prebuilt/ +%endif + +mkdir -p .dotnet +tar xf prereqs/packages/prebuilt/dotnet-sdk*.tar.gz -C .dotnet/ +rm prereqs/packages/prebuilt/dotnet-sdk*.tar.gz + +boot_sdk_version=$(ls -1 .dotnet/sdk/) +sed -i -E 's|"dotnet": "[^"]+"|"dotnet" : "'$boot_sdk_version'"|' global.json + +%ifarch ppc64le s390x +ilasm_version=$(ls prereqs/packages/prebuilt| grep -i ilasm | tr 'A-Z' 'a-z' | sed -E 's|runtime.linux-'%{runtime_arch}'.microsoft.netcore.ilasm.||' | sed -E 's|.nupkg$||') +echo $ilasm_version + +mkdir -p packages-customized-local +pushd packages-customized-local +tar xf ../prereqs/packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz +sed -i -E 's|[^<]+|'$ilasm_version'|' PackageVersions.props +sed -i -E 's|[^<]+|'$ilasm_version'|' PackageVersions.props +tar czf ../prereqs/packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz * +popd + +%endif + +%endif + +%endif + +# tar -x --strip-components=1 -f %%{SOURCE10} +# tar -x --strip-components=1 -f %%{SOURCE11} + +%autopatch -p1 -M 999 + +# Apply Oracle patches + +pushd src/sdk +%patch1001 -p1 +popd + +pushd src/runtime +%patch1002 -p1 +popd + +pushd src/source-build-reference-packages +%patch1003 -p1 +popd + +%patch1004 -p1 + +sed -i '151d' src/installer/src/redist/targets/Crossgen.targets + +%if ! %{use_bundled_libunwind} +sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime/eng/SourceBuild.props +%endif + + +%build +cat /etc/os-release + +# Filter flags not supported by clang +%global dotnet_cflags %(echo %optflags | sed -re 's/-specs=[^ ]*//g') +%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') +export CFLAGS="%{dotnet_cflags}" +export CXXFLAGS="%{dotnet_cflags}" +export LDFLAGS="%{dotnet_ldflags}" + +# -fstack-clash-protection breaks CoreCLR +CFLAGS=$(echo $CFLAGS | sed -e 's/-fstack-clash-protection//' ) +CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-fstack-clash-protection//' ) + +%ifarch aarch64 +# -mbranch-protection=standard breaks unwinding in CoreCLR through libunwind +CFLAGS=$(echo $CFLAGS | sed -e 's/-mbranch-protection=standard //') +CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-mbranch-protection=standard //') +%endif + +%ifarch s390x +# -march=z13 -mtune=z14 makes clang crash while compiling .NET +CFLAGS=$(echo $CFLAGS | sed -e 's/ -march=z13//') +CFLAGS=$(echo $CFLAGS | sed -e 's/ -mtune=z14//') +CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -march=z13//') +CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -mtune=z14//') +%endif + +export EXTRA_CFLAGS="$CFLAGS" +export EXTRA_CXXFLAGS="$CXXFLAGS" +export EXTRA_LDFLAGS="$LDFLAGS" + +# Disable tracing, which is incompatible with certain versions of +# lttng See https://github.com/dotnet/runtime/issues/57784. The +# suggested compile-time change doesn't work, unfortunately. +export COMPlus_LTTng=0 + +./prep.sh --no-bootstrap +VERBOSE=1 ./build.sh \ +%if %{without bootstrap_dotnet} + --with-sdk .dotnet \ +%endif +%ifarch %{mono_archs} + --use-mono-runtime \ +%endif + --release-manifest %{SOURCE5} \ + -- \ +%ifarch s390x + /p:FailOnMissingPDBs=false \ +%endif + /p:MinimalConsoleLogOutput=false \ + /p:ContinueOnPrebuiltBaselineError=true \ + /v:n \ + /p:LogVerbosity=n \ + + +sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE21} > dotnet.sh + + +%install +install -dm 0755 %{buildroot}%{_libdir}/dotnet +ls artifacts/%{runtime_arch}/Release +mkdir -p built-sdk +tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C built-sdk/ + +# Convert hardlinks to actual copies. This takes up quite a bit of +# extra disk space, but works around RHEL issues in post-rpmbuild tools +# when they encounter hardlinks. +cp -r --preserve=mode,ownership,timestamps built-sdk/* %{buildroot}%{_libdir}/dotnet/ +ls %{buildroot}%{_libdir}/dotnet + +# Delete bundled certificates: we want to use the system store only, +# except for when we have no other choice and ca-certificates doesn't +# provide it. Currently ca-ceritificates has no support for +# timestamping certificates (timestamp.ctl). +find %{buildroot}%{_libdir}/dotnet -name 'codesignctl.pem' -delete +if [[ $(find %{buildroot}%{_libdir}/dotnet -name '*.pem' -print | wc -l) != 1 ]]; then + find %{buildroot}%{_libdir}/dotnet -name '*.pem' -print + echo "too many certificate bundles" + exit 2 +fi + +# Install managed symbols +tar xf artifacts/%{runtime_arch}/Release/dotnet-symbols-sdk-%{sdk_version}*-%{runtime_id}.tar.gz \ + -C %{buildroot}%{_libdir}/dotnet/ +find %{buildroot}%{_libdir}/dotnet/packs -iname '*.pdb' -delete + +# Fix executable permissions on files +find %{buildroot}%{_libdir}/dotnet/ -type f -name 'apphost' -exec chmod +x {} \; +find %{buildroot}%{_libdir}/dotnet/ -type f -name 'singlefilehost' -exec chmod +x {} \; +find %{buildroot}%{_libdir}/dotnet/ -type f -name 'lib*so' -exec chmod +x {} \; +find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.a' -exec chmod -x {} \; +find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.dll' -exec chmod -x {} \; +find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.h' -exec chmod 0644 {} \; +find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.json' -exec chmod -x {} \; +find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pdb' -exec chmod -x {} \; +find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.props' -exec chmod -x {} \; +find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pubxml' -exec chmod -x {} \; +find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {} \; +find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.txt' -exec chmod -x {} \; +find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.xml' -exec chmod -x {} \; + +install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/ +install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/ + +install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions +# dynamic completion needs the file to be named the same as the base command +install src/sdk/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet + +# TODO: the zsh completion script needs to be ported to use #compdef +#install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions +#install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet + +install -dm 0755 %{buildroot}%{_bindir} +ln -s ../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/ + +for section in 1 7; do + install -dm 0755 %{buildroot}%{_mandir}/man${section}/ + find -iname 'dotnet*'.${section} -type f -exec cp {} %{buildroot}%{_mandir}/man${section}/ \; +done + +install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet +echo "%{_libdir}/dotnet" >> install_location +install install_location %{buildroot}%{_sysconfdir}/dotnet/ +echo "%{_libdir}/dotnet" >> install_location_%{runtime_arch} +install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/ + +install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts +install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/ + + +# Quick and dirty check for https://github.com/dotnet/source-build/issues/2731 +test -f %{buildroot}%{_libdir}/dotnet/sdk/%{sdk_version}/Sdks/Microsoft.NET.Sdk/Sdk/Sdk.props + +# Check debug symbols in all elf objects. This is not in %%check +# because native binaries are stripped by rpm-build after %%install. +# So we need to do this check earlier. +echo "Testing build results for debug symbols..." +%{SOURCE20} -v %{buildroot}%{_libdir}/dotnet/ + + +find %{buildroot}%{_libdir}/dotnet/shared/Microsoft.NETCore.App -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-runtime-non-dbg-files +find %{buildroot}%{_libdir}/dotnet/shared/Microsoft.NETCore.App -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-runtime-dbg-files +find %{buildroot}%{_libdir}/dotnet/shared/Microsoft.AspNetCore.App -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' > aspnetcore-runtime-non-dbg-files +find %{buildroot}%{_libdir}/dotnet/shared/Microsoft.AspNetCore.App -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > aspnetcore-runtime-dbg-files +find %{buildroot}%{_libdir}/dotnet/sdk -type d | tail -n +2 | sed -E 's|%{buildroot}||' | sed -E 's|^|%dir |' > dotnet-sdk-non-dbg-files +find %{buildroot}%{_libdir}/dotnet/sdk -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' >> dotnet-sdk-non-dbg-files +find %{buildroot}%{_libdir}/dotnet/sdk -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-sdk-dbg-files + + +%check +%{buildroot}%{_libdir}/dotnet/dotnet --info +%{buildroot}%{_libdir}/dotnet/dotnet --version + + +%files -n dotnet-host +%dir %{_libdir}/dotnet +%{_libdir}/dotnet/dotnet +%dir %{_libdir}/dotnet/host +%dir %{_libdir}/dotnet/host/fxr +%{_bindir}/dotnet +%license %{_libdir}/dotnet/LICENSE.txt +%license %{_libdir}/dotnet/ThirdPartyNotices.txt +%doc %{_mandir}/man1/dotnet*.1.* +%doc %{_mandir}/man7/dotnet*.7.* +%config(noreplace) %{_sysconfdir}/profile.d/dotnet.sh +%config(noreplace) %{_sysconfdir}/dotnet +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/dotnet + +%files -n dotnet-hostfxr-%{dotnetver} +%dir %{_libdir}/dotnet/host/fxr +%{_libdir}/dotnet/host/fxr/%{host_version} + +%files -n dotnet-runtime-%{dotnetver} -f dotnet-runtime-non-dbg-files +%dir %{_libdir}/dotnet/shared +%dir %{_libdir}/dotnet/shared/Microsoft.NETCore.App +%dir %{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version} + +%files -n dotnet-runtime-dbg-%{dotnetver} -f dotnet-runtime-dbg-files + +%files -n aspnetcore-runtime-%{dotnetver} -f aspnetcore-runtime-non-dbg-files +%dir %{_libdir}/dotnet/shared +%dir %{_libdir}/dotnet/shared/Microsoft.AspNetCore.App +%dir %{_libdir}/dotnet/shared/Microsoft.AspNetCore.App/%{aspnetcore_runtime_version} + +%files -n aspnetcore-runtime-dbg-%{dotnetver} -f aspnetcore-runtime-dbg-files + +%files -n dotnet-templates-%{dotnetver} +%dir %{_libdir}/dotnet/templates +%{_libdir}/dotnet/templates/%{templates_version} + +%files -n dotnet-sdk-%{dotnetver} -f dotnet-sdk-non-dbg-files +%dir %{_libdir}/dotnet/sdk +%dir %{_libdir}/dotnet/sdk-manifests +%{_libdir}/dotnet/sdk-manifests/%{sdk_feature_band_version}* +%{_libdir}/dotnet/metadata +%dir %{_libdir}/dotnet/packs +%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Runtime.%{runtime_id}/%{aspnetcore_runtime_version} +%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Runtime.%{runtime_id}/%{runtime_version} + +%files -n dotnet-sdk-dbg-%{dotnetver} -f dotnet-sdk-dbg-files + +%files -n dotnet-sdk-%{dotnetver}-source-built-artifacts +%dir %{_libdir}/dotnet +%{_libdir}/dotnet/source-built-artifacts + + +%changelog +* Wed Jul 31 2024 WangKui - 8.0.104-1.0.1 +- Support openEuler diff --git a/msbuild-9449-exec-stop-setting-a-locale.patch b/msbuild-9449-exec-stop-setting-a-locale.patch new file mode 100644 index 0000000000000000000000000000000000000000..0cd464218f023df0a9cc32c46994fb3442e6b667 --- /dev/null +++ b/msbuild-9449-exec-stop-setting-a-locale.patch @@ -0,0 +1,104 @@ +From 68fa6537305beda5cb059c898349f37bda285ca7 Mon Sep 17 00:00:00 2001 +From: Tom Deseyn +Date: Thu, 1 Feb 2024 09:23:16 +0100 +Subject: [PATCH 1/1] Exec: stop setting a locale on Unix. + +This backports a fix that is part of Microsoft's upcoming +8.0.2xx SDK to the 8.0.1xx SDK that we package. + +This fix stops MSBuild Exec from printing warnings and/or +failing in bash envionments where the glibc en_US locale +is not available (which is common in container images). + +The backport includes the changewave opt-out that allows +users to revert back to the previous behavior by setting +the MSBUILDDISABLEFEATURESFROMVERSION envvar to the +version where the feature is introduced ("17.10"). +--- + src/msbuild/src/Framework/ChangeWaves.cs | 3 +- + src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs | 36 +++++++++++++++++++ + src/msbuild/src/Tasks/Exec.cs | 7 +++- + 3 files changed, 44 insertions(+), 2 deletions(-) + +diff --git a/src/msbuild/src/Framework/ChangeWaves.cs b/src/msbuild/src/Framework/ChangeWaves.cs +index 0050723798..1f925324ac 100644 +--- a/src/msbuild/src/Framework/ChangeWaves.cs ++++ b/src/msbuild/src/Framework/ChangeWaves.cs +@@ -27,7 +27,8 @@ namespace Microsoft.Build.Framework + internal static readonly Version Wave17_4 = new Version(17, 4); + internal static readonly Version Wave17_6 = new Version(17, 6); + internal static readonly Version Wave17_8 = new Version(17, 8); +- internal static readonly Version[] AllWaves = { Wave17_4, Wave17_6, Wave17_8 }; ++ internal static readonly Version Wave17_10 = new Version(17, 10); ++ internal static readonly Version[] AllWaves = { Wave17_4, Wave17_6, Wave17_8, Wave17_10 }; + + /// + /// Special value indicating that all features behind all Change Waves should be enabled. +diff --git a/src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs b/src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs +index cb468a6cce..c0598e4978 100644 +--- a/src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs ++++ b/src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs +@@ -69,6 +69,42 @@ namespace Microsoft.Build.UnitTests + } + } + ++ [UnixOnlyTheory] ++ [InlineData(true)] ++ [InlineData(false)] ++ public void ExecSetsLocaleOnUnix(bool enableChangeWave) ++ { ++ using (var env = TestEnvironment.Create()) ++ { ++ env.SetEnvironmentVariable("LANG", null); ++ env.SetEnvironmentVariable("LC_ALL", null); ++ ++ if (enableChangeWave) ++ { ++ ChangeWaves.ResetStateForTests(); ++ // Important: use the version here ++ env.SetEnvironmentVariable("MSBUILDDISABLEFEATURESFROMVERSION", ChangeWaves.Wave17_10.ToString()); ++ BuildEnvironmentHelper.ResetInstance_ForUnitTestsOnly(); ++ } ++ ++ Exec exec = PrepareExec("echo LANG=$LANG; echo LC_ALL=$LC_ALL;"); ++ bool result = exec.Execute(); ++ Assert.True(result); ++ ++ MockEngine engine = (MockEngine)exec.BuildEngine; ++ if (enableChangeWave) ++ { ++ engine.AssertLogContains("LANG=en_US.UTF-8"); ++ engine.AssertLogContains("LC_ALL=en_US.UTF-8"); ++ } ++ else ++ { ++ engine.AssertLogDoesntContain("LANG=en_US.UTF-8"); ++ engine.AssertLogDoesntContain("LC_ALL=en_US.UTF-8"); ++ } ++ } ++ } ++ + /// + /// Ensures that calling the Exec task does not leave any extra TEMP files + /// lying around. +diff --git a/src/msbuild/src/Tasks/Exec.cs b/src/msbuild/src/Tasks/Exec.cs +index dbf4be1fc5..9faaa68887 100644 +--- a/src/msbuild/src/Tasks/Exec.cs ++++ b/src/msbuild/src/Tasks/Exec.cs +@@ -591,7 +591,12 @@ namespace Microsoft.Build.Tasks + { + commandLine.AppendSwitch("-c"); + commandLine.AppendTextUnquoted(" \""); +- commandLine.AppendTextUnquoted("export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; . "); ++ bool setLocale = !ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_10); ++ if (setLocale) ++ { ++ commandLine.AppendTextUnquoted("export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; "); ++ } ++ commandLine.AppendTextUnquoted(". "); + commandLine.AppendFileNameIfNotNull(batchFileForCommandLine); + commandLine.AppendTextUnquoted("\""); + } +-- +2.43.0 + diff --git a/openEuler-dotnet-8.patch b/openEuler-dotnet-8.patch new file mode 100644 index 0000000000000000000000000000000000000000..bd074fb58baf37aed85184c93e07a2e0b9478b61 --- /dev/null +++ b/openEuler-dotnet-8.patch @@ -0,0 +1,26 @@ +diff --git a/eng/Versions.props b/eng/Versions.props +index dbd2565..b395082 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -30,7 +30,7 @@ + These URLs can't be composed from their base URL and version as we read them from the + prep.sh and pipeline scripts, outside of MSBuild. + --> +- https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.103-servicing.24117.1.centos.8-x64.tar.gz ++ https://repo.oepkgs.net/openEuler/rpm/extras-tgz/dotnet/Private.SourceBuilt.Artifacts.8.0.103-servicing.24117.1.openeuler.22.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.103-centos.8-x64.tar.gz + + +diff --git a/eng/common/tools.sh b/eng/common/tools.sh +index 3392e3a..6ee20ab 100755 +--- a/eng/common/tools.sh ++++ b/eng/common/tools.sh +@@ -297,7 +297,7 @@ function with_retries { + function GetDotNetInstallScript { + local root=$1 + local install_script="$root/dotnet-install.sh" +- local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" ++ local install_script_url="https://repo.oepkgs.net/openEuler/rpm/extras-tgz/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + + if [[ ! -a "$install_script" ]]; then + mkdir -p "$root" diff --git a/openEuler-runtime-8.patch b/openEuler-runtime-8.patch new file mode 100644 index 0000000000000000000000000000000000000000..bb2ffd29e1d2adba479aba1b0bc6353e589b70d8 --- /dev/null +++ b/openEuler-runtime-8.patch @@ -0,0 +1,508 @@ +diff --git a/Directory.Build.props b/Directory.Build.props +index 3c8246c8967..b753c25896b 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -3,6 +3,7 @@ + + false ++ true + +diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json +index 085cb7b518f..c61db5ef70d 100644 +--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json ++++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json +@@ -1,4 +1,223 @@ + { ++ "openEuler": [ ++ "openEuler", ++ "linux", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openEuler-arm64": [ ++ "openEuler-arm64", ++ "openEuler", ++ "linux-arm64", ++ "linux", ++ "unix-arm64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openEuler-x64": [ ++ "openEuler-x64", ++ "openEuler", ++ "linux-x64", ++ "linux", ++ "unix-x64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openEuler.22.03-x64": [ ++ "openEuler.22.03-x64", ++ "openEuler.22.03", ++ "openEuler", ++ "linux-x64", ++ "linux", ++ "unix-x64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openEuler.22.03-arm64": [ ++ "openEuler.22.03-arm64", ++ "openEuler.22.03", ++ "openEuler", ++ "linux-arm64", ++ "linux", ++ "unix-arm64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openEuler.22-x64": [ ++ "openEuler.22.03-x64", ++ "openEuler.22.03", ++ "openEuler.22-x64", ++ "openEuler.22", ++ "openEuler", ++ "linux-x64", ++ "linux", ++ "unix-x64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openEuler.22-arm64": [ ++ "openEuler.22.03-arm64", ++ "openEuler.22.03", ++ "openEuler.22-arm64", ++ "openEuler.22", ++ "openEuler", ++ "linux-arm64", ++ "linux", ++ "unix-arm64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openeuler.22.03-x64": [ ++ "openeuler.22.03-x64", ++ "openeuler.22.03", ++ "openeuler", ++ "linux-x64", ++ "linux", ++ "unix-x64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openeuler.22.03-arm64": [ ++ "openeuler.22.03-arm64", ++ "openeuler.22.03", ++ "openeuler", ++ "linux-arm64", ++ "linux", ++ "unix-arm64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openeuler.22-x64": [ ++ "openeuler.22.03-x64", ++ "openeuler.22.03", ++ "openeuler.22-x64", ++ "openeuler.22", ++ "openeuler", ++ "linux-x64", ++ "linux", ++ "unix-x64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openeuler.22-arm64": [ ++ "openeuler.22.03-arm64", ++ "openeuler.22.03", ++ "openeuler.22-arm64", ++ "openeuler.22", ++ "openeuler", ++ "linux-arm64", ++ "linux", ++ "unix-arm64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openEuler.20.03-x64": [ ++ "openEuler.20.03-x64", ++ "openEuler.20.03", ++ "openEuler", ++ "linux-x64", ++ "linux", ++ "unix-x64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openEuler.20.03-arm64": [ ++ "openEuler.20.03-arm64", ++ "openEuler.20.03", ++ "openEuler", ++ "linux-arm64", ++ "linux", ++ "unix-arm64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openEuler.20-x64": [ ++ "openEuler.20.03-x64", ++ "openEuler.20.03", ++ "openEuler.20-x64", ++ "openEuler.20", ++ "openEuler", ++ "linux-x64", ++ "linux", ++ "unix-x64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openEuler.20-arm64": [ ++ "openEuler.20.03-arm64", ++ "openEuler.20.03", ++ "openEuler.20-arm64", ++ "openEuler.20", ++ "openEuler", ++ "linux-arm64", ++ "linux", ++ "unix-arm64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openeuler.20.03-x64": [ ++ "openeuler.20.03-x64", ++ "openeuler.20.03", ++ "openeuler", ++ "linux-x64", ++ "linux", ++ "unix-x64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openeuler.20.03-arm64": [ ++ "openeuler.20.03-arm64", ++ "openeuler.20.03", ++ "openeuler", ++ "linux-arm64", ++ "linux", ++ "unix-arm64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openeuler.20-x64": [ ++ "openeuler.20.03-x64", ++ "openeuler.20.03", ++ "openeuler.20-x64", ++ "openeuler.20", ++ "openeuler", ++ "linux-x64", ++ "linux", ++ "unix-x64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "openeuler.20-arm64": [ ++ "openeuler.20.03-arm64", ++ "openeuler.20.03", ++ "openeuler.20-arm64", ++ "openeuler.20", ++ "openeuler", ++ "linux-arm64", ++ "linux", ++ "unix-arm64", ++ "unix", ++ "any", ++ "base" ++ ], + "alpine": [ + "alpine", + "linux-musl", +diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json +index 16c038598af..a4eb8d2705c 100644 +--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json ++++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json +@@ -1,5 +1,209 @@ + { + "runtimes": { ++ "openEuler.22.03": { ++ "#import": [ ++ "linux", ++ "openEuler", ++ "openEuler.22.03" ++ ] ++ }, ++ "openEuler.22.03-arm64": { ++ "#import": [ ++ "linux-arm64", ++ "openEuler", ++ "openEuler.22.03", ++ "openEuler.22.03-arm64" ++ ] ++ }, ++ "openEuler.22.03-x64": { ++ "#import": [ ++ "linux-x64", ++ "openEuler", ++ "openEuler.22.03", ++ "openEuler.22.03-x64" ++ ] ++ }, ++ "openEuler.22": { ++ "#import": [ ++ "linux", ++ "openEuler", ++ "openEuler.22.03", ++ "openEuler.22" ++ ] ++ }, ++ "openEuler.22-arm64": { ++ "#import": [ ++ "linux-arm64", ++ "openEuler", ++ "openEuler.22", ++ "openEuler.22-arm64", ++ "openEuler.22.03", ++ "openEuler.22.03-x64" ++ ] ++ }, ++ "openEuler.22-x64": { ++ "#import": [ ++ "linux-x64", ++ "openEuler", ++ "openEuler.22", ++ "openEuler.22-x64", ++ "openEuler.22.03", ++ "openEuler.22.03-x64" ++ ] ++ }, ++ "openeuler.22.03": { ++ "#import": [ ++ "linux", ++ "openeuler", ++ "openeuler.22.03" ++ ] ++ }, ++ "openeuler.22.03-arm64": { ++ "#import": [ ++ "linux-arm64", ++ "openeuler", ++ "openeuler.22.03", ++ "openeuler.22.03-arm64" ++ ] ++ }, ++ "openeuler.22.03-x64": { ++ "#import": [ ++ "linux-x64", ++ "openeuler", ++ "openeuler.22.03", ++ "openeuler.22.03-x64" ++ ] ++ }, ++ "openeuler.22": { ++ "#import": [ ++ "linux", ++ "openeuler", ++ "openeuler.22.03", ++ "openeuler.22" ++ ] ++ }, ++ "openeuler.22-arm64": { ++ "#import": [ ++ "linux-arm64", ++ "openeuler", ++ "openeuler.22", ++ "openeuler.22-arm64", ++ "openeuler.22.03", ++ "openeuler.22.03-x64" ++ ] ++ }, ++ "openeuler.22-x64": { ++ "#import": [ ++ "linux-x64", ++ "openeuler", ++ "openeuler.22", ++ "openeuler.22-x64", ++ "openeuler.22.03", ++ "openeuler.22.03-x64" ++ ] ++ }, ++ "openEuler.20.03": { ++ "#import": [ ++ "linux", ++ "openEuler", ++ "openEuler.20.03" ++ ] ++ }, ++ "openEuler.20.03-arm64": { ++ "#import": [ ++ "linux-arm64", ++ "openEuler", ++ "openEuler.20.03", ++ "openEuler.20.03-arm64" ++ ] ++ }, ++ "openEuler.20.03-x64": { ++ "#import": [ ++ "linux-x64", ++ "openEuler", ++ "openEuler.20.03", ++ "openEuler.20.03-x64" ++ ] ++ }, ++ "openEuler.20": { ++ "#import": [ ++ "linux", ++ "openEuler", ++ "openEuler.20.03", ++ "openEuler.20" ++ ] ++ }, ++ "openEuler.20-arm64": { ++ "#import": [ ++ "linux-arm64", ++ "openEuler", ++ "openEuler.20", ++ "openEuler.20-arm64", ++ "openEuler.20.03", ++ "openEuler.20.03-x64" ++ ] ++ }, ++ "openEuler.20-x64": { ++ "#import": [ ++ "linux-x64", ++ "openEuler", ++ "openEuler.20", ++ "openEuler.20-x64", ++ "openEuler.20.03", ++ "openEuler.20.03-x64" ++ ] ++ }, ++ "openeuler.20.03": { ++ "#import": [ ++ "linux", ++ "openeuler", ++ "openeuler.20.03" ++ ] ++ }, ++ "openeuler.20.03-arm64": { ++ "#import": [ ++ "linux-arm64", ++ "openeuler", ++ "openeuler.20.03", ++ "openeuler.20.03-arm64" ++ ] ++ }, ++ "openeuler.20.03-x64": { ++ "#import": [ ++ "linux-x64", ++ "openeuler", ++ "openeuler.20.03", ++ "openeuler.20.03-x64" ++ ] ++ }, ++ "openeuler.20": { ++ "#import": [ ++ "linux", ++ "openeuler", ++ "openeuler.20.03", ++ "openeuler.20" ++ ] ++ }, ++ "openeuler.20-arm64": { ++ "#import": [ ++ "linux-arm64", ++ "openeuler", ++ "openeuler.20", ++ "openeuler.20-arm64", ++ "openeuler.20.03", ++ "openeuler.20.03-x64" ++ ] ++ }, ++ "openeuler.20-x64": { ++ "#import": [ ++ "linux-x64", ++ "openeuler", ++ "openeuler.20", ++ "openeuler.20-x64", ++ "openeuler.20.03", ++ "openeuler.20.03-x64" ++ ] ++ }, + "alpine": { + "#import": [ + "linux-musl" +diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props +index 05bdf782326..d2992625d59 100644 +--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props ++++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props +@@ -1,6 +1,21 @@ + + + ++ ++ linux ++ x64;arm64 ++ 20;20.03;22;22.03 ++ false ++ false ++ ++ ++ linux ++ x64;arm64 ++ 20;20.03;22;22.03 ++ false ++ false ++ ++ + + any + x64;x86;arm;armv6;armel;arm64;loongarch64;mips64;s390x;ppc64le;riscv64 +diff --git a/src/native/corehost/hostmisc/pal.unix.cpp b/src/native/corehost/hostmisc/pal.unix.cpp +index 34520aefd73..695acb595d9 100644 +--- a/src/native/corehost/hostmisc/pal.unix.cpp ++++ b/src/native/corehost/hostmisc/pal.unix.cpp +@@ -767,6 +767,8 @@ pal::string_t normalize_linux_rid(pal::string_t rid) + pal::string_t rhelPrefix(_X("rhel.")); + pal::string_t alpinePrefix(_X("alpine.")); + pal::string_t rockyPrefix(_X("rocky.")); ++ pal::string_t oEPrefix(_X("openEuler.")); ++ pal::string_t oePrefix(_X("openeuler.")); + size_t lastVersionSeparatorIndex = std::string::npos; + + if (rid.compare(0, rhelPrefix.length(), rhelPrefix) == 0) +@@ -785,6 +787,14 @@ pal::string_t normalize_linux_rid(pal::string_t rid) + { + lastVersionSeparatorIndex = rid.find(_X("."), rockyPrefix.length()); + } ++ else if (rid.compare(0, oePrefix.length(), oePrefix) == 0) ++ { ++ lastVersionSeparatorIndex = rid.find(_X("."), oePrefix.length()); ++ } ++ else if (rid.compare(0, oEPrefix.length(), oEPrefix) == 0) ++ { ++ lastVersionSeparatorIndex = rid.find(_X("."), oEPrefix.length()); ++ } + + if (lastVersionSeparatorIndex != std::string::npos) + { diff --git a/openEuler-sdk-8.patch b/openEuler-sdk-8.patch new file mode 100644 index 0000000000000000000000000000000000000000..4bb29216ff22bc0490276052da50bc6d7e50845d --- /dev/null +++ b/openEuler-sdk-8.patch @@ -0,0 +1,52 @@ +diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs +index 3547fd59ed..8613529153 100644 +--- a/src/Cli/dotnet/CommonOptions.cs ++++ b/src/Cli/dotnet/CommonOptions.cs +@@ -4,6 +4,7 @@ + using Microsoft.DotNet.Cli.Utils; + using Microsoft.DotNet.Tools; + using Microsoft.DotNet.Tools.Common; ++using System.IO; + using System.CommandLine; + using System.CommandLine.Completions; + +@@ -222,7 +223,7 @@ internal static string ResolveRidShorthandOptionsToRuntimeIdentifier(string os, + { + var currentRid = GetCurrentRuntimeId(); + arch = arch == "amd64" ? "x64" : arch; +- os = string.IsNullOrEmpty(os) ? GetOsFromRid(currentRid) : os; ++ os = string.IsNullOrEmpty(os) ? GetCurrentOs(currentRid) : os; + arch = string.IsNullOrEmpty(arch) ? GetArchFromRid(currentRid) : arch; + return $"{os}-{arch}"; + } +@@ -249,6 +250,30 @@ public static string GetCurrentRuntimeId() + return currentRuntimeIdentifiers[0]; // First rid is the most specific (ex win-x64) + } + ++ private static string GetCurrentOs(string rid) ++ { ++ string osReleasePath = "/etc/os-release"; ++ string id = null, versionId = null; ++ if (File.Exists(osReleasePath)) ++ { ++ var lines = File.ReadLines(osReleasePath); ++ foreach (var line in lines) ++ { ++ if (line.StartsWith("ID=", StringComparison.Ordinal)) ++ id = line.Substring(3).Trim('"', '\''); ++ if (line.StartsWith("VERSION_ID=", StringComparison.Ordinal)) ++ versionId = line.Substring(11).Trim('"', '\''); ++ } ++ } ++ string result = null; ++ if (id == null) ++ return GetOsFromRid(rid); ++ result = id; ++ if (versionId != null) ++ result = $"{id}.{versionId}"; ++ return result.ToLower(); ++ } ++ + private static string GetOsFromRid(string rid) => rid.Substring(0, rid.LastIndexOf("-")); + + private static string GetArchFromRid(string rid) => rid.Substring(rid.LastIndexOf("-") + 1, rid.Length - rid.LastIndexOf("-") - 1); diff --git a/openEuler-source-build-reference-packages-8.patch b/openEuler-source-build-reference-packages-8.patch new file mode 100644 index 0000000000000000000000000000000000000000..c1bd44448c911f19b941f31572bcab0f32535503 --- /dev/null +++ b/openEuler-source-build-reference-packages-8.patch @@ -0,0 +1,13 @@ +diff --git a/src/targetPacks/Directory.Build.targets b/src/targetPacks/Directory.Build.targets +index cf5e75a..6c6f41b 100644 +--- a/src/targetPacks/Directory.Build.targets ++++ b/src/targetPacks/Directory.Build.targets +@@ -103,7 +103,7 @@ + + + +- <_IlToolPackageReference NativePath="$(NuGetPackageRoot)\%(Identity)\%(Version)\runtimes\$(MicrosoftNetCoreIlasmPackageRuntimeId)\native" /> ++ <_IlToolPackageReference NativePath="$(NuGetPackageRoot)\%(Identity)\9.0.0-preview.2.24128.5\runtimes\$(MicrosoftNetCoreIlasmPackageRuntimeId)\native" /> + <_IlasmSourceFiles Include="%(_IlToolPackageReference.NativePath)\**\*" /> + + diff --git a/release-key-2023.asc b/release-key-2023.asc new file mode 100644 index 0000000000000000000000000000000000000000..96844b6539812eca484385ba15cb39926517690c --- /dev/null +++ b/release-key-2023.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BSN Pgp v1.1.0.0 + +mQINBGUKsUYBEADVCJm4EhXALr1ld42kWeh/vM0XMZ2orNT6NRLDRYjpE4mm4UqA +vpjfGCwt5fLcrT4yZng8ABkB3QwTsZzmxesAMD5AZR/gdU1G96DuDGsjp6zJvTuX +zvz3PXUYfcl9n5X32acA6N9J5Xfp10xqX3oitUODBdYy/vKW/v/y87ZxgaR6a3wp +pPJBJIVKwFJx13v4BHRsGp1fepliQcXPvmNKFNI20le5+FbLq6C9hY5wcwGHGfQr +EokH79GsmqgSImqxDOIh06J5VfWA+JwV+3vf95pD8IUrRfGQ+GK7b1/bySxtM5Qa +b/IDgvl/Qq3AzEpGarMBaqGbqMz1C7jd8Y6nyKMP/V+OCjbEdYNM8GRz6kBP3Un+ +Frat5Lc2o4DF+zB3PKIJS3hku5gwlJu6IU1F23vmYFtjUcpRGmyQZDoWyBbOWlB5 +4SXqVu16amUsRFYmOK8BJMjdotcVbriVIv6WRmugfhIMoRJzVGxYkdbuiuMAX69V +xDoGpxX5A8S5A79y0USUVtadQfFavMTyb/gUuUe8oDsqK9gdI3ETxLYG4gYwauVX +fCGfoLOKsq5dPzEuEA7GCRrMau+rHKFaM7BigSdnHFW7xNZ4v0YnXAagoqM2G5o5 +9sak0l57vxxTVk2V3iZzkoU2J2Zlyxyh72n5vjRmb7aNwmQh4Eav6a8ssQARAQAB +tBlvbm54Y29yZWRldkBtaWNyb3NvZnQuY29tiQI4BBMBCAAiBQJlCrFGAhsDBgsJ +CAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRD9v1PCTbSHLtfzEADIKq15XDeQxLSo +BG1aFa9n82K1YADVcu1LeddfhDmQWLnZNgyHtQlKN2n59282CXtgymzae3uc05s2 +feIJaqF4M4NnCX8Ct3K7Hq1jI7ZktlquPCCy9XHq9aQY8XTxmdtRevtclKgYTwDh +w+D/KbE8vTZ6o7JoubA3MKf4k3S8qL/0rIyaC6h0EpiWoMy1TdNMMK7BT4kl6Vz4 +W6KmNgOux1Pzku5ULM4WuOzmwW+NAzpOLJowfDs1ZC2RM3+g9i1/DmwWtCHngvGD ++clA0I0agXxo05toOBTfwxd2gWYczuo/Ole16fYTzqT6n0DHqOjjcc9A7EmC72fQ +J+hHAqM+4+CbEGuMpNnTMpCZs98bcK3Rqx/bDJYtbclZzm5O/V4nVbDrJZKzpgA1 +KuzNMLkr62P6/t15UsStgmrlTILmE5NG0CR1mj/46+mNbsMZCel3dcvnT1Zf4rTq +QxMC7Dd/DECKQVC339G/BRfNyhOk2S1mZR/g1uS4bznL+tiwudDh/TAi5C3ZBDMh +0muwD9caXS/QFIBWtb2ai3IcpU357R/ERPKLcWYtoYJ80RuKi6XYr1WxSPBmd5Qm +wuncye+wR2dveo2jnIXZGUSgz50ZNgBxs/cYWAQ8J6KMgIBa+JY2qalzvIGbrC5x +Sr+CkhS8vrktfnRgc8yBssJnvNfqXA== +=pKgS +-----END PGP PUBLIC KEY BLOCK----- diff --git a/release.json b/release.json new file mode 100644 index 0000000000000000000000000000000000000000..9a63353dcb4b817723e0ddd222ba9db66f09afbc --- /dev/null +++ b/release.json @@ -0,0 +1,10 @@ +{ + "release": "8.0.4", + "channel": "8.0", + "tag": "v8.0.4", + "sdkVersion": "8.0.104", + "runtimeVersion": "8.0.4", + "aspNetCoreVersion": "8.0.4", + "sourceRepository": "https://github.com/dotnet/dotnet", + "sourceVersion": "83659133a1aa2b2d94f9c4ecebfa10d960e27706" +} diff --git a/roslyn-analyzers-ppc64le-apphost.patch b/roslyn-analyzers-ppc64le-apphost.patch new file mode 100644 index 0000000000000000000000000000000000000000..4dd465c03aa97a7c91aa832b1f3ca9f081aa22c2 --- /dev/null +++ b/roslyn-analyzers-ppc64le-apphost.patch @@ -0,0 +1,12 @@ +diff --git a/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj b/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj +index 044a2aba4..b3f8f2611 100644 +--- a/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj ++++ b/src/roslyn-analyzers/src/PerformanceTests/Tests/PerformanceTests.csproj +@@ -4,6 +4,7 @@ + preview + disable + Exe ++ false + + + true diff --git a/runtime-re-enable-implicit-rejection.patch b/runtime-re-enable-implicit-rejection.patch new file mode 100644 index 0000000000000000000000000000000000000000..841850fdbfa7153c4fce978b6329d01e0b025711 --- /dev/null +++ b/runtime-re-enable-implicit-rejection.patch @@ -0,0 +1,169 @@ +From 5fdc289903bd3a77d455583650b00297da0cae8f Mon Sep 17 00:00:00 2001 +From: Omair Majid +Date: Fri, 2 Feb 2024 15:51:23 -0500 +Subject: [PATCH] Revert "Disable implicit rejection for RSA PKCS#1 (#95216)" + +This reverts commit a5fc8ff9b03ffb2fdb81dad524ad1a20a0714995. + +To quote Clemens Lang: + +> [Disabling implcit rejection] re-enables a Bleichenbacher timing oracle +> attack against PKCS#1v1.5 decryption. See +> https://people.redhat.com/~hkario/marvin/ for details and +> https://github.com/dotnet/runtime/pull/95157#issuecomment-1842784399 for a +> comment by the researcher who published the vulnerability and proposed the +> change in OpenSSL. + +For more details, see: +https://github.com/dotnet/runtime/pull/95216#issuecomment-1842799314 +--- + .../RSA/EncryptDecrypt.cs | 49 ++++--------------- + .../opensslshim.h | 6 --- + .../pal_evp_pkey_rsa.c | 13 ----- + 3 files changed, 10 insertions(+), 58 deletions(-) + +diff --git a/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs b/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs +index 39f3ebc82ec..5b97f468a42 100644 +--- a/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs ++++ b/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs +@@ -353,10 +353,19 @@ private void RsaCryptRoundtrip(RSAEncryptionPadding paddingMode, bool expectSucc + Assert.Equal(TestData.HelloBytes, output); + } + +- [ConditionalFact(nameof(PlatformSupportsEmptyRSAEncryption))] ++ [ConditionalFact] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + public void RoundtripEmptyArray() + { ++ if (OperatingSystem.IsIOS() && !OperatingSystem.IsIOSVersionAtLeast(13, 6)) ++ { ++ throw new SkipTestException("iOS prior to 13.6 does not reliably support RSA encryption of empty data."); ++ } ++ if (OperatingSystem.IsTvOS() && !OperatingSystem.IsTvOSVersionAtLeast(14, 0)) ++ { ++ throw new SkipTestException("tvOS prior to 14.0 does not reliably support RSA encryption of empty data."); ++ } ++ + using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) + { + void RoundtripEmpty(RSAEncryptionPadding paddingMode) +@@ -716,26 +725,6 @@ public void NotSupportedValueMethods() + } + } + +- [ConditionalTheory] +- [InlineData(new byte[] { 1, 2, 3, 4 })] +- [InlineData(new byte[0])] +- public void Decrypt_Pkcs1_ErrorsForInvalidPadding(byte[] data) +- { +- if (data.Length == 0 && !PlatformSupportsEmptyRSAEncryption) +- { +- throw new SkipTestException("Platform does not support RSA encryption of empty data."); +- } +- +- using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) +- { +- byte[] encrypted = Encrypt(rsa, data, RSAEncryptionPadding.Pkcs1); +- encrypted[1] ^= 0xFF; +- +- // PKCS#1, the data, and the key are all deterministic so this should always throw an exception. +- Assert.ThrowsAny(() => Decrypt(rsa, encrypted, RSAEncryptionPadding.Pkcs1)); +- } +- } +- + [Fact] + public void Decrypt_Pkcs1_BadPadding() + { +@@ -757,23 +746,5 @@ public static IEnumerable OaepPaddingModes + } + } + } +- +- public static bool PlatformSupportsEmptyRSAEncryption +- { +- get +- { +- if (OperatingSystem.IsIOS() && !OperatingSystem.IsIOSVersionAtLeast(13, 6)) +- { +- return false; +- } +- +- if (OperatingSystem.IsTvOS() && !OperatingSystem.IsTvOSVersionAtLeast(14, 0)) +- { +- return false; +- } +- +- return true; +- } +- } + } + } +diff --git a/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h b/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h +index 0748e305d5c..cf10d2f7949 100644 +--- a/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h ++++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h +@@ -296,10 +296,8 @@ int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md, size_t len); + REQUIRED_FUNCTION(ERR_peek_error) \ + REQUIRED_FUNCTION(ERR_peek_error_line) \ + REQUIRED_FUNCTION(ERR_peek_last_error) \ +- REQUIRED_FUNCTION(ERR_pop_to_mark) \ + FALLBACK_FUNCTION(ERR_put_error) \ + REQUIRED_FUNCTION(ERR_reason_error_string) \ +- REQUIRED_FUNCTION(ERR_set_mark) \ + LIGHTUP_FUNCTION(ERR_set_debug) \ + LIGHTUP_FUNCTION(ERR_set_error) \ + REQUIRED_FUNCTION(EVP_aes_128_cbc) \ +@@ -355,7 +353,6 @@ int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md, size_t len); + REQUIRED_FUNCTION(EVP_PKCS82PKEY) \ + REQUIRED_FUNCTION(EVP_PKEY2PKCS8) \ + REQUIRED_FUNCTION(EVP_PKEY_CTX_ctrl) \ +- REQUIRED_FUNCTION(EVP_PKEY_CTX_ctrl_str) \ + REQUIRED_FUNCTION(EVP_PKEY_CTX_free) \ + REQUIRED_FUNCTION(EVP_PKEY_CTX_get0_pkey) \ + REQUIRED_FUNCTION(EVP_PKEY_CTX_new) \ +@@ -797,10 +794,8 @@ FOR_ALL_OPENSSL_FUNCTIONS + #define ERR_peek_error_line ERR_peek_error_line_ptr + #define ERR_peek_last_error ERR_peek_last_error_ptr + #define ERR_put_error ERR_put_error_ptr +-#define ERR_pop_to_mark ERR_pop_to_mark_ptr + #define ERR_reason_error_string ERR_reason_error_string_ptr + #define ERR_set_debug ERR_set_debug_ptr +-#define ERR_set_mark ERR_set_mark_ptr + #define ERR_set_error ERR_set_error_ptr + #define EVP_aes_128_cbc EVP_aes_128_cbc_ptr + #define EVP_aes_128_cfb8 EVP_aes_128_cfb8_ptr +@@ -855,7 +850,6 @@ FOR_ALL_OPENSSL_FUNCTIONS + #define EVP_PKCS82PKEY EVP_PKCS82PKEY_ptr + #define EVP_PKEY2PKCS8 EVP_PKEY2PKCS8_ptr + #define EVP_PKEY_CTX_ctrl EVP_PKEY_CTX_ctrl_ptr +-#define EVP_PKEY_CTX_ctrl_str EVP_PKEY_CTX_ctrl_str_ptr + #define EVP_PKEY_CTX_free EVP_PKEY_CTX_free_ptr + #define EVP_PKEY_CTX_get0_pkey EVP_PKEY_CTX_get0_pkey_ptr + #define EVP_PKEY_CTX_new EVP_PKEY_CTX_new_ptr +diff --git a/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c b/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c +index 043bf9f9d1e..c9ccdf33e3a 100644 +--- a/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c ++++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c +@@ -67,19 +67,6 @@ static bool ConfigureEncryption(EVP_PKEY_CTX* ctx, RsaPaddingMode padding, const + { + return false; + } +- +- // OpenSSL 3.2 introduced a change where PKCS#1 RSA decryption does not fail for invalid padding. +- // If the padding is invalid, the decryption operation returns random data. +- // See https://github.com/openssl/openssl/pull/13817 for background. +- // Some Linux distributions backported this change to previous versions of OpenSSL. +- // Here we do a best-effort to set a flag to revert the behavior to failing if the padding is invalid. +- ERR_set_mark(); +- +- EVP_PKEY_CTX_ctrl_str(ctx, "rsa_pkcs1_implicit_rejection", "0"); +- +- // Undo any changes to the error queue that may have occured while configuring implicit rejection if the +- // current version does not support implicit rejection. +- ERR_pop_to_mark(); + } + else + { +-- +2.43.0 + diff --git a/vstest-intent-net8.0.patch b/vstest-intent-net8.0.patch new file mode 100644 index 0000000000000000000000000000000000000000..6a5180749c811af18703138a0a8cc6463525c77d --- /dev/null +++ b/vstest-intent-net8.0.patch @@ -0,0 +1,13 @@ +diff --git a/src/vstest/test/Intent/Intent.csproj b/src/vstest/test/Intent/Intent.csproj +index bb711c9256..6d0b199a9b 100644 +--- a/src/vstest/test/Intent/Intent.csproj ++++ b/src/vstest/test/Intent/Intent.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0 ++ net8.0 + enable + enable +