diff --git a/.dotnet5.0.metadata b/.dotnet5.0.metadata index eedf59c..4dcc60b 100644 --- a/.dotnet5.0.metadata +++ b/.dotnet5.0.metadata @@ -1 +1 @@ -efcce335d7ac72c5d51b603732deac394f356463 SOURCES/dotnet-v5.0.100-preview4-SDK.tar.gz +8818892e9db5ed3f2bfb3c29b702a01e065b116b SOURCES/dotnet-v5.0.100-preview4-SDK.tar.gz diff --git a/SOURCES/runtime-39044-cmake-downgrade.patch b/SOURCES/runtime-39044-cmake-downgrade.patch index 71938d0..85a61ae 100644 --- a/SOURCES/runtime-39044-cmake-downgrade.patch +++ b/SOURCES/runtime-39044-cmake-downgrade.patch @@ -830,23 +830,6 @@ index 234dea19b75..d55dab3557f 100644 execute_process( COMMAND ${GENERATE_COMMAND} --dry-run -diff --git a/src/coreclr/src/pal/tests/palsuite/eventprovider/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/eventprovider/CMakeLists.txt -index 000ee2d2fb0..845fae656be 100644 ---- a/src/coreclr/src/pal/tests/palsuite/eventprovider/CMakeLists.txt -+++ b/src/coreclr/src/pal/tests/palsuite/eventprovider/CMakeLists.txt -@@ -5,10 +5,10 @@ set(SOURCES - set(EVENT_MANIFEST ${VM_DIR}/ClrEtwAll.man) - set(TEST_GENERATOR ${CLR_DIR}/src/scripts/genEventingTests.py) - --include(FindPython) -+include(FindPythonInterp) - - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/clralltestevents.cpp -- COMMAND ${Python_EXECUTABLE} ${TEST_GENERATOR} --testdir "${CMAKE_CURRENT_BINARY_DIR}" --man "${EVENT_MANIFEST}" -+ COMMAND ${PYTHON_EXECUTABLE} ${TEST_GENERATOR} --testdir "${CMAKE_CURRENT_BINARY_DIR}" --man "${EVENT_MANIFEST}" - DEPENDS ${EVENT_MANIFEST} ${TEST_GENERATOR} - COMMENT "Updating clralltestevents.cpp" - ) diff --git a/src/coreclr/src/unwinder/CMakeLists.txt b/src/coreclr/src/unwinder/CMakeLists.txt index 4421ea9f6f6..41a0219bbf7 100644 --- a/src/coreclr/src/unwinder/CMakeLists.txt @@ -1039,16 +1022,6 @@ index 1e94b575fd6..5d355f6adcb 100644 + +add_library(cee_wks INTERFACE) +target_sources(cee_wks INTERFACE $ ${VM_WKS_ARCH_ASM_OBJECTS}) -diff --git a/src/coreclr/tests/CMakeLists.txt b/src/coreclr/tests/CMakeLists.txt -index 53dbb85a58b..c5417cba7d0 100644 ---- a/src/coreclr/tests/CMakeLists.txt -+++ b/src/coreclr/tests/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.14.2) -+cmake_minimum_required(VERSION 3.6.2) - - cmake_policy(SET CMP0042 NEW) - project(Tests) diff --git a/src/installer/corehost/CMakeLists.txt b/src/installer/corehost/CMakeLists.txt index 43a59a1a695..dff0496cdd8 100644 --- a/src/installer/corehost/CMakeLists.txt diff --git a/SPECS/dotnet5.0.spec b/SPECS/dotnet5.0.spec index db44b65..81cc2bb 100644 --- a/SPECS/dotnet5.0.spec +++ b/SPECS/dotnet5.0.spec @@ -64,7 +64,7 @@ Name: dotnet5.0 Version: %{sdk_rpm_version} -Release: 0.2.preview4%{?dist} +Release: 0.3.preview4%{?dist} Summary: .NET Core 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/ @@ -508,6 +508,10 @@ echo "Testing build results for debug symbols..." %changelog +* Fri Aug 21 2020 Omair Majid - 5.0.100-0.3.preview4 +- Generate new source tarball with test files removed. +- Resolves: RHBZ#1835019 + * Thu Aug 06 2020 Omair Majid - 5.0.100-0.2.preview4 - Backport cmake compatiblity fix