diff --git a/.gitignore b/.gitignore index 5d5fb32..2f88474 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v3.0.102.tar.gz +SOURCES/dotnet-v3.0.103-SDK.tar.gz diff --git a/.rh-dotnet30-dotnet.metadata b/.rh-dotnet30-dotnet.metadata index db3a005..5f8191c 100644 --- a/.rh-dotnet30-dotnet.metadata +++ b/.rh-dotnet30-dotnet.metadata @@ -1 +1 @@ -b306f41df14a5af15749994206351eff10eb4f4c SOURCES/dotnet-v3.0.102.tar.gz +b3708e4d2122ab561bbb028b9bf893611e1a1168 SOURCES/dotnet-v3.0.103-SDK.tar.gz diff --git a/SOURCES/core-setup-fix-restore-sources.patch b/SOURCES/core-setup-fix-restore-sources.patch deleted file mode 100644 index cd3170d..0000000 --- a/SOURCES/core-setup-fix-restore-sources.patch +++ /dev/null @@ -1,13 +0,0 @@ -Prevent prebuilts from ending up in the sharedframework - ---- a/src/pkg/packaging-tools/framework.sharedfx.props -+++ b/src/pkg/packaging-tools/framework.sharedfx.props -@@ -26,8 +26,6 @@ - false - - $(ProjectDir)NuGet.config -- -- $(PackagesDir) - - false - diff --git a/SOURCES/corefx-optflags-support.patch b/SOURCES/corefx-optflags-support.patch index 63f4730..8ab8409 100644 --- a/SOURCES/corefx-optflags-support.patch +++ b/SOURCES/corefx-optflags-support.patch @@ -1,16 +1,3 @@ -diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt -index 7d804a1e54..717c2718d7 100644 ---- a/src/Native/Unix/CMakeLists.txt -+++ b/src/Native/Unix/CMakeLists.txt -@@ -25,7 +25,7 @@ add_compile_options(-fPIC) - add_compile_options(-Wthread-safety) - add_compile_options(-Wno-thread-safety-analysis) - endif() --add_compile_options(-Werror) -+add_compile_options(-Wno-unused-result) - - if(CMAKE_SYSTEM_NAME STREQUAL Emscripten) - set(CLR_CMAKE_PLATFORM_WASM 1) diff --git a/src/Native/Unix/configure.cmake b/src/Native/Unix/configure.cmake index f4a30ad6cb..f2db68402a 100644 --- a/src/Native/Unix/configure.cmake diff --git a/SOURCES/shared-compilation.patch b/SOURCES/shared-compilation.patch new file mode 100644 index 0000000..c71250c --- /dev/null +++ b/SOURCES/shared-compilation.patch @@ -0,0 +1,10 @@ +--- a/repos/corefx.proj ++++ b/repos/corefx.proj +@@ -34,6 +34,7 @@ + $(BuildArguments) /p:DotNetSourceBuildIntermediatePath=$(GeneratedSourcePathOffline) + $(BuildArguments) /p:MicrosoftNETCoreDotNetHostPackageVersion=$(coresetupOutputPackageVersion) + $(BuildArguments) /p:MicrosoftNETCoreDotNetHostPolicyPackageVersion=$(coresetupOutputPackageVersion) ++ $(BuildArguments) /p:UseSharedCompilation=false + + true + $(BuildArguments) $(FlagParameterPrefix)verbosity $(LogVerbosity) diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index 8875f1d..6818af4 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -26,11 +26,11 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.0.2 -%global runtime_version 3.0.2 +%global host_version 3.0.3 +%global runtime_version 3.0.3 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.0.102 -%global templates_version %{runtime_version} +%global sdk_version 3.0.103 +%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} %global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version} @@ -55,21 +55,22 @@ Name: %{?scl_prefix}dotnet Version: %{sdk_rpm_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD URL: https://github.com/dotnet/ # The source is generated on a dev box via: -# ./build-dotnet-tarball dotnet-v%%{sdk_version} -Source0: dotnet-v%{sdk_version}.tar.gz +# ./build-dotnet-tarball v%%{sdk_version} +Source0: dotnet-v%{sdk_version}-SDK.tar.gz Source1: check-debug-symbols.py Source2: dotnet.sh +Patch1: shared-compilation.patch + Patch100: corefx-optflags-support.patch Patch300: core-setup-do-not-strip.patch -Patch301: core-setup-fix-restore-sources.patch Patch500: cli-telemetry-optout.patch @@ -271,14 +272,16 @@ applications using the .NET Core SDK. %prep -%setup -q -n dotnet-v%{sdk_version} +%setup -q -n dotnet-v%{sdk_version}-SDK # Fix bad hardcoded path in build -sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp +sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj +%patch1 -p1 + pushd src/corefx.* %patch100 -p1 popd @@ -286,12 +289,11 @@ popd pushd src/coreclr.* popd -pushd src/dotnet-core-setup.* +pushd src/core-setup.* %patch300 -p1 -%patch301 -p1 popd -pushd src/dotnet-cli.* +pushd src/cli.* %patch500 -p1 popd @@ -353,10 +355,6 @@ chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0 chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/data/PackageOverrides.txt chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/data/FrameworkList.xml chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/data/PlatformManifest.txt -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/Microsoft.AspNetCore.App.Ref/3.0.1/Debug/netstandard2.0/Microsoft.AspNetCore.App.Ref.assets.cache -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/obj/Microsoft.AspNetCore.App.Ref.csproj.nuget.cache -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/obj/Microsoft.AspNetCore.App.Ref.csproj.nuget.dgspec.json -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/obj/project.assets.json chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/PackageOverrides.txt chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/FrameworkList.xml chmod 0755 %{buildroot}/%{_libdir}/dotnet/sdk/%{sdk_version}/AppHostTemplate/apphost @@ -370,7 +368,7 @@ install %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/ install -dm 0755 %{buildroot}/%{_root_datadir}/bash-completion/completions # dynamic completion needs the file to be named the same as the base command -install src/dotnet-cli.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet +install src/cli.*/scripts/register-completions.bash %{buildroot}/%{_root_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 @@ -439,6 +437,10 @@ echo "Testing build results for debug symbols..." %dir %{_libdir}/dotnet/packs %changelog +* Sun Mar 08 2020 Omair Majid - 3.0.103-1 +- Update to .NET Core SDK 3.0.103 and Runtime 3.0.3 +- Resolves: RHBZ#1806657 + * Wed Jan 15 2020 Omair Majid - 3.0.102-3 - Prevent prebuilts from leaking into the final SDK - Resolves: RHBZ#1787151