diff --git a/.gitignore b/.gitignore index f0b91d5..5d5fb32 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v3.0.1-runtime.tar.gz +SOURCES/dotnet-v3.0.102.tar.gz diff --git a/.rh-dotnet30-dotnet.metadata b/.rh-dotnet30-dotnet.metadata index 43fef41..db3a005 100644 --- a/.rh-dotnet30-dotnet.metadata +++ b/.rh-dotnet30-dotnet.metadata @@ -1 +1 @@ -e6d068e0ebb04ff52beaa4b4fdf682f36e1503ce SOURCES/dotnet-v3.0.1-runtime.tar.gz +b306f41df14a5af15749994206351eff10eb4f4c SOURCES/dotnet-v3.0.102.tar.gz diff --git a/SOURCES/core-setup-fix-restore-sources.patch b/SOURCES/core-setup-fix-restore-sources.patch new file mode 100644 index 0000000..cd3170d --- /dev/null +++ b/SOURCES/core-setup-fix-restore-sources.patch @@ -0,0 +1,13 @@ +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 8ab8409..63f4730 100644 --- a/SOURCES/corefx-optflags-support.patch +++ b/SOURCES/corefx-optflags-support.patch @@ -1,3 +1,16 @@ +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/SPECS/dotnet.spec b/SPECS/dotnet.spec index 50953e6..8875f1d 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -26,10 +26,10 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.0.1 -%global runtime_version 3.0.1 +%global host_version 3.0.2 +%global runtime_version 3.0.2 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.0.101 +%global sdk_version 3.0.102 %global templates_version %{runtime_version} %global host_rpm_version %{host_version} @@ -55,20 +55,21 @@ Name: %{?scl_prefix}dotnet Version: %{sdk_rpm_version} -Release: 1%{?dist} +Release: 3%{?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%%{runtime_version}-runtime -Source0: dotnet-v%{runtime_version}-runtime.tar.gz +# ./build-dotnet-tarball dotnet-v%%{sdk_version} +Source0: dotnet-v%{sdk_version}.tar.gz Source1: check-debug-symbols.py Source2: dotnet.sh Patch100: corefx-optflags-support.patch Patch300: core-setup-do-not-strip.patch +Patch301: core-setup-fix-restore-sources.patch Patch500: cli-telemetry-optout.patch @@ -270,10 +271,10 @@ applications using the .NET Core SDK. %prep -%setup -q -n dotnet-v%{runtime_version}-runtime +%setup -q -n dotnet-v%{sdk_version} # Fix bad hardcoded path in build -sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp +sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj @@ -285,11 +286,12 @@ popd pushd src/coreclr.* popd -pushd src/core-setup.* +pushd src/dotnet-core-setup.* %patch300 -p1 +%patch301 -p1 popd -pushd src/cli.* +pushd src/dotnet-cli.* %patch500 -p1 popd @@ -344,6 +346,23 @@ 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 {} \; +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.0.0/data/PackageOverrides.txt +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.0.0/data/FrameworkList.xml +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.0.0/data/PlatformManifest.txt +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.0.1/ref/netcoreapp3.0/*.xml +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 +chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/apphost +chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/libnethost.so +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/nethost.h # Add ~/.dotnet/tools to $PATH for all users install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/ @@ -351,7 +370,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/cli.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet +install src/dotnet-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 @@ -420,6 +439,18 @@ echo "Testing build results for debug symbols..." %dir %{_libdir}/dotnet/packs %changelog +* Wed Jan 15 2020 Omair Majid - 3.0.102-3 +- Prevent prebuilts from leaking into the final SDK +- Resolves: RHBZ#1787151 + +* Tue Dec 31 2019 Omair Majid - 3.0.102-2 +- Fix strange file permissions on some files +- Resolves: RHBZ#1787151 + +* Tue Dec 31 2019 Omair Majid - 3.0.102-1 +- Update to .NET Core Runtime 3.0.2 and SDK 3.0.102 +- Resolves: RHBZ#1787151 + * Thu Nov 14 2019 Omair Majid - 3.0.101-1 - Update to .NET Core Runtime 3.0.1 and SDK 3.0.101 - Resolves: RHBZ#1772600