Update to .NET SDK 6.0.105 and Runtime 6.0.5
Resolves: RHBZ#2082266
This commit is contained in:
parent
f7fc477698
commit
973fd178e7
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,3 +5,4 @@
|
||||
/dotnet-v6.0.102.tar.gz
|
||||
/dotnet-v6.0.103.tar.gz
|
||||
/dotnet-v6.0.104.tar.gz
|
||||
/dotnet-v6.0.105.tar.gz
|
||||
|
@ -183,19 +183,19 @@ fi
|
||||
# not-very-useful artifacts to reduce tarball size
|
||||
|
||||
# Binaries for gradle
|
||||
rm -r src/aspnetcore.*/src/SignalR/clients/java/signalr/gradle*
|
||||
rm -r src/aspnetcore/src/SignalR/clients/java/signalr/gradle*
|
||||
|
||||
# Unnecessary crypto implementation: IDEA
|
||||
rm -r src/runtime.*/src/tests/JIT/Performance/CodeQuality/Bytemark/
|
||||
rm -r src/runtime/src/tests/JIT/Performance/CodeQuality/Bytemark/
|
||||
|
||||
# https://github.com/dotnet/aspnetcore/issues/34785
|
||||
find src/aspnetcore.*/src -type d -name samples -print0 | xargs -0 rm -r
|
||||
find src/aspnetcore/src -type d -name samples -print0 | xargs -0 rm -r
|
||||
|
||||
# https://github.com/NuGet/Home/issues/11094
|
||||
rm -r src/nuget-client.*/test/EndToEnd
|
||||
rm -r src/nuget-client/test/EndToEnd
|
||||
|
||||
# https://github.com/Humanizr/sample-aspnetmvc/issues/1
|
||||
rm -r src/source-build.*/src/humanizer/samples/
|
||||
rm -r src/source-build/src/humanizer/samples/
|
||||
|
||||
popd
|
||||
|
||||
|
@ -20,10 +20,10 @@
|
||||
# until that's done, disable LTO. This has to happen before setting the flags below.
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
%global host_version 6.0.4
|
||||
%global runtime_version 6.0.4
|
||||
%global host_version 6.0.5
|
||||
%global runtime_version 6.0.5
|
||||
%global aspnetcore_runtime_version %{runtime_version}
|
||||
%global sdk_version 6.0.104
|
||||
%global sdk_version 6.0.105
|
||||
%global sdk_feature_band_version %(echo %{sdk_version} | 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 }')
|
||||
@ -60,7 +60,7 @@
|
||||
|
||||
Name: dotnet6.0
|
||||
Version: %{sdk_rpm_version}
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
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
|
||||
URL: https://github.com/dotnet/
|
||||
@ -214,10 +214,10 @@ Requires: dotnet-hostfxr-6.0%{?_isa} >= %{host_rpm_version}-%{release}
|
||||
# libicu is dlopen()ed
|
||||
Requires: libicu%{?_isa}
|
||||
|
||||
# See src/runtime.*/src/libraries/Native/AnyOS/brotli-version.txt
|
||||
# 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
|
||||
# See src/runtime/src/coreclr/pal/src/libunwind/libunwind-version.txt
|
||||
Provides: bundled(libunwind) = 1.5.rc1.28.g9165d2a1
|
||||
%endif
|
||||
|
||||
@ -376,32 +376,32 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages
|
||||
%endif
|
||||
|
||||
# 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
|
||||
|
||||
pushd src/runtime.*
|
||||
pushd src/runtime
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
popd
|
||||
|
||||
pushd src/fsharp.*
|
||||
pushd src/fsharp
|
||||
%patch500 -p1
|
||||
popd
|
||||
|
||||
pushd src/arcade.*
|
||||
pushd src/arcade
|
||||
%patch700 -p1
|
||||
popd
|
||||
|
||||
pushd src/roslyn.*
|
||||
pushd src/roslyn
|
||||
%patch800 -p3
|
||||
%patch801 -p1
|
||||
popd
|
||||
|
||||
pushd src/roslyn-analyzers.*
|
||||
pushd src/roslyn-analyzers
|
||||
%patch900 -p1
|
||||
popd
|
||||
|
||||
pushd src/msbuild.*
|
||||
pushd src/msbuild
|
||||
|
||||
# These are mono-specific fixes. Mono is only used on s390x. Restrict
|
||||
# patch to s390x to avoid potential risk in other architectures.
|
||||
@ -412,17 +412,17 @@ pushd src/msbuild.*
|
||||
|
||||
popd
|
||||
|
||||
pushd src/sdk.*
|
||||
pushd src/sdk
|
||||
%patch1500 -p1
|
||||
%patch1501 -p1
|
||||
popd
|
||||
|
||||
pushd src/installer.*
|
||||
pushd src/installer
|
||||
%patch1600 -p1
|
||||
popd
|
||||
|
||||
%if ! %{use_bundled_libunwind}
|
||||
sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime.*/eng/SourceBuild.props
|
||||
sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime/eng/SourceBuild.props
|
||||
%endif
|
||||
|
||||
%build
|
||||
@ -529,7 +529,7 @@ 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
|
||||
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
|
||||
@ -619,6 +619,10 @@ export COMPlus_LTTng=0
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed May 25 2022 Omair Majid <omajid@redhat.com> - 6.0.105-1
|
||||
- Update to .NET SDK 6.0.105 and Runtime 6.0.5
|
||||
- Resolves: RHBZ#2082266
|
||||
|
||||
* Sat Apr 30 2022 Omair Majid <omajid@redhat.com> - 6.0.104-1
|
||||
- Update to .NET SDK 6.0.104 and Runtime 6.0.4
|
||||
- Resolves: RHBZ#2078604
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (dotnet-v6.0.104.tar.gz) = 402aa1ae681a3bb61b35c9711ede2dd7bf51b27b535ffdb12b754116f9abf1288cf7f17a1203f6473acdbcb27937b31c193e9d63682b09544b05241d1b35d183
|
||||
SHA512 (dotnet-v6.0.105.tar.gz) = 5c3d392d0dce66e30505d8bbba07992f5c9b82c1c58bf9781615ea4d18e364f35df48e5c707d86242878258d70a75b66a33d5d3dd14f7e270cdf1a8c31870d3c
|
||||
|
@ -19,7 +19,7 @@
|
||||
run: dotnet turkey/Turkey.dll --version
|
||||
- regular:
|
||||
dir: ./
|
||||
run: dotnet turkey/Turkey.dll -l={{ remote_artifacts }} dotnet-regular-tests
|
||||
run: dotnet turkey/Turkey.dll -l={{ remote_artifacts }} dotnet-regular-tests --timeout=1500
|
||||
required_packages:
|
||||
- aspnetcore-runtime-6.0
|
||||
- bash-completion
|
||||
|
Loading…
Reference in New Issue
Block a user