diff --git a/README.md b/README.md index 816aba3..4d4fb58 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Overview -This is the .NET Core 3.1 package for Fedora. +This is the .NET Core 5.0 package for Fedora. This package is maintained by the Fedora DotNet SIG (Special Interest Group). You can find out more about the DotNet SIG at: @@ -10,7 +10,7 @@ Group). You can find out more about the DotNet SIG at: - https://lists.fedoraproject.org/archives/list/dotnet-sig@lists.fedoraproject.org/ Please report any issues [using -bugzilla](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=dotnet3.1). +bugzilla](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=dotnet5.0). # Specification @@ -27,8 +27,8 @@ with one exception. It installs dotnet to `/usr/lib64/dotnet` (aka 2. Checkout the forked repository. - - `git clone ssh://$USER@pkgs.fedoraproject.org/forks/$USER/rpms/dotnet3.1.git` - - `cd dotnet3.1` + - `git clone ssh://$USER@pkgs.fedoraproject.org/forks/$USER/rpms/dotnet5.0.git` + - `cd dotnet5.0` 3. Make your changes. Don't forget to add a changelog. @@ -71,8 +71,8 @@ with one exception. It installs dotnet to `/usr/lib64/dotnet` (aka 2. Checkout the forked repository. - - `git clone ssh://$USER@pkgs.fedoraproject.org/forks/$USER/rpms/dotnet3.1.git` - - `cd dotnet3.1` + - `git clone ssh://$USER@pkgs.fedoraproject.org/forks/$USER/rpms/dotnet5.0.git` + - `cd dotnet5.0` 3. Build the new upstream source tarball. Update the versions in the spec file. Add a changelog. This is generally automated by the diff --git a/build-bootstrap-tarball b/build-bootstrap-tarball new file mode 100755 index 0000000..d3f3547 --- /dev/null +++ b/build-bootstrap-tarball @@ -0,0 +1,50 @@ +#!/bin/bash + +set -euo pipefail + +set -x + +sdk_version=3.1.105 + +arch=$(uname -m) +if [[ $arch == "x86_64" ]]; then + arch=x64 +elif [[ $arch == "aarch64" ]]; then + arch=arm64 +fi + +if rpm -qa | grep libunwind; then + echo "error: libunwind is installed. Not a good idea for bootstrapping." + exit 1 +fi +if rpm -qa | grep dotnet ; then + echo "error: dotnet is installed. Not a good idea for bootstrapping." + exit 1 +fi +if [ -d /usr/lib/dotnet ] || [ -d /usr/lib64/dotnet ] || [ -d /usr/share/dotnet ] ; then + echo "error: one of /usr/lib/dotnet /usr/lib64/dotnet or /usr/share/dotnet/ exists. Not a good idea for bootstrapping." + exit 1 +fi +if command -v dotnet ; then + echo "error: dotnet is in $PATH. Not a good idea for bootstrapping." + exit 1 +fi + +if [ ! -d dotnet-source-build-tarball ]; then + if [ ! -d source-build ]; then + git clone https://github.com/dotnet/source-build + fi + pushd source-build + sed -i -e 's|cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE||' repos/coreclr.common.props + git clean -xdf + ./build-source-tarball.sh ../dotnet-source-build-tarball/ -- -p:DownloadSourceBuildReferencePackagesTimeoutSeconds=100000 + popd +fi + +rm -rf dotnet-v${sdk_version}-SDK dotnet-v${sdk_version}-SDK.tar.gz + +cp -a dotnet-source-build-tarball dotnet-v${sdk_version}-SDK +cp -a source-build/artifacts/$arch/Release/Private.SourceBuilt.Artifacts.*.tar.gz dotnet-v${sdk_version}-SDK/packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz + +tar czf dotnet-v${sdk_version}-SDK-$arch.tar.gz dotnet-v${sdk_version}-SDK + diff --git a/build-coreclr-clang10.patch b/build-coreclr-clang10.patch deleted file mode 100644 index 3b13cb1..0000000 --- a/build-coreclr-clang10.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/configurecompiler.cmake b/configurecompiler.cmake -index d769e82f57..4936c8b00d 100644 ---- a/configurecompiler.cmake -+++ b/configurecompiler.cmake -@@ -474,6 +474,7 @@ if (CLR_CMAKE_PLATFORM_UNIX) - add_compile_options(-Wno-unused-variable) - add_compile_options(-Wno-unused-value) - add_compile_options(-Wno-unused-function) -+ add_compile_options(-Wno-error=misleading-indentation) - - #These seem to indicate real issues - add_compile_options($<$:-Wno-invalid-offsetof>) -diff --git a/src/inc/slist.h b/src/inc/slist.h -index f05d763dc6..abebe04d47 100644 ---- a/src/inc/slist.h -+++ b/src/inc/slist.h -@@ -160,13 +160,13 @@ public: - void Init() - { - LIMITED_METHOD_CONTRACT; -- m_pHead = &m_link; -+ m_pHead = PTR_SLink(&m_link); - // NOTE :: fHead variable is template argument - // the following code is a compiled in, only if the fHead flag - // is set to false, - if (!fHead) - { -- m_pTail = &m_link; -+ m_pTail = PTR_SLink(&m_link); - } - } - -@@ -274,7 +274,7 @@ public: - SLink *ret = SLink::FindAndRemove(m_pHead, GetLink(pObj), &prior); - - if (ret == m_pTail) -- m_pTail = prior; -+ m_pTail = PTR_SLink(prior); - - return GetObject(ret); - } -diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h -index 08a35c8f62..43eb648a14 100644 ---- a/src/pal/inc/pal.h -+++ b/src/pal/inc/pal.h -@@ -145,7 +145,7 @@ typedef PVOID NATIVE_LIBRARY_HANDLE; - - /******************* Compiler-specific glue *******************************/ - #ifndef THROW_DECL --#if defined(_MSC_VER) || defined(__llvm__) || !defined(__cplusplus) -+#if defined(_MSC_VER) || !defined(__cplusplus) - #define THROW_DECL - #else - #define THROW_DECL throw() diff --git a/build-dotnet-tarball b/build-dotnet-tarball index 3314c7e..f32d847 100755 --- a/build-dotnet-tarball +++ b/build-dotnet-tarball @@ -91,14 +91,10 @@ if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then git checkout "${tag}" git submodule update --init --recursive clean_dotnet_cache - sed -i -e 's|cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE||' repos/coreclr.proj - mkdir -p patches/coreclr/ - cp ../../build-coreclr-clang10.patch patches/coreclr - mkdir -p patches/corefx/ - cp ../../corefx-42900-clang-10.patch patches/corefx - cp -r /usr/lib64/dotnet "${temp_dir}" - ./build.sh --with-sdk ../dotnet /p:ArchiveDownloadedPackages=true - ./build-source-tarball.sh "${unmodified_tarball_name}" --skip-build --with-sdk ../dotnet + sed -i -e 's|cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE||' repos/runtime.common.props + # FIXME remove contineuonprebuilterror + ./build.sh -p:SkipPrebuiltEnforcement=true -p:ContinueOnPrebuiltBaselineError=true -p:ArchiveDownloadedPackages=true + ./build-source-tarball.sh "${unmodified_tarball_name}" --skip-build -- -p:ContinueOnPrebuiltBaselineError=true -p:SkipPrebuiltEnforcement=true popd popd @@ -114,11 +110,12 @@ mv "${unmodified_tarball_name}" "${tarball_name}" pushd "${tarball_name}" # Remove files with funny licenses, crypto implementations and other # not-very-useful artifacts to reduce tarball size +rm -rf .dotnet find -type f -iname '*.tar.gz' -delete -rm -r src/aspnetcore.*/src/SignalR/clients/java/signalr/gradle* -find src/aspnetcore.*/src -type d -name samples -print0 | xargs -0 rm -r +rm -r src/AspNetCore.*/src/SignalR/clients/java/signalr/gradle* +find src/AspNetCore.*/src -type d -name samples -print0 | xargs -0 rm -r rm -r src/NuGet.Client.*/test/EndToEnd/ProjectTemplates/NetCoreWebApplication1.0.zip -find src/coreclr.*/ -depth -name tests -print0 | xargs -0 rm -r +find src/runtime.*/ -depth -name tests -print0 | xargs -0 rm -r popd tar czf "${tarball_name}.tar.gz" "${tarball_name}" diff --git a/copr-build b/copr-build new file mode 100755 index 0000000..8a7cf46 --- /dev/null +++ b/copr-build @@ -0,0 +1,11 @@ +#!/bin/bash + +set -euo pipefail + +set -x + +fedpkg --release f32 srpm 2>&1 | tee fedpkg.output + +srpm_name=$(grep 'Wrote: ' fedpkg.output | cut -d' ' -f 2) + +copr-cli build @dotnet-sig/dotnet-preview "${srpm_name}" diff --git a/core-setup-hardening-flags.patch b/core-setup-hardening-flags.patch deleted file mode 100644 index 3f6b91c..0000000 --- a/core-setup-hardening-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/settings.cmake b/src/settings.cmake ---- a/src/settings.cmake -+++ b/src/settings.cmake -@@ -218,6 +218,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id=sha1") -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") - add_compile_options(-fstack-protector-strong) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - add_compile_options(-fstack-protector) diff --git a/coreclr-hardening-flags.patch b/coreclr-hardening-flags.patch deleted file mode 100644 index d58d735..0000000 --- a/coreclr-hardening-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/debug/createdump/CMakeLists.txt b/src/debug/createdump/CMakeLists.txt ---- a/src/debug/createdump/CMakeLists.txt -+++ b/src/debug/createdump/CMakeLists.txt -@@ -21,6 +21,7 @@ include_directories(BEFORE ${VM_DIR}) - add_definitions(-DPAL_STDCPP_COMPAT) - - add_compile_options(-fPIE) -+add_link_options(-pie) - - set(CREATEDUMP_SOURCES - createdump.cpp diff --git a/corefx-39633-cgroupv2-mountpoints.patch b/corefx-39633-cgroupv2-mountpoints.patch deleted file mode 100644 index 34fbecb..0000000 --- a/corefx-39633-cgroupv2-mountpoints.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1864630f762160e1cb439362cc0577471624192a Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Fri, 19 Jul 2019 19:18:51 -0400 -Subject: [PATCH] Fix up cgroup2fs in Interop.MountPoints.FormatInfo - -`stat -fc %T /sys/fs/cgroup` calls this file system `cgroup2fs` - -Add the cgroup2fs file system magic number. Available from: - - - https://www.kernel.org/doc/Documentation/cgroup-v2.txt - - man 2 statfs - -Move cgroup2fs next to cgroupfs in the drive type list, since it is also -DriveType.Ram. ---- - .../Unix/System.Native/Interop.MountPoints.FormatInfo.cs | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs -index af38a2285ba2..4240bd4853ab 100644 ---- a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs -+++ b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs -@@ -47,6 +47,7 @@ internal enum UnixFileSystemTypes : long - btrfs = 0x9123683E, - ceph = 0x00C36400, - cgroupfs = 0x0027E0EB, -+ cgroup2fs = 0x63677270, - cifs = 0xFF534D42, - coda = 0x73757245, - coherent = 0x012FF7B7, -@@ -231,7 +232,6 @@ private static DriveType GetDriveType(string fileSystemName) - case "bpf_fs": - case "btrfs": - case "btrfs_test": -- case "cgroup2fs": - case "coh": - case "daxfs": - case "drvfs": -@@ -384,6 +384,7 @@ private static DriveType GetDriveType(string fileSystemName) - case "binfmt_misc": - case "cgroup": - case "cgroupfs": -+ case "cgroup2fs": - case "configfs": - case "cramfs": - case "cramfs-wend": diff --git a/corefx-39686-cgroupv2-01.patch b/corefx-39686-cgroupv2-01.patch deleted file mode 100644 index e7628e2..0000000 --- a/corefx-39686-cgroupv2-01.patch +++ /dev/null @@ -1,391 +0,0 @@ -From 2b2273ea4ea1c28472fa0d6ad2ffeb6374500550 Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Wed, 23 Oct 2019 17:45:59 -0400 -Subject: [PATCH 1/2] Add cgroup v2 support to Interop.cgroups - -Fix up code to adjust cgroup v1 assumptions and check cgroup v2 paths, -locations and values. - -Continue using the older cgroup v1 terminology for APIs. ---- - .../Interop/Linux/cgroups/Interop.cgroups.cs | 116 ++++++++++++++---- - src/Common/tests/Common.Tests.csproj | 4 + - .../tests/Tests/Interop/cgroupsTests.cs | 107 ++++++++++++++++ - .../tests/DescriptionNameTests.cs | 2 +- - 4 files changed, 206 insertions(+), 23 deletions(-) - create mode 100644 src/Common/tests/Tests/Interop/cgroupsTests.cs - -diff --git a/src/Common/src/Interop/Linux/cgroups/Interop.cgroups.cs b/src/Common/src/Interop/Linux/cgroups/Interop.cgroups.cs -index 0ffd4d7b7c03..186fe0516c5b 100644 ---- a/src/Common/src/Interop/Linux/cgroups/Interop.cgroups.cs -+++ b/src/Common/src/Interop/Linux/cgroups/Interop.cgroups.cs -@@ -9,17 +9,22 @@ - - internal static partial class Interop - { -+ /// Provides access to some cgroup (v1 and v2) features - internal static partial class cgroups - { -+ // For cgroup v1, see https://www.kernel.org/doc/Documentation/cgroup-v1/ -+ // For cgroup v2, see https://www.kernel.org/doc/Documentation/cgroup-v2.txt -+ -+ /// The version of cgroup that's being used -+ internal enum CGroupVersion { None, CGroup1, CGroup2 }; -+ - /// Path to mountinfo file in procfs for the current process. - private const string ProcMountInfoFilePath = "/proc/self/mountinfo"; - /// Path to cgroup directory in procfs for the current process. - private const string ProcCGroupFilePath = "/proc/self/cgroup"; - -- /// Path to the found cgroup location, or null if it couldn't be found. -- internal static readonly string s_cgroupMemoryPath = FindCGroupPath("memory"); -- /// Path to the found cgroup memory limit_in_bytes path, or null if it couldn't be found. -- private static readonly string s_cgroupMemoryLimitPath = s_cgroupMemoryPath != null ? s_cgroupMemoryPath + "/memory.limit_in_bytes" : null; -+ /// Path to the found cgroup memory limit path, or null if it couldn't be found. -+ internal static readonly string s_cgroupMemoryLimitPath = FindCGroupMemoryLimitPath(); - - /// Tries to read the memory limit from the cgroup memory location. - /// The read limit, or 0 if it couldn't be read. -@@ -42,7 +47,7 @@ public static bool TryGetMemoryLimit(out ulong limit) - /// The path to the file to parse. - /// The parsed result, or 0 if it couldn't be parsed. - /// true if the value was read successfully; otherwise, false. -- private static bool TryReadMemoryValueFromFile(string path, out ulong result) -+ internal static bool TryReadMemoryValueFromFile(string path, out ulong result) - { - if (File.Exists(path)) - { -@@ -79,6 +84,11 @@ private static bool TryReadMemoryValueFromFile(string path, out ulong result) - result = checked(ulongValue * multiplier); - return true; - } -+ -+ // 'max' is also a possible valid value -+ // -+ // Treat this as 'no memory limit' and let the caller -+ // fallback to reading the real limit via other means - } - catch (Exception e) - { -@@ -90,12 +100,35 @@ private static bool TryReadMemoryValueFromFile(string path, out ulong result) - return false; - } - -+ /// Find the cgroup memory limit path. -+ /// The limit path if found; otherwise, null. -+ private static string FindCGroupMemoryLimitPath() -+ { -+ string cgroupMemoryPath = FindCGroupPath("memory", out CGroupVersion version); -+ if (cgroupMemoryPath != null) -+ { -+ if (version == CGroupVersion.CGroup1) -+ { -+ return cgroupMemoryPath + "/memory.limit_in_bytes"; -+ } -+ -+ if (version == CGroupVersion.CGroup2) -+ { -+ // 'memory.high' is a soft limit; the process may get throttled -+ // 'memory.max' is where OOM killer kicks in -+ return cgroupMemoryPath + "/memory.max"; -+ } -+ } -+ -+ return null; -+ } -+ - /// Find the cgroup path for the specified subsystem. - /// The subsystem, e.g. "memory". - /// The cgroup path if found; otherwise, null. -- private static string FindCGroupPath(string subsystem) -+ private static string FindCGroupPath(string subsystem, out CGroupVersion version) - { -- if (TryFindHierarchyMount(subsystem, out string hierarchyRoot, out string hierarchyMount) && -+ if (TryFindHierarchyMount(subsystem, out version, out string hierarchyRoot, out string hierarchyMount) && - TryFindCGroupPathForSubsystem(subsystem, out string cgroupPathRelativeToMount)) - { - // For a host cgroup, we need to append the relative path. -@@ -113,19 +146,24 @@ private static string FindCGroupPath(string subsystem) - /// The path of the directory in the filesystem which forms the root of this mount; null if not found. - /// The path of the mount point relative to the process's root directory; null if not found. - /// true if the mount was found; otherwise, null. -- private static bool TryFindHierarchyMount(string subsystem, out string root, out string path) -+ private static bool TryFindHierarchyMount(string subsystem, out CGroupVersion version, out string root, out string path) - { -- if (File.Exists(ProcMountInfoFilePath)) -+ return TryFindHierarchyMount(ProcMountInfoFilePath, subsystem, out version, out root, out path); -+ } -+ -+ internal static bool TryFindHierarchyMount(string mountInfoFilePath, string subsystem, out CGroupVersion version, out string root, out string path) -+ { -+ if (File.Exists(mountInfoFilePath)) - { - try - { -- using (var reader = new StreamReader(ProcMountInfoFilePath)) -+ using (var reader = new StreamReader(mountInfoFilePath)) - { - string line; - while ((line = reader.ReadLine()) != null) - { - // Look for an entry that has cgroup as the "filesystem type" -- // and that has options containing the specified subsystem. -+ // and, for cgroup1, that has options containing the specified subsystem - // See man page for /proc/[pid]/mountinfo for details, e.g.: - // (1)(2)(3) (4) (5) (6) (7) (8) (9) (10) (11) - // 36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw,errors=continue -@@ -148,17 +186,35 @@ private static bool TryFindHierarchyMount(string subsystem, out string root, out - continue; - } - -- if (postSeparatorlineParts[0] != "cgroup" || -- Array.IndexOf(postSeparatorlineParts[2].Split(','), subsystem) < 0) -+ bool validCGroup1Entry = ((postSeparatorlineParts[0] == "cgroup") && -+ (Array.IndexOf(postSeparatorlineParts[2].Split(','), subsystem) >= 0)); -+ bool validCGroup2Entry = postSeparatorlineParts[0] == "cgroup2"; -+ -+ if (!validCGroup1Entry && !validCGroup2Entry) - { - // Not the relevant entry. - continue; - } - -- // Found the relevant entry. Extract the mount root and path. -+ // Found the relevant entry. Extract the cgroup version, mount root and path. -+ switch (postSeparatorlineParts[0]) -+ { -+ case "cgroup": -+ version = CGroupVersion.CGroup1; -+ break; -+ case "cgroup2": -+ version = CGroupVersion.CGroup2; -+ break; -+ default: -+ version = CGroupVersion.None; -+ Debug.Fail($"invalid value for CGroupVersion \"{postSeparatorlineParts[0]}\""); -+ break; -+ } -+ - string[] lineParts = line.Substring(0, endOfOptionalFields).Split(' '); - root = lineParts[3]; - path = lineParts[4]; -+ - return true; - } - } -@@ -169,6 +225,7 @@ private static bool TryFindHierarchyMount(string subsystem, out string root, out - } - } - -+ version = CGroupVersion.None; - root = null; - path = null; - return false; -@@ -180,27 +237,42 @@ private static bool TryFindHierarchyMount(string subsystem, out string root, out - /// - private static bool TryFindCGroupPathForSubsystem(string subsystem, out string path) - { -- if (File.Exists(ProcCGroupFilePath)) -+ return TryFindCGroupPathForSubsystem(ProcCGroupFilePath, subsystem, out path); -+ } -+ -+ internal static bool TryFindCGroupPathForSubsystem(string procCGroupFilePath, string subsystem, out string path) -+ { -+ if (File.Exists(procCGroupFilePath)) - { - try - { -- using (var reader = new StreamReader(ProcCGroupFilePath)) -+ using (var reader = new StreamReader(procCGroupFilePath)) - { - string line; - while ((line = reader.ReadLine()) != null) - { -- // Find the first entry that has the subsystem listed in its controller -- // list. See man page for cgroups for /proc/[pid]/cgroups format, e.g: -- // hierarchy-ID:controller-list:cgroup-path -- // 5:cpuacct,cpu,cpuset:/daemons -- - string[] lineParts = line.Split(':'); -+ - if (lineParts.Length != 3) - { - // Malformed line. - continue; - } - -+ // cgroup v2: Find the first entry that matches the cgroup v2 hierarchy: -+ // 0::$PATH -+ -+ if ((lineParts[0] == "0") && (string.Empty == lineParts[1])) -+ { -+ path = lineParts[2]; -+ return true; -+ } -+ -+ // cgroup v1: Find the first entry that has the subsystem listed in its controller -+ // list. See man page for cgroups for /proc/[pid]/cgroups format, e.g: -+ // hierarchy-ID:controller-list:cgroup-path -+ // 5:cpuacct,cpu,cpuset:/daemons -+ - if (Array.IndexOf(lineParts[1].Split(','), subsystem) < 0) - { - // Not the relevant entry. -@@ -214,7 +286,7 @@ private static bool TryFindCGroupPathForSubsystem(string subsystem, out string p - } - catch (Exception e) - { -- Debug.Fail($"Failed to read or parse \"{ProcMountInfoFilePath}\": {e}"); -+ Debug.Fail($"Failed to read or parse \"{procCGroupFilePath}\": {e}"); - } - } - -diff --git a/src/Common/tests/Common.Tests.csproj b/src/Common/tests/Common.Tests.csproj -index a189d856348b..979c8dd7fbe6 100644 ---- a/src/Common/tests/Common.Tests.csproj -+++ b/src/Common/tests/Common.Tests.csproj -@@ -12,6 +12,9 @@ - - Common\System\Security\Cryptography\ByteUtils.cs - -+ -+ Common\Interop\Linux\cgroups\Interop.cgroups.cs -+ - - Common\Interop\Linux\procfs\Interop.ProcFsStat.cs - -@@ -69,6 +72,7 @@ - - Common\CoreLib\System\PasteArguments.cs - -+ - - - -diff --git a/src/Common/tests/Tests/Interop/cgroupsTests.cs b/src/Common/tests/Tests/Interop/cgroupsTests.cs -new file mode 100644 -index 000000000000..f16d9242879c ---- /dev/null -+++ b/src/Common/tests/Tests/Interop/cgroupsTests.cs -@@ -0,0 +1,107 @@ -+// Licensed to the .NET Foundation under one or more agreements. -+// The .NET Foundation licenses this file to you under the MIT license. -+// See the LICENSE file in the project root for more information. -+ -+using System; -+using System.IO; -+using System.Text; -+using Xunit; -+ -+namespace Common.Tests -+{ -+ public class cgroupsTests -+ { -+ [Theory] -+ [InlineData(true, "0", 0)] -+ [InlineData(false, "max", 0)] -+ [InlineData(true, "1k", 1024)] -+ [InlineData(true, "1K", 1024)] -+ public static void ValidateTryReadMemoryValue(bool expectedResult, string valueText, ulong expectedValue) -+ { -+ string path = Path.GetTempFileName(); -+ try -+ { -+ File.WriteAllText(path, valueText); -+ -+ bool result = Interop.cgroups.TryReadMemoryValueFromFile(path, out ulong val); -+ -+ Assert.Equal(expectedResult, result); -+ if (result) -+ { -+ Assert.Equal(expectedValue, val); -+ } -+ } -+ finally -+ { -+ File.Delete(path); -+ } -+ } -+ -+ [Theory] -+ [InlineData(false, "0 0 0:0 / /foo ignore ignore - overlay overlay ignore", "ignore", 0, "/", "/")] -+ [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup2 cgroup2 ignore", "ignore", 2, "/", "/foo")] -+ [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup2 cgroup2 ignore", "memory", 2, "/", "/foo")] -+ [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup2 cgroup2 ignore", "cpu", 2, "/", "/foo")] -+ [InlineData(true, "0 0 0:0 / /foo ignore - cgroup2 cgroup2 ignore", "cpu", 2, "/", "/foo")] -+ [InlineData(true, "0 0 0:0 / /foo ignore ignore ignore - cgroup2 cgroup2 ignore", "cpu", 2, "/", "/foo")] -+ [InlineData(true, "0 0 0:0 / /foo-with-dashes ignore ignore - cgroup2 cgroup2 ignore", "ignore", 2, "/", "/foo-with-dashes")] -+ [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup cgroup memory", "memory", 1, "/", "/foo")] -+ [InlineData(true, "0 0 0:0 / /foo-with-dashes ignore ignore - cgroup cgroup memory", "memory", 1, "/", "/foo-with-dashes")] -+ [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup cgroup cpu,memory", "memory", 1, "/", "/foo")] -+ [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup cgroup memory,cpu", "memory", 1, "/", "/foo")] -+ [InlineData(false, "0 0 0:0 / /foo ignore ignore - cgroup cgroup cpu", "memory", 0, "/", "/foo")] -+ public static void ParseValidateMountInfo(bool found, string procSelfMountInfoText, string subsystem, int expectedVersion, string expectedRoot, string expectedMount) -+ { -+ string path = Path.GetTempFileName(); -+ try -+ { -+ File.WriteAllText(path, procSelfMountInfoText); -+ -+ bool result = Interop.cgroups.TryFindHierarchyMount(path, subsystem, out Interop.cgroups.CGroupVersion version, out string root, out string mount); -+ -+ Assert.Equal(found, result); -+ if (found) -+ { -+ Assert.Equal(expectedVersion, (int)version); -+ Assert.Equal(expectedRoot, root); -+ Assert.Equal(expectedMount, mount); -+ } -+ } -+ finally -+ { -+ File.Delete(path); -+ } -+ } -+ -+ [Theory] -+ [InlineData(true, "0::/foo", "ignore", "/foo")] -+ [InlineData(true, "0::/bar", "ignore", "/bar")] -+ [InlineData(true, "0::frob", "ignore", "frob")] -+ [InlineData(false, "1::frob", "ignore", "ignore")] -+ [InlineData(true, "1:foo:bar", "foo", "bar")] -+ [InlineData(true, "2:foo:bar", "foo", "bar")] -+ [InlineData(false, "2:foo:bar", "bar", "ignore")] -+ [InlineData(true, "1:foo:bar\n2:eggs:spam", "foo", "bar")] -+ [InlineData(true, "1:foo:bar\n2:eggs:spam", "eggs", "spam")] -+ public static void ParseValidateProcCGroup(bool found, string procSelfCgroupText, string subsystem, string expectedMountPath) -+ { -+ string path = Path.GetTempFileName(); -+ try -+ { -+ File.WriteAllText(path, procSelfCgroupText); -+ -+ bool result = Interop.cgroups.TryFindCGroupPathForSubsystem(path, subsystem, out string mountPath); -+ -+ Assert.Equal(found, result); -+ if (found) -+ { -+ Assert.Equal(expectedMountPath, mountPath); -+ } -+ } -+ finally -+ { -+ File.Delete(path); -+ } -+ } -+ } -+} -diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs b/src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs -index 910af2fd82b4..73f692898dbc 100644 ---- a/src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs -+++ b/src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs -@@ -40,7 +40,7 @@ public void DumpRuntimeInformationToConsole() - - Console.WriteLine($"### CURRENT DIRECTORY: {Environment.CurrentDirectory}"); - -- string cgroupsLocation = Interop.cgroups.s_cgroupMemoryPath; -+ string cgroupsLocation = Interop.cgroups.s_cgroupMemoryLimitPath; - if (cgroupsLocation != null) - { - Console.WriteLine($"### CGROUPS MEMORY: {cgroupsLocation}"); - diff --git a/corefx-39686-cgroupv2-02.patch b/corefx-39686-cgroupv2-02.patch deleted file mode 100644 index 88dcd99..0000000 --- a/corefx-39686-cgroupv2-02.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 9a8c5e4014ffca8aff70808cc0e50a403d38c292 Mon Sep 17 00:00:00 2001 -From: Stephen Toub -Date: Wed, 23 Oct 2019 20:35:49 -0400 -Subject: [PATCH 2/2] Clean up new tests - ---- - .../tests/Tests/Interop/cgroupsTests.cs | 79 ++++++------------- - 1 file changed, 25 insertions(+), 54 deletions(-) - -diff --git a/src/Common/tests/Tests/Interop/cgroupsTests.cs b/src/Common/tests/Tests/Interop/cgroupsTests.cs -index f16d9242879c..fc6ab5c9753c 100644 ---- a/src/Common/tests/Tests/Interop/cgroupsTests.cs -+++ b/src/Common/tests/Tests/Interop/cgroupsTests.cs -@@ -2,38 +2,27 @@ - // The .NET Foundation licenses this file to you under the MIT license. - // See the LICENSE file in the project root for more information. - --using System; - using System.IO; --using System.Text; - using Xunit; - - namespace Common.Tests - { -- public class cgroupsTests -+ public class cgroupsTests : FileCleanupTestBase - { - [Theory] -- [InlineData(true, "0", 0)] -- [InlineData(false, "max", 0)] -- [InlineData(true, "1k", 1024)] -- [InlineData(true, "1K", 1024)] -- public static void ValidateTryReadMemoryValue(bool expectedResult, string valueText, ulong expectedValue) -+ [InlineData(true, "0", 0)] -+ [InlineData(false, "max", 0)] -+ [InlineData(true, "1k", 1024)] -+ [InlineData(true, "1K", 1024)] -+ public void ValidateTryReadMemoryValue(bool expectedResult, string valueText, ulong expectedValue) - { -- string path = Path.GetTempFileName(); -- try -- { -- File.WriteAllText(path, valueText); -- -- bool result = Interop.cgroups.TryReadMemoryValueFromFile(path, out ulong val); -+ string path = GetTestFilePath(); -+ File.WriteAllText(path, valueText); - -- Assert.Equal(expectedResult, result); -- if (result) -- { -- Assert.Equal(expectedValue, val); -- } -- } -- finally -+ Assert.Equal(expectedResult, Interop.cgroups.TryReadMemoryValueFromFile(path, out ulong val)); -+ if (expectedResult) - { -- File.Delete(path); -+ Assert.Equal(expectedValue, val); - } - } - -@@ -50,26 +39,17 @@ public static void ValidateTryReadMemoryValue(bool expectedResult, string valueT - [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup cgroup cpu,memory", "memory", 1, "/", "/foo")] - [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup cgroup memory,cpu", "memory", 1, "/", "/foo")] - [InlineData(false, "0 0 0:0 / /foo ignore ignore - cgroup cgroup cpu", "memory", 0, "/", "/foo")] -- public static void ParseValidateMountInfo(bool found, string procSelfMountInfoText, string subsystem, int expectedVersion, string expectedRoot, string expectedMount) -+ public void ParseValidateMountInfo(bool expectedFound, string procSelfMountInfoText, string subsystem, int expectedVersion, string expectedRoot, string expectedMount) - { -- string path = Path.GetTempFileName(); -- try -- { -- File.WriteAllText(path, procSelfMountInfoText); -- -- bool result = Interop.cgroups.TryFindHierarchyMount(path, subsystem, out Interop.cgroups.CGroupVersion version, out string root, out string mount); -+ string path = GetTestFilePath(); -+ File.WriteAllText(path, procSelfMountInfoText); - -- Assert.Equal(found, result); -- if (found) -- { -- Assert.Equal(expectedVersion, (int)version); -- Assert.Equal(expectedRoot, root); -- Assert.Equal(expectedMount, mount); -- } -- } -- finally -+ Assert.Equal(expectedFound, Interop.cgroups.TryFindHierarchyMount(path, subsystem, out Interop.cgroups.CGroupVersion version, out string root, out string mount)); -+ if (expectedFound) - { -- File.Delete(path); -+ Assert.Equal(expectedVersion, (int)version); -+ Assert.Equal(expectedRoot, root); -+ Assert.Equal(expectedMount, mount); - } - } - -@@ -83,24 +63,15 @@ public static void ParseValidateMountInfo(bool found, string procSelfMountInfoTe - [InlineData(false, "2:foo:bar", "bar", "ignore")] - [InlineData(true, "1:foo:bar\n2:eggs:spam", "foo", "bar")] - [InlineData(true, "1:foo:bar\n2:eggs:spam", "eggs", "spam")] -- public static void ParseValidateProcCGroup(bool found, string procSelfCgroupText, string subsystem, string expectedMountPath) -+ public void ParseValidateProcCGroup(bool expectedFound, string procSelfCgroupText, string subsystem, string expectedMountPath) - { -- string path = Path.GetTempFileName(); -- try -- { -- File.WriteAllText(path, procSelfCgroupText); -+ string path = GetTestFilePath(); -+ File.WriteAllText(path, procSelfCgroupText); - -- bool result = Interop.cgroups.TryFindCGroupPathForSubsystem(path, subsystem, out string mountPath); -- -- Assert.Equal(found, result); -- if (found) -- { -- Assert.Equal(expectedMountPath, mountPath); -- } -- } -- finally -+ Assert.Equal(expectedFound, Interop.cgroups.TryFindCGroupPathForSubsystem(path, subsystem, out string mountPath)); -+ if (expectedFound) - { -- File.Delete(path); -+ Assert.Equal(expectedMountPath, mountPath); - } - } - } diff --git a/corefx-42871-fedora-33-rid.patch b/corefx-42871-fedora-33-rid.patch deleted file mode 100644 index 2802dcd..0000000 --- a/corefx-42871-fedora-33-rid.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 6cf4ff086875eaf29381cf406ea85846d9f66178 Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Mon, 24 Feb 2020 14:11:03 -0500 -Subject: [PATCH] Add Fedora 33 runtime ids - -Fedora 32 is gearing up for release[1], and in-development version of -Fedora has been offically labelled as being Fedora 33: - - $ podman run -it fedora:33 cat /etc/os-release - NAME=Fedora - VERSION="33 (Container Image)" - ID=fedora - VERSION_ID=33 - VERSION_CODENAME="" - PLATFORM_ID="platform:f33" - PRETTY_NAME="Fedora 33 (Container Image)" - ANSI_COLOR="0;34" - LOGO=fedora-logo-icon - CPE_NAME="cpe:/o:fedoraproject:fedora:33" - HOME_URL="https://fedoraproject.org/" - DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/rawhide/system-administrators-guide/" - SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help" - BUG_REPORT_URL="https://bugzilla.redhat.com/" - REDHAT_BUGZILLA_PRODUCT="Fedora" - REDHAT_BUGZILLA_PRODUCT_VERSION=rawhide - REDHAT_SUPPORT_PRODUCT="Fedora" - REDHAT_SUPPORT_PRODUCT_VERSION=rawhide - PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy" - VARIANT="Container Image" - VARIANT_ID=container - -[1] https://fedorapeople.org/groups/schedule/f-32/f-32-key-tasks.html ---- - eng/Packaging.props | 2 +- - .../runtime.compatibility.json | 32 +++++++++++++++++++ - pkg/Microsoft.NETCore.Platforms/runtime.json | 17 ++++++++++ - .../runtimeGroups.props | 2 +- - src/packages.builds | 3 ++ - 5 files changed, 54 insertions(+), 2 deletions(-) - -diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json -index 1e5c380a7a6a..c20e35394d6b 100644 ---- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json -+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json -@@ -953,6 +953,38 @@ - "any", - "base" - ], -+ "fedora.33": [ -+ "fedora.33", -+ "fedora", -+ "linux", -+ "unix", -+ "any", -+ "base" -+ ], -+ "fedora.33-arm64": [ -+ "fedora.33-arm64", -+ "fedora.33", -+ "fedora-arm64", -+ "fedora", -+ "linux-arm64", -+ "linux", -+ "unix-arm64", -+ "unix", -+ "any", -+ "base" -+ ], -+ "fedora.33-x64": [ -+ "fedora.33-x64", -+ "fedora.33", -+ "fedora-x64", -+ "fedora", -+ "linux-x64", -+ "linux", -+ "unix-x64", -+ "unix", -+ "any", -+ "base" -+ ], - "freebsd": [ - "freebsd", - "unix", -diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json -index b2f286ea2479..b3380ecbbef3 100644 ---- a/pkg/Microsoft.NETCore.Platforms/runtime.json -+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json -@@ -488,6 +488,23 @@ - "fedora-x64" - ] - }, -+ "fedora.33": { -+ "#import": [ -+ "fedora" -+ ] -+ }, -+ "fedora.33-arm64": { -+ "#import": [ -+ "fedora.33", -+ "fedora-arm64" -+ ] -+ }, -+ "fedora.33-x64": { -+ "#import": [ -+ "fedora.33", -+ "fedora-x64" -+ ] -+ }, - "freebsd": { - "#import": [ - "unix" -diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props -index eeb8130b54fb..da48e5f9d09f 100644 ---- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props -+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props -@@ -43,7 +43,7 @@ - - linux - x64;arm64 -- 23;24;25;26;27;28;29;30;31;32 -+ 23;24;25;26;27;28;29;30;31;32;33 - false - - diff --git a/corefx-42900-clang-10.patch b/corefx-42900-clang-10.patch deleted file mode 100644 index b898f34..0000000 --- a/corefx-42900-clang-10.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 58d6cd09bd2d5b1085c6572c1d97b8533cf8294b Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Fri, 3 Apr 2020 13:53:09 -0400 -Subject: [PATCH] Fix corefx to build on clang 10 - -Clang 10 adds/enables new warnings, some of which is affecting -the corefx code. - -Clang 10 has added -Walloca to warn about uses of alloca. This commit -replaces the only non-compliant use of that with a single fixed -stack-allocated buffer. - -Clang 10 has also added -Wimplicit-int-float-conversion. This commit -uses explicit casts to double to avoid the warnings. - -This is a backport of dotnet/runtime#33734 to corefx. - -After this commit, I can build all of corefx with Clang 10. ---- - src/Native/Unix/System.Native/pal_io.c | 20 +++++++++++--------- - src/Native/Unix/System.Native/pal_time.c | 2 +- - 2 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/src/Native/Unix/System.Native/pal_io.c b/src/Native/Unix/System.Native/pal_io.c -index 2d51edacf5ee..c7c42eb3e72b 100644 ---- a/src/Native/Unix/System.Native/pal_io.c -+++ b/src/Native/Unix/System.Native/pal_io.c -@@ -906,18 +906,20 @@ int32_t SystemNative_Poll(PollEvent* pollEvents, uint32_t eventCount, int32_t mi - return Error_EINVAL; - } - -- size_t bufferSize; -- if (!multiply_s(sizeof(struct pollfd), (size_t)eventCount, &bufferSize)) -+ struct pollfd stackBuffer[(uint32_t)(2048/sizeof(struct pollfd))]; -+ int useStackBuffer = eventCount <= (sizeof(stackBuffer)/sizeof(stackBuffer[0])); -+ struct pollfd* pollfds = NULL; -+ if (useStackBuffer) - { -- return SystemNative_ConvertErrorPlatformToPal(EOVERFLOW); -+ pollfds = (struct pollfd*)&stackBuffer[0]; - } -- -- -- int useStackBuffer = bufferSize <= 2048; -- struct pollfd* pollfds = (struct pollfd*)(useStackBuffer ? alloca(bufferSize) : malloc(bufferSize)); -- if (pollfds == NULL) -+ else - { -- return Error_ENOMEM; -+ pollfds = (struct pollfd*)calloc(eventCount, sizeof(*pollfds)); -+ if (pollfds == NULL) -+ { -+ return Error_ENOMEM; -+ } - } - - for (uint32_t i = 0; i < eventCount; i++) -diff --git a/src/Native/Unix/System.Native/pal_time.c b/src/Native/Unix/System.Native/pal_time.c -index 1a7c862749d1..54ebde60a83b 100644 ---- a/src/Native/Unix/System.Native/pal_time.c -+++ b/src/Native/Unix/System.Native/pal_time.c -@@ -169,7 +169,7 @@ int32_t SystemNative_GetCpuUtilization(ProcessCpuInformation* previousCpuInfo) - uint64_t resolution = SystemNative_GetTimestampResolution(); - uint64_t timestamp = SystemNative_GetTimestamp(); - -- uint64_t currentTime = (uint64_t)(timestamp * ((double)SecondsToNanoSeconds / resolution)); -+ uint64_t currentTime = (uint64_t)((double)timestamp * ((double)SecondsToNanoSeconds / (double)resolution)); - - uint64_t lastRecordedCurrentTime = previousCpuInfo->lastRecordedCurrentTime; - uint64_t lastRecordedKernelTime = previousCpuInfo->lastRecordedKernelTime; diff --git a/corefx-optflags-support.patch b/corefx-optflags-support.patch deleted file mode 100644 index 9b08f1f..0000000 --- a/corefx-optflags-support.patch +++ /dev/null @@ -1,40 +0,0 @@ -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) -+ add_compile_options(-Wno-alloca) - endif() --add_compile_options(-Werror) - - 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 -+++ b/src/Native/Unix/configure.cmake -@@ -27,6 +27,12 @@ else () - message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.") - endif () - -+ -+set (PREVIOUS_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -+set (CMAKE_CXX_FLAGS "-D_GNU_SOURCE") -+set (PREVIOUS_CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) -+set (CMAKE_C_FLAGS "-D_GNU_SOURCE") -+ - # We compile with -Werror, so we need to make sure these code fragments compile without warnings. - # Older CMake versions (3.8) do not assign the result of their tests, causing unused-value errors - # which are not distinguished from the test failing. So no error for that one. -@@ -698,6 +704,9 @@ endif() - - set (CMAKE_REQUIRED_LIBRARIES) - -+set (CMAKE_CXX_FLAGS "${PREVIOUS_CMAKE_CXX_FLAGS}") -+set (CMAKE_C_FLAGS "${PREVIOUS_CMAKE_C_FLAGS}") -+ - check_c_source_compiles( - " - #include diff --git a/dotnet3.1.spec b/dotnet5.0.spec similarity index 79% rename from dotnet3.1.spec rename to dotnet5.0.spec index 44ff8fb..49221a4 100644 --- a/dotnet3.1.spec +++ b/dotnet5.0.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap # Avoid provides/requires from private libraries %global privlibs libhostfxr @@ -20,18 +20,20 @@ %global dotnet_cflags %(echo %optflags | sed -e 's/-fstack-clash-protection//' | sed -re 's/-specs=[^ ]*//g') %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.1.3 -%global runtime_version 3.1.3 -%global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.103 -# upstream respun this release, so the tag doesn't exactly match -%global src_version %{sdk_version}.2 -%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') +%global host_version 5.0.0-preview.4.20251.6 +%global runtime_version 5.0.0-preview.4.20251.6 +%global aspnetcore_runtime_version 5.0.0-preview.4.20257.10 +%global sdk_version 5.0.100-preview.4.20161.13 +%global templates_version 5.0.0-preview.4.20161.13 +#%%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} -%global runtime_rpm_version %{runtime_version} -%global sdk_rpm_version %{sdk_version} +%global host_rpm_version 5.0.0 +%global aspnetcore_runtime_rpm_version 5.0.0 +%global runtime_rpm_version 5.0.0 +%global sdk_rpm_version 5.0.100 + +# upstream can update releases without revving the SDK version so these don't always match +%global src_version %{sdk_rpm_version} %if 0%{?fedora} || 0%{?rhel} < 8 %global use_bundled_libunwind 0 @@ -39,6 +41,10 @@ %global use_bundled_libunwind 1 %endif +%ifarch aarch64 +%global use_bundled_libunwind 1 +%endif + %ifarch x86_64 %global runtime_arch x64 %endif @@ -56,42 +62,34 @@ %endif %endif -Name: dotnet3.1 +Name: dotnet5.0 Version: %{sdk_rpm_version} -Release: 1%{?dist} +Release: 0.2.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/ # The source is generated on a Fedora box via: # ./build-dotnet-tarball v%%{src_version}-SDK -Source0: dotnet-v%{src_version}-SDK.tar.gz +Source0: dotnet-v%{src_version}-preview4-SDK.tar.gz Source1: check-debug-symbols.py Source2: dotnet.sh.in +# dotnet/runtime PR 39044 +Patch100: runtime-39044-cmake-downgrade.patch + +# TODO: upstream this patch +# Do not strip debuginfo from (native/unmanaged) binaries +Patch101: runtime-dont-strip.patch + +# TODO: upstream this patch # Fix building with our additional CFLAGS/CXXFLAGS/LDFLAGS -Patch100: corefx-optflags-support.patch - -# Add some support for cgroupv2 in corefx -# All these patches are upstreamed for 5.0 -Patch101: corefx-39686-cgroupv2-01.patch -Patch102: corefx-39686-cgroupv2-02.patch -Patch103: corefx-39633-cgroupv2-mountpoints.patch - -# Add Fedora 33 RID to corefx -Patch104: corefx-42871-fedora-33-rid.patch - -# Build with with hardening flags, including -pie -Patch200: coreclr-hardening-flags.patch -# Fix build with clang 10; Already applied at tarball-build time -# Patch201: coreclr-clang10.patch - -# Build with with hardening flags, including -pie -Patch300: core-setup-hardening-flags.patch +Patch102: runtime-flags-support.patch # Disable telemetry by default; make it opt-in -Patch500: cli-telemetry-optout.patch +Patch500: sdk-telemetry-optout.patch +# ExclusiveArch: aarch64 x86_64 ExclusiveArch: x86_64 BuildRequires: clang @@ -99,8 +97,8 @@ BuildRequires: cmake BuildRequires: coreutils %if %{without bootstrap} BuildRequires: dotnet-build-reference-packages -BuildRequires: dotnet-sdk-3.1 -BuildRequires: dotnet-sdk-3.1-source-built-artifacts +BuildRequires: dotnet-sdk-5.0 +BuildRequires: dotnet-sdk-5.0-source-built-artifacts %endif BuildRequires: findutils BuildRequires: git @@ -141,7 +139,7 @@ application to drive everything. Version: %{sdk_rpm_version} Summary: .NET Core CLI tools and runtime -Requires: dotnet-sdk-3.1%{?_isa} >= %{sdk_rpm_version}-%{release} +Requires: dotnet-sdk-5.0%{?_isa} >= %{sdk_rpm_version}-%{release} %description -n dotnet .NET Core is a fast, lightweight and modular platform for creating @@ -171,7 +169,7 @@ It particularly focuses on creating console applications, web applications and micro-services. -%package -n dotnet-hostfxr-3.1 +%package -n dotnet-hostfxr-5.0 Version: %{host_rpm_version} Summary: .NET Core command line host resolver @@ -180,7 +178,7 @@ Summary: .NET Core command line host resolver # provided by this package, or from a newer version of .NET Core Requires: dotnet-host%{?_isa} >= %{host_rpm_version}-%{release} -%description -n dotnet-hostfxr-3.1 +%description -n dotnet-hostfxr-5.0 The .NET Core host resolver contains the logic to resolve and select the right version of the .NET Core SDK or runtime to use. @@ -191,12 +189,12 @@ It particularly focuses on creating console applications, web applications and micro-services. -%package -n dotnet-runtime-3.1 +%package -n dotnet-runtime-5.0 Version: %{runtime_rpm_version} -Summary: NET Core 3.1 runtime +Summary: NET Core 5.0 runtime -Requires: dotnet-hostfxr-3.1%{?_isa} >= %{host_rpm_version}-%{release} +Requires: dotnet-hostfxr-5.0%{?_isa} >= %{host_rpm_version}-%{release} # libicu is dlopen()ed Requires: libicu%{?_isa} @@ -205,7 +203,7 @@ Requires: libicu%{?_isa} Provides: bundled(libunwind) = 1.3 %endif -%description -n dotnet-runtime-3.1 +%description -n dotnet-runtime-5.0 The .NET Core runtime contains everything needed to run .NET Core applications. It includes a high performance Virtual Machine as well as the framework libraries used by .NET Core applications. @@ -217,14 +215,14 @@ It particularly focuses on creating console applications, web applications and micro-services. -%package -n aspnetcore-runtime-3.1 +%package -n aspnetcore-runtime-5.0 Version: %{aspnetcore_runtime_rpm_version} -Summary: ASP.NET Core 3.1 runtime +Summary: ASP.NET Core 5.0 runtime -Requires: dotnet-runtime-3.1%{?_isa} >= %{runtime_rpm_version}-%{release} +Requires: dotnet-runtime-5.0%{?_isa} >= %{runtime_rpm_version}-%{release} -%description -n aspnetcore-runtime-3.1 +%description -n aspnetcore-runtime-5.0 The ASP.NET Core runtime contains everything needed to run .NET Core web applications. It includes a high performance Virtual Machine as well as the framework libraries used by .NET Core applications. @@ -236,16 +234,16 @@ It particularly focuses on creating console applications, web applications and micro-services. -%package -n dotnet-templates-3.1 +%package -n dotnet-templates-5.0 Version: %{sdk_rpm_version} -Summary: .NET Core 3.1 templates +Summary: .NET Core 5.0 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 Core Requires: dotnet-host%{?_isa} >= %{host_rpm_version}-%{release} -%description -n dotnet-templates-3.1 +%description -n dotnet-templates-5.0 This package contains templates used by the .NET Core SDK. ASP.NET Core is a fast, lightweight and modular platform for creating @@ -255,25 +253,25 @@ It particularly focuses on creating console applications, web applications and micro-services. -%package -n dotnet-sdk-3.1 +%package -n dotnet-sdk-5.0 Version: %{sdk_rpm_version} -Summary: .NET Core 3.1 Software Development Kit +Summary: .NET Core 5.0 Software Development Kit Provides: bundled(js-jquery) Provides: bundled(npm) -Requires: dotnet-runtime-3.1%{?_isa} >= %{runtime_rpm_version}-%{release} -Requires: aspnetcore-runtime-3.1%{?_isa} >= %{aspnetcore_runtime_rpm_version}-%{release} +Requires: dotnet-runtime-5.0%{?_isa} >= %{runtime_rpm_version}-%{release} +Requires: aspnetcore-runtime-5.0%{?_isa} >= %{aspnetcore_runtime_rpm_version}-%{release} -Requires: dotnet-apphost-pack-3.1%{?_isa} >= %{runtime_rpm_version}-%{release} -Requires: dotnet-targeting-pack-3.1%{?_isa} >= %{runtime_rpm_version}-%{release} -Requires: aspnetcore-targeting-pack-3.1%{?_isa} >= %{aspnetcore_runtime_rpm_version}-%{release} +Requires: dotnet-apphost-pack-5.0%{?_isa} >= %{runtime_rpm_version}-%{release} +Requires: dotnet-targeting-pack-5.0%{?_isa} >= %{runtime_rpm_version}-%{release} +Requires: aspnetcore-targeting-pack-5.0%{?_isa} >= %{aspnetcore_runtime_rpm_version}-%{release} Requires: netstandard-targeting-pack-2.1%{?_isa} >= %{sdk_rpm_version}-%{release} -Requires: dotnet-templates-3.1%{?_isa} >= %{sdk_rpm_version}-%{release} +Requires: dotnet-templates-5.0%{?_isa} >= %{sdk_rpm_version}-%{release} -%description -n dotnet-sdk-3.1 +%description -n dotnet-sdk-5.0 The .NET Core SDK is a collection of command line applications to create, build, publish and run .NET Core applications. @@ -302,18 +300,18 @@ applications using the .NET Core SDK. %{_libdir}/dotnet/packs/%{5} } -%dotnet_targeting_pack dotnet-apphost-pack-3.1 %{runtime_rpm_version} Microsoft.NETCore.App 3.1 Microsoft.NETCore.App.Host.%{runtime_id} -%dotnet_targeting_pack dotnet-targeting-pack-3.1 %{runtime_rpm_version} Microsoft.NETCore.App 3.1 Microsoft.NETCore.App.Ref -%dotnet_targeting_pack aspnetcore-targeting-pack-3.1 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 3.1 Microsoft.AspNetCore.App.Ref +%dotnet_targeting_pack dotnet-apphost-pack-5.0 %{runtime_rpm_version} Microsoft.NETCore.App 5.0 Microsoft.NETCore.App.Host.%{runtime_id} +%dotnet_targeting_pack dotnet-targeting-pack-5.0 %{runtime_rpm_version} Microsoft.NETCore.App 5.0 Microsoft.NETCore.App.Ref +%dotnet_targeting_pack aspnetcore-targeting-pack-5.0 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 5.0 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-3.1-source-built-artifacts +%package -n dotnet-sdk-5.0-source-built-artifacts Version: %{sdk_rpm_version} -Summary: Internal package for building .NET Core 3.1 Software Development Kit +Summary: Internal package for building .NET Core 5.0 Software Development Kit -%description -n dotnet-sdk-3.1-source-built-artifacts +%description -n dotnet-sdk-5.0-source-built-artifacts The .NET Core source-built archive is a collection of packages needed to build the .NET Core SDK itself. @@ -321,7 +319,7 @@ These are not meant for general use. %prep -%setup -q -n dotnet-v%{src_version}-SDK +%setup -q -n dotnet-v%{src_version}-preview4-SDK %if %{without bootstrap} # Remove all prebuilts @@ -331,49 +329,43 @@ find -iname '*.tar.gz' -type f -delete find -iname '*.nupkg' -type f -delete find -iname '*.zip' -type f -delete rm -rf .dotnet/ -rm -r packages/source-built +rm -rf packages/source-built %endif %if %{without bootstrap} -sed -i -e 's|3.1.100-preview1-014459|3.1.102|' global.json +sed -i -e 's|5.0.100-preview1-014459|5.0.103|' global.json mkdir -p packages/archive ln -s %{_libdir}/dotnet/source-built-artifacts/*.tar.gz packages/archive/ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages*.tar.gz packages/archive %endif # 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/runtime.*/src/installer/corehost/cli/hostmisc/pal.unix.cpp # Disable warnings -sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj +sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props -pushd src/corefx.* +pushd src/runtime.* %patch100 -p1 %patch101 -p1 %patch102 -p1 -%patch103 -p1 -%patch104 -p1 popd -pushd src/coreclr.* -%patch200 -p1 -#%%patch201 -p1 -popd - -pushd src/core-setup.* -%patch300 -p1 -popd - -pushd src/cli.* +pushd src/sdk.* %patch500 -p1 popd # If CLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE is misisng, add it back -grep CLR_CMAKE_USE_SYSTEM_LIBUNWIND repos/coreclr.proj || \ - sed -i 's|\$(BuildArguments) |$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' repos/coreclr.proj +grep CLR_CMAKE_USE_SYSTEM_LIBUNWIND repos/runtime.common.props || \ + sed -i 's|\$(BuildArguments) |$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' repos/runtime.common.props %if %{use_bundled_libunwind} -sed -i 's|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=FALSE|' repos/coreclr.proj +sed -i 's|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=FALSE|' repos/runtime.common.props +%endif + +%ifnarch x86_64 +mkdir -p artifacts/obj/%{runtime_arch}/Release +cp artifacts/obj/x64/Release/PackageVersions.props artifacts/obj/%{runtime_arch}/Release/PackageVersions.props %endif cat source-build-info.txt @@ -389,9 +381,9 @@ cat /etc/os-release cp -a %{_libdir}/dotnet previously-built-dotnet %endif -export CFLAGS="%{dotnet_cflags}" -export CXXFLAGS="%{dotnet_cflags}" -export LDFLAGS="%{dotnet_ldflags}" +export EXTRA_CFLAGS="%{dotnet_cflags}" +export EXTRA_CXXFLAGS="%{dotnet_cflags}" +export EXTRA_LDFLAGS="%%{dotnet_ldflags}" #%%if %%{without bootstrap} # --with-ref-packages %%{_libdir}/dotnet/reference-packages/ \ @@ -416,11 +408,11 @@ sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE2} > dotnet.sh %install install -dm 0755 %{buildroot}%{_libdir}/dotnet -ls bin/%{runtime_arch}/Release -tar xf bin/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/ +ls artifacts/%{runtime_arch}/Release +tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_rpm_version}-preview.4.20161.13-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/ # Install managed symbols -tar xf bin/%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%{runtime_version}-%{runtime_id}.tar.gz \ +tar xf artifacts/%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%{runtime_version}-%{runtime_id}.tar.gz \ -C %{buildroot}/%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/ # Fix executable permissions on files @@ -439,7 +431,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/cli.*/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 @@ -455,8 +447,8 @@ echo "%{_libdir}/dotnet" >> install_location install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet install install_location %{buildroot}%{_sysconfdir}/dotnet/ -install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts -install bin/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/ +#install -dm 0755 %%{buildroot}%%{_libdir}/dotnet/source-built-artifacts +#install artifacts/%%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %%{buildroot}/%%{_libdir}/dotnet/source-built-artifacts/ # Check debug symbols in all elf objects. This is not in %%check # because native binaries are stripped by rpm-build after %%install. @@ -487,35 +479,60 @@ echo "Testing build results for debug symbols..." %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/dotnet -%files -n dotnet-hostfxr-3.1 +%files -n dotnet-hostfxr-5.0 %dir %{_libdir}/dotnet/host/fxr %{_libdir}/dotnet/host/fxr/%{host_version} -%files -n dotnet-runtime-3.1 +%files -n dotnet-runtime-5.0 %dir %{_libdir}/dotnet/shared %dir %{_libdir}/dotnet/shared/Microsoft.NETCore.App %{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version} -%files -n aspnetcore-runtime-3.1 +%files -n aspnetcore-runtime-5.0 %dir %{_libdir}/dotnet/shared %dir %{_libdir}/dotnet/shared/Microsoft.AspNetCore.App %{_libdir}/dotnet/shared/Microsoft.AspNetCore.App/%{aspnetcore_runtime_version} -%files -n dotnet-templates-3.1 +%files -n dotnet-templates-5.0 %dir %{_libdir}/dotnet/templates %{_libdir}/dotnet/templates/%{templates_version} -%files -n dotnet-sdk-3.1 +%files -n dotnet-sdk-5.0 %dir %{_libdir}/dotnet/sdk %{_libdir}/dotnet/sdk/%{sdk_version} %dir %{_libdir}/dotnet/packs -%files -n dotnet-sdk-3.1-source-built-artifacts -%dir %{_libdir}/dotnet -%{_libdir}/dotnet/source-built-artifacts +#%%files -n dotnet-sdk-5.0-source-built-artifacts +#%%dir %%{_libdir}/dotnet +#%%{_libdir}/dotnet/source-built-artifacts %changelog +* Fri Jul 10 2020 Omair Majid - 5.0.100-0.2.preview4 +- Fix building with custom CFLAGS/CXXFLAGS/LDFLAGS +- Clean up patches + +* Mon Jul 06 2020 Omair Majid - 5.0.100-0.1.preview4 +- Initial build + +* Sat Jun 27 2020 Omair Majid - 3.1.105-4 +- Disable bootstrap + +* Fri Jun 26 2020 Omair Majid - 3.1.105-3 +- Re-bootstrap aarch64 + +* Fri Jun 19 2020 Omair Majid - 3.1.105-3 +- Disable bootstrap + +* Thu Jun 18 2020 Omair Majid - 3.1.105-1 +- Bootstrap aarch64 + +* Tue Jun 16 2020 Chris Rummel - 3.1.105-1 +- Update to .NET Core Runtime 3.1.5 and SDK 3.1.105 + +* Fri Jun 05 2020 Chris Rummel - 3.1.104-1 +- Update to .NET Core Runtime 3.1.4 and SDK 3.1.104 + * Thu Apr 09 2020 Chris Rummel - 3.1.103-1 - Update to .NET Core Runtime 3.1.3 and SDK 3.1.103 @@ -716,4 +733,3 @@ echo "Testing build results for debug symbols..." - SPEC file cleanup * Wed Jan 11 2017 Nemanja Milosevic - 1.1.0-0 - Initial RPM for Fedora 25/26. - diff --git a/runtime-39044-cmake-downgrade.patch b/runtime-39044-cmake-downgrade.patch new file mode 100644 index 0000000..71938d0 --- /dev/null +++ b/runtime-39044-cmake-downgrade.patch @@ -0,0 +1,1158 @@ +diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake +index 534f1d19de6..50d81842274 100644 +--- a/eng/common/cross/toolchain.cmake ++++ b/eng/common/cross/toolchain.cmake +@@ -83,15 +83,26 @@ endif() + + # Specify link flags + ++function(add_toolchain_linker_flag Flag) ++ set(Config "${ARGV1}") ++ set(CONFIG_SUFFIX "") ++ if (NOT Config STREQUAL "") ++ set(CONFIG_SUFFIX "_${Config}") ++ endif() ++ set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE) ++ set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE) ++endfunction() ++ ++ + if(TARGET_ARCH_NAME STREQUAL "armel") + if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only +- add_link_options("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") +- add_link_options("-L${CROSS_ROOTFS}/lib") +- add_link_options("-L${CROSS_ROOTFS}/usr/lib") +- add_link_options("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") ++ add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") ++ add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") ++ add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") ++ add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + endif() + elseif(TARGET_ARCH_NAME STREQUAL "x86") +- add_link_options(-m32) ++ add_toolchain_linker_flag(-m32) + endif() + + # Specify compile options +diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh +index a1a975ce177..9a0c296ff66 100755 +--- a/eng/native/build-commons.sh ++++ b/eng/native/build-commons.sh +@@ -51,12 +51,9 @@ check_prereqs() + # Check presence of CMake on the path + command -v cmake 2>/dev/null || { echo >&2 "Please install cmake before running this script"; exit 1; } + +- function version { echo "$@" | awk -F. '{ printf("%d%02d%02d\n", $1,$2,$3); }'; } +- +- local cmake_version="$(cmake --version | awk '/^cmake version [0-9]+\.[0-9]+\.[0-9]+$/ {print $3}')" +- +- if [[ "$(version "$cmake_version")" -lt "$(version 3.14.2)" ]]; then +- echo "Please install CMake 3.14.2 or newer from http://www.cmake.org/download/ or https://apt.kitware.com and ensure it is on your path."; exit 1; ++ if [[ "$__HostOS" == "OSX" ]]; then ++ # Check presence of pkg-config on the path ++ command -v pkg-config 2>/dev/null || { echo >&2 "Please install pkg-config before running this script, see https://github.com/dotnet/runtime/blob/master/docs/workflow/requirements/macos-requirements.md"; exit 1; } + fi + + if [[ "$__UseNinja" == 1 ]]; then +@@ -156,8 +153,8 @@ build_native() + cmake_command="emcmake $cmake_command" + fi + +- echo "Executing $cmake_command --build \"$intermediatesDir\" --target install -j $__NumProc" +- $cmake_command --build "$intermediatesDir" --target install -j "$__NumProc" ++ echo "Executing $cmake_command --build \"$intermediatesDir\" --target install -- -j $__NumProc" ++ $cmake_command --build "$intermediatesDir" --target install -- -j "$__NumProc" + fi + + local exit_code="$?" +diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake +index 2937916ced9..07fd6f75f6f 100644 +--- a/eng/native/configurecompiler.cmake ++++ b/eng/native/configurecompiler.cmake +@@ -8,8 +8,6 @@ set(CMAKE_C_STANDARD_REQUIRED ON) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + +-cmake_policy(SET CMP0083 NEW) +- + include(CheckCXXCompilerFlag) + + # "configureoptimization.cmake" must be included after CLR_CMAKE_HOST_UNIX has been set. +@@ -40,11 +38,18 @@ set(CMAKE_CXX_FLAGS_CHECKED "") + set(CMAKE_EXE_LINKER_FLAGS_CHECKED "") + set(CMAKE_SHARED_LINKER_FLAGS_CHECKED "") + ++set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "") ++set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "") ++set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "") ++set(CMAKE_EXE_LINKER_FLAGS_DEBUG "") ++set(CMAKE_EXE_LINKER_FLAGS_DEBUG "") ++set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "") ++ + add_compile_definitions("$<$,$>:DEBUG;_DEBUG;_DBG;URTBLDENV_FRIENDLY=Checked;BUILDENV_CHECKED=1>") + add_compile_definitions("$<$,$>:NDEBUG;URTBLDENV_FRIENDLY=Retail>") + + if (MSVC) +- add_link_options(/GUARD:CF) ++ add_linker_flag(/GUARD:CF) + + # Linker flags + # +@@ -57,48 +62,51 @@ if (MSVC) + endif () + + #Do not create Side-by-Side Assembly Manifest +- add_link_options($<$,SHARED_LIBRARY>:/MANIFEST:NO>) ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO") + # can handle addresses larger than 2 gigabytes +- add_link_options($<$,SHARED_LIBRARY>:/LARGEADDRESSAWARE>) ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LARGEADDRESSAWARE") + #Compatible with Data Execution Prevention +- add_link_options($<$,SHARED_LIBRARY>:/NXCOMPAT>) ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NXCOMPAT") + #Use address space layout randomization +- add_link_options($<$,SHARED_LIBRARY>:/DYNAMICBASE>) ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DYNAMICBASE") + #shrink pdb size +- add_link_options($<$,SHARED_LIBRARY>:/PDBCOMPRESS>) ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /PDBCOMPRESS") + +- add_link_options($<$,SHARED_LIBRARY>:/DEBUG>) +- add_link_options($<$,SHARED_LIBRARY>:/IGNORE:4197,4013,4254,4070,4221>) +- add_link_options($<$,SHARED_LIBRARY>:/SUBSYSTEM:WINDOWS,${WINDOWS_SUBSYSTEM_VERSION}>) ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG") ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /IGNORE:4197,4013,4254,4070,4221") ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,${WINDOWS_SUBSYSTEM_VERSION}") + + set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /IGNORE:4221") + +- add_link_options($<$,EXECUTABLE>:/DEBUG>) +- add_link_options($<$,EXECUTABLE>:/PDBCOMPRESS>) +- add_link_options($<$,EXECUTABLE>:/STACK:1572864>) ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /PDBCOMPRESS") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1572864") + + # Debug build specific flags +- add_link_options($<$,$>,$,SHARED_LIBRARY>>:/NOVCFEATURE>) ++ set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NOVCFEATURE") ++ set(CMAKE_SHARED_LINKER_FLAGS_CHECKED "${CMAKE_SHARED_LINKER_FLAGS_CHECKED} /NOVCFEATURE") + + # Checked build specific flags +- add_link_options($<$:/INCREMENTAL:NO>) # prevent "warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:REF' specification" +- add_link_options($<$:/OPT:REF>) +- add_link_options($<$:/OPT:NOICF>) ++ add_linker_flag(/INCREMENTAL:NO CHECKED) # prevent "warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:REF' specification" ++ add_linker_flag(/OPT:REF CHECKED) ++ add_linker_flag(/OPT:NOICF CHECKED) + + # Release build specific flags +- add_link_options($<$:/LTCG>) +- add_link_options($<$:/OPT:REF>) +- add_link_options($<$:/OPT:ICF>) ++ add_linker_flag(/LTCG RELEASE) ++ add_linker_flag(/OPT:REF RELEASE) ++ add_linker_flag(/OPT:ICF RELEASE) ++ add_linker_flag(/INCREMENTAL:NO RELEASE) + set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG") + + # ReleaseWithDebugInfo build specific flags +- add_link_options($<$:/LTCG>) +- add_link_options($<$:/OPT:REF>) +- add_link_options($<$:/OPT:ICF>) ++ add_linker_flag(/LTCG RELWITHDEBINFO) ++ add_linker_flag(/OPT:REF RELWITHDEBINFO) ++ add_linker_flag(/OPT:ICF RELWITHDEBINFO) + set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /LTCG") + + # Force uCRT to be dynamically linked for Release build +- add_link_options("$<$:/NODEFAULTLIB:libucrt.lib;/DEFAULTLIB:ucrt.lib>") ++ add_linker_flag(/NODEFAULTLIB:libucrt.lib RELEASE) ++ add_linker_flag(/DEFAULTLIB:ucrt.lib RELEASE) + + elseif (CLR_CMAKE_HOST_UNIX) + # Set the values to display when interactively configuring CMAKE_BUILD_TYPE +@@ -157,11 +165,10 @@ elseif (CLR_CMAKE_HOST_UNIX) + + # -fdata-sections -ffunction-sections: each function has own section instead of one per .o file (needed for --gc-sections) + # -O1: optimization level used instead of -O0 to avoid compile error "invalid operand for inline asm constraint" +- add_compile_definitions("$<$,$>:${CLR_SANITIZE_CXX_OPTIONS};-fdata-sections;--ffunction-sections;-O1>") +- add_link_options($<$,$>,$,EXECUTABLE>>:${CLR_SANITIZE_LINK_OPTIONS}>) +- ++ add_compile_options("$<$,$>:${CLR_SANITIZE_CXX_OPTIONS};-fdata-sections;--ffunction-sections;-O1>") ++ add_linker_flag("${CLR_SANITIZE_LINK_OPTIONS}" DEBUG CHECKED) + # -Wl and --gc-sections: drop unused sections\functions (similar to Windows /Gy function-level-linking) +- add_link_options("$<$,$>,$,SHARED_LIBRARY>>:${CLR_SANITIZE_LINK_OPTIONS};-Wl,--gc-sections>") ++ add_linker_flag("-Wl,--gc-sections" DEBUG CHECKED) + endif () + endif(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED) + endif(MSVC) +@@ -173,15 +180,18 @@ endif(MSVC) + # ./build-native.sh cmakeargs "-DCLR_ADDITIONAL_COMPILER_OPTIONS=<...>" cmakeargs "-DCLR_ADDITIONAL_LINKER_FLAGS=<...>" + # + if(CLR_CMAKE_HOST_UNIX) +- add_link_options(${CLR_ADDITIONAL_LINKER_FLAGS}) ++ foreach(ADDTL_LINKER_FLAG ${CLR_ADDITIONAL_LINKER_FLAGS}) ++ add_linker_flag(${ADDTL_LINKER_FLAG}) ++ endforeach() + endif(CLR_CMAKE_HOST_UNIX) + + if(CLR_CMAKE_HOST_LINUX) + add_compile_options($<$:-Wa,--noexecstack>) +- add_link_options(-Wl,--build-id=sha1 -Wl,-z,relro,-z,now) ++ add_linker_flag(-Wl,--build-id=sha1) ++ add_linker_flag(-Wl,-z,relro,-z,now) + elseif(CLR_CMAKE_HOST_FREEBSD) + add_compile_options($<$:-Wa,--noexecstack>) +- add_link_options(LINKER:--build-id=sha1) ++ add_linker_flag("-Wl,--build-id=sha1") + elseif(CLR_CMAKE_HOST_SUNOS) + set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /opt/local/include) + set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /opt/local/lib) +@@ -357,7 +367,7 @@ if (CLR_CMAKE_HOST_UNIX) + if(CLR_CMAKE_HOST_OSX) + set(MACOS_VERSION_MIN_FLAGS -mmacosx-version-min=10.12) + add_compile_options(${MACOS_VERSION_MIN_FLAGS}) +- add_link_options(${MACOS_VERSION_MIN_FLAGS}) ++ add_linker_flag(${MACOS_VERSION_MIN_FLAGS}) + endif(CLR_CMAKE_HOST_OSX) + endif(CLR_CMAKE_HOST_UNIX) + +@@ -514,7 +524,7 @@ if(CLR_CMAKE_ENABLE_CODE_COVERAGE) + + add_compile_options(-fprofile-arcs) + add_compile_options(-ftest-coverage) +- add_link_options(--coverage) ++ add_linker_flag(--coverage) + else() + message(FATAL_ERROR "Code coverage builds not supported on current platform") + endif(CLR_CMAKE_HOST_UNIX) +diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake +index 1c5254d8496..4a4131cb05d 100644 +--- a/eng/native/configureplatform.cmake ++++ b/eng/native/configureplatform.cmake +@@ -1,4 +1,3 @@ +-include(CheckPIESupported) + include(${CMAKE_CURRENT_LIST_DIR}/functions.cmake) + + # If set, indicates that this is not an officially supported release +@@ -363,19 +362,10 @@ if(NOT CLR_CMAKE_TARGET_EMSCRIPTEN) + # but since we know that PIE is supported, we can safely skip this redundant check). + # + # The default linker on Solaris also does not support PIE. +- if(NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_SUNOS) +- # All code we build should be compiled as position independent +- get_property(languages GLOBAL PROPERTY ENABLED_LANGUAGES) +- if("CXX" IN_LIST languages) +- set(CLR_PIE_LANGUAGE CXX) +- else() +- set(CLR_PIE_LANGUAGE C) +- endif() +- check_pie_supported(OUTPUT_VARIABLE PIE_SUPPORT_OUTPUT LANGUAGES ${CLR_PIE_LANGUAGE}) +- if(NOT MSVC AND NOT CMAKE_${CLR_PIE_LANGUAGE}_LINK_PIE_SUPPORTED) +- message(WARNING "PIE is not supported at link time: ${PIE_SUPPORT_OUTPUT}.\n" +- "PIE link options will not be passed to linker.") +- endif() ++ if(NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_SUNOS AND NOT CLR_CMAKE_TARGET_OSX AND NOT CLR_CMAKE_HOST_TVOS AND NOT CLR_CMAKE_HOST_IOS AND NOT MSVC) ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") ++ add_compile_options($<$,EXECUTABLE>:-fPIE>) ++ add_compile_options($<$,SHARED_LIBRARY>:-fPIC>) + endif() + + set(CMAKE_POSITION_INDEPENDENT_CODE ON) +diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake +index b7f8f463804..f4a96cbe35e 100644 +--- a/eng/native/functions.cmake ++++ b/eng/native/functions.cmake +@@ -123,7 +123,7 @@ function(preprocess_compile_asm) + set(options "") + set(oneValueArgs OUTPUT_OBJECTS) + set(multiValueArgs ASM_FILES) +- cmake_parse_arguments(PARSE_ARGV 0 COMPILE_ASM "${options}" "${oneValueArgs}" "${multiValueArgs}") ++ cmake_parse_arguments(COMPILE_ASM "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGV}) + + get_include_directories_asm(ASM_INCLUDE_DIRECTORIES) + +@@ -209,7 +209,7 @@ function(target_precompile_header) + set(options "") + set(oneValueArgs TARGET HEADER) + set(multiValueArgs ADDITIONAL_INCLUDE_DIRECTORIES) +- cmake_parse_arguments(PARSE_ARGV 0 PRECOMPILE_HEADERS "${options}" "${oneValueArgs}" "${multiValueArgs}") ++ cmake_parse_arguments(PRECOMPILE_HEADERS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGV}) + + if ("${PRECOMPILE_HEADERS_TARGET}" STREQUAL "") + message(SEND_ERROR "No target supplied to target_precompile_header.") +@@ -321,7 +321,7 @@ endfunction() + function(install_clr) + set(oneValueArgs ADDITIONAL_DESTINATION) + set(multiValueArgs TARGETS) +- cmake_parse_arguments(PARSE_ARGV 0 INSTALL_CLR "${options}" "${oneValueArgs}" "${multiValueArgs}") ++ cmake_parse_arguments(INSTALL_CLR "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGV}) + + if ("${INSTALL_CLR_TARGETS}" STREQUAL "") + message(FATAL_ERROR "At least one target must be passed to install_clr(TARGETS )") +@@ -377,6 +377,15 @@ function(disable_pax_mprotect targetName) + endif() + endfunction() + ++if (CMAKE_VERSION VERSION_LESS "3.12") ++ # Polyfill add_compile_definitions when it is unavailable ++ function(add_compile_definitions) ++ get_directory_property(DIR_COMPILE_DEFINITIONS COMPILE_DEFINITIONS) ++ list(APPEND DIR_COMPILE_DEFINITIONS ${ARGV}) ++ set_directory_properties(PROPERTIES COMPILE_DEFINITIONS "${DIR_COMPILE_DEFINITIONS}") ++ endfunction() ++endif() ++ + function(_add_executable) + if(NOT WIN32) + add_executable(${ARGV} ${VERSION_FILE_PATH}) +@@ -415,3 +424,16 @@ endfunction() + function(add_executable_clr) + _add_executable(${ARGV}) + endfunction() ++ ++# add_linker_flag(Flag [Config1 Config2 ...]) ++function(add_linker_flag Flag) ++ if (ARGN STREQUAL "") ++ set("CMAKE_EXE_LINKER_FLAGS" "${CMAKE_EXE_LINKER_FLAGS} ${Flag}" PARENT_SCOPE) ++ set("CMAKE_SHARED_LINKER_FLAGS" "${CMAKE_SHARED_LINKER_FLAGS} ${Flag}" PARENT_SCOPE) ++ else() ++ foreach(Config ${ARGN}) ++ set("CMAKE_EXE_LINKER_FLAGS_${Config}" "${CMAKE_EXE_LINKER_FLAGS_${Config}} ${Flag}" PARENT_SCOPE) ++ set("CMAKE_SHARED_LINKER_FLAGS_${Config}" "${CMAKE_SHARED_LINKER_FLAGS_${Config}} ${Flag}" PARENT_SCOPE) ++ endforeach() ++ endif() ++endfunction() +diff --git a/eng/native/gen-buildsys.sh b/eng/native/gen-buildsys.sh +index f27bb33e357..1b4c2e02c59 100755 +--- a/eng/native/gen-buildsys.sh ++++ b/eng/native/gen-buildsys.sh +@@ -91,6 +91,9 @@ if [[ "$build_arch" == "wasm" ]]; then + cmake_command="emcmake $cmake_command" + fi + ++# We have to be able to build with CMake 3.6.2, so we can't use the -S or -B options ++pushd "$3" ++ + # Include CMAKE_USER_MAKE_RULES_OVERRIDE as uninitialized since it will hold its value in the CMake cache otherwise can cause issues when branch switching + $cmake_command \ + -G "$generator" \ +@@ -98,5 +101,6 @@ $cmake_command \ + "-DCMAKE_INSTALL_PREFIX=$__CMakeBinDir" \ + $cmake_extra_defines \ + $__UnprocessedCMakeArgs \ +- -S "$1" \ +- -B "$3" ++ "$1" ++ ++popd +diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt +index 5fa572c4fcd..071ac2cf5fa 100644 +--- a/src/coreclr/CMakeLists.txt ++++ b/src/coreclr/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) + +diff --git a/src/coreclr/pgosupport.cmake b/src/coreclr/pgosupport.cmake +index 4b119809017..04bde2bc20b 100644 +--- a/src/coreclr/pgosupport.cmake ++++ b/src/coreclr/pgosupport.cmake +@@ -1,5 +1,18 @@ +-include(CheckIPOSupported) +-check_ipo_supported(RESULT HAVE_LTO) ++include(CheckCXXSourceCompiles) ++include(CheckCXXCompilerFlag) ++ ++# VC++ guarantees support for LTCG (LTO's equivalent) ++if(NOT WIN32) ++ # Function required to give CMAKE_REQUIRED_* local scope ++ function(check_have_lto) ++ set(CMAKE_REQUIRED_FLAGS -flto) ++ set(CMAKE_REQUIRED_LIBRARIES -flto -fuse-ld=gold) ++ check_cxx_source_compiles("int main() { return 0; }" HAVE_LTO) ++ endfunction(check_have_lto) ++ check_have_lto() ++ ++ check_cxx_compiler_flag(-faligned-new COMPILER_SUPPORTS_F_ALIGNED_NEW) ++endif(NOT WIN32) + + # Adds Profile Guided Optimization (PGO) flags to the current target + function(add_pgo TargetName) +diff --git a/src/coreclr/src/ToolBox/SOS/DacTableGen/CMakeLists.txt b/src/coreclr/src/ToolBox/SOS/DacTableGen/CMakeLists.txt +index dcd39e346c9..7b471d53726 100644 +--- a/src/coreclr/src/ToolBox/SOS/DacTableGen/CMakeLists.txt ++++ b/src/coreclr/src/ToolBox/SOS/DacTableGen/CMakeLists.txt +@@ -1,3 +1,4 @@ ++cmake_minimum_required(VERSION 3.8) + # Quick note: The CMake C# support is using the CSC bundled with the MSBuild that the native build runs on, not the one supplied by the local .NET SDK. + + project(DacTableGen LANGUAGES CSharp) +diff --git a/src/coreclr/src/binder/CMakeLists.txt b/src/coreclr/src/binder/CMakeLists.txt +index 3a66c81e10e..208f1214dd0 100644 +--- a/src/coreclr/src/binder/CMakeLists.txt ++++ b/src/coreclr/src/binder/CMakeLists.txt +@@ -82,11 +82,13 @@ endif(CLR_CMAKE_TARGET_WIN32) + convert_to_absolute_path(BINDER_SOURCES ${BINDER_SOURCES}) + convert_to_absolute_path(BINDER_CROSSGEN_SOURCES ${BINDER_CROSSGEN_SOURCES}) + +-add_library_clr(v3binder +- STATIC ++add_library_clr(v3binder_obj ++ OBJECT + ${BINDER_SOURCES} + ) +-add_dependencies(v3binder eventing_headers) ++add_dependencies(v3binder_obj eventing_headers) ++add_library(v3binder INTERFACE) ++target_sources(v3binder INTERFACE $) + + add_library_clr(v3binder_crossgen + STATIC +diff --git a/src/coreclr/src/classlibnative/bcltype/CMakeLists.txt b/src/coreclr/src/classlibnative/bcltype/CMakeLists.txt +index 391f70eff43..fdcf344c16a 100644 +--- a/src/coreclr/src/classlibnative/bcltype/CMakeLists.txt ++++ b/src/coreclr/src/classlibnative/bcltype/CMakeLists.txt +@@ -10,9 +10,11 @@ set(BCLTYPE_SOURCES + variant.cpp + ) + +-add_library_clr(bcltype +- STATIC ++add_library_clr(bcltype_obj ++ OBJECT + ${BCLTYPE_SOURCES} + ) + +-add_dependencies(bcltype eventing_headers) ++add_dependencies(bcltype_obj eventing_headers) ++add_library(bcltype INTERFACE) ++target_sources(bcltype INTERFACE $) +diff --git a/src/coreclr/src/classlibnative/float/CMakeLists.txt b/src/coreclr/src/classlibnative/float/CMakeLists.txt +index 44d40c92592..3c066620f76 100644 +--- a/src/coreclr/src/classlibnative/float/CMakeLists.txt ++++ b/src/coreclr/src/classlibnative/float/CMakeLists.txt +@@ -7,9 +7,12 @@ set(FLOAT_SOURCES + floatsingle.cpp + ) + +-add_library_clr(comfloat_wks +- STATIC ++add_library_clr(comfloat_wks_obj ++ OBJECT + ${FLOAT_SOURCES} + ) + +-add_dependencies(comfloat_wks eventing_headers) ++add_dependencies(comfloat_wks_obj eventing_headers) ++ ++add_library(comfloat_wks INTERFACE) ++target_sources(comfloat_wks INTERFACE $) +diff --git a/src/coreclr/src/debug/debug-pal/CMakeLists.txt b/src/coreclr/src/debug/debug-pal/CMakeLists.txt +index ac1e48fb5fb..213fa59e784 100644 +--- a/src/coreclr/src/debug/debug-pal/CMakeLists.txt ++++ b/src/coreclr/src/debug/debug-pal/CMakeLists.txt +@@ -34,4 +34,6 @@ if(CLR_CMAKE_HOST_UNIX) + + endif(CLR_CMAKE_HOST_UNIX) + +-_add_library(debug-pal STATIC ${TWO_WAY_PIPE_SOURCES}) ++_add_library(debug-pal_obj OBJECT ${TWO_WAY_PIPE_SOURCES}) ++add_library(debug-pal INTERFACE) ++target_sources(debug-pal INTERFACE $) +diff --git a/src/coreclr/src/debug/ee/wks/CMakeLists.txt b/src/coreclr/src/debug/ee/wks/CMakeLists.txt +index ee6c482ce76..3dd5e3612df 100644 +--- a/src/coreclr/src/debug/ee/wks/CMakeLists.txt ++++ b/src/coreclr/src/debug/ee/wks/CMakeLists.txt +@@ -9,9 +9,9 @@ if (CLR_CMAKE_TARGET_WIN32) + + if(CLR_CMAKE_HOST_ARCH_ARM OR CLR_CMAKE_HOST_ARCH_ARM64) + +- preprocess_compile_asm(ASM_FILES ${ASM_FILE} OUTPUT_OBJECTS ASM_OBJECTS) ++ preprocess_compile_asm(TARGET cordbee_wks_obj ASM_FILES ${ASM_FILE} OUTPUT_OBJECTS ASM_OBJECTS) + +- add_library_clr(cordbee_wks ${CORDBEE_SOURCES_WKS} ${ASM_OBJECTS}) ++ add_library_clr(cordbee_wks_obj OBJECT ${CORDBEE_SOURCES_WKS} ${ASM_FILE} ${ASM_OBJECTS}) + + else () + +@@ -23,19 +23,21 @@ if (CLR_CMAKE_TARGET_WIN32) + + set_source_files_properties(${ASM_FILE} PROPERTIES COMPILE_OPTIONS "${ASM_OPTIONS}") + +- add_library_clr(cordbee_wks ${CORDBEE_SOURCES_WKS} ${ASM_FILE}) ++ add_library_clr(cordbee_wks_obj OBJECT ${CORDBEE_SOURCES_WKS} ${ASM_FILE}) + + endif() + + else () + + if(CLR_CMAKE_HOST_ARCH_AMD64 OR CLR_CMAKE_HOST_ARCH_ARM OR CLR_CMAKE_HOST_ARCH_ARM64 OR CLR_CMAKE_HOST_ARCH_I386) +- add_library_clr(cordbee_wks ${CORDBEE_SOURCES_WKS} ../${ARCH_SOURCES_DIR}/dbghelpers.S) ++ add_library_clr(cordbee_wks_obj OBJECT ${CORDBEE_SOURCES_WKS} ../${ARCH_SOURCES_DIR}/dbghelpers.S) + else() + message(FATAL_ERROR "Unknown platform") + endif() + + endif (CLR_CMAKE_TARGET_WIN32) + +-target_precompile_header(TARGET cordbee_wks HEADER stdafx.h) +-add_dependencies(cordbee_wks eventing_headers) ++target_precompile_header(TARGET cordbee_wks_obj HEADER stdafx.h) ++add_dependencies(cordbee_wks_obj eventing_headers) ++add_library(cordbee_wks INTERFACE) ++target_sources(cordbee_wks INTERFACE $) +diff --git a/src/coreclr/src/debug/ildbsymlib/CMakeLists.txt b/src/coreclr/src/debug/ildbsymlib/CMakeLists.txt +index 88364658f11..362da1f6483 100644 +--- a/src/coreclr/src/debug/ildbsymlib/CMakeLists.txt ++++ b/src/coreclr/src/debug/ildbsymlib/CMakeLists.txt +@@ -10,5 +10,6 @@ set( ILDBSYMLIB_SOURCES + symwrite.cpp + ) + +-add_library_clr(ildbsymlib ${ILDBSYMLIB_SOURCES}) +- ++add_library_clr(ildbsymlib_obj OBJECT ${ILDBSYMLIB_SOURCES}) ++add_library(ildbsymlib INTERFACE) ++target_sources(ildbsymlib INTERFACE $) +diff --git a/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt +index 777a2869e4f..066b75ab01f 100644 +--- a/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt ++++ b/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt +@@ -9,20 +9,20 @@ if (CLR_CMAKE_HOST_WIN32) + + list(APPEND CLR_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/coreclr.def) + +- add_link_options(/ENTRY:CoreDllMain) ++ add_linker_flag("/ENTRY:CoreDllMain") + + # Incremental linking results in the linker inserting extra padding and routing function calls via thunks that can break the + # invariants (e.g. size of region between Jit_PatchedCodeLast-Jit_PatchCodeStart needs to fit in a page). +- add_link_options(/INCREMENTAL:NO) ++ add_linker_flag("/INCREMENTAL:NO") + + # Delay load libraries required for WinRT as that is not supported on all platforms +- add_link_options("/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll") +- add_link_options("/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll") +- add_link_options("/DELAYLOAD:api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll") +- add_link_options("/DELAYLOAD:api-ms-win-ro-typeresolution-l1-1-0.dll") ++ add_linker_flag("/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll") ++ add_linker_flag("/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll") ++ add_linker_flag("/DELAYLOAD:api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll") ++ add_linker_flag("/DELAYLOAD:api-ms-win-ro-typeresolution-l1-1-0.dll") + + # Delay load version.dll so that we can specify how to search when loading it as it is not part of Windows' known DLLs +- add_link_options("/DELAYLOAD:version.dll") ++ add_linker_flag("/DELAYLOAD:version.dll") + + # No library groups for Win32 + set(START_LIBRARY_GROUP) +@@ -35,7 +35,7 @@ else(CLR_CMAKE_HOST_WIN32) + if(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_NETBSD) + # This option is necessary to ensure that the overloaded delete operator defined inside + # of the utilcode will be used instead of the standard library delete operator. +- add_link_options("LINKER:-Bsymbolic") ++ add_linker_flag("-Wl,-Bsymbolic") + + # The following linked options can be inserted into the linker libraries list to + # ensure proper resolving of circular references between a subset of the libraries. +@@ -110,7 +110,7 @@ set(CORECLR_LIBRARIES + utilcode + v3binder + libraries-native +- System.Globalization.Native-Static ++ System.Globalization.Native-static + interop + ) + +@@ -162,7 +162,12 @@ if(FEATURE_EVENT_TRACE) + endif(CLR_CMAKE_HOST_UNIX) + endif(FEATURE_EVENT_TRACE) + +-target_link_libraries(coreclr ${CORECLR_LIBRARIES}) ++if(FEATURE_MERGE_JIT_AND_ENGINE) ++ set(CLRJIT_STATIC clrjit_static) ++endif(FEATURE_MERGE_JIT_AND_ENGINE) ++ ++target_sources(coreclr PUBLIC $) ++target_link_libraries(coreclr PUBLIC ${CORECLR_LIBRARIES} ${CLRJIT_STATIC} cee_wks) + + # Create the runtime module index header file containing the coreclr build id + # for xplat and the timestamp/size on Windows. +diff --git a/src/coreclr/src/dlls/mscorrc/CMakeLists.txt b/src/coreclr/src/dlls/mscorrc/CMakeLists.txt +index 08cf27aaf80..e114ec19cea 100644 +--- a/src/coreclr/src/dlls/mscorrc/CMakeLists.txt ++++ b/src/coreclr/src/dlls/mscorrc/CMakeLists.txt +@@ -19,7 +19,9 @@ if(CLR_CMAKE_HOST_WIN32) + else() + build_resources(${CMAKE_CURRENT_SOURCE_DIR}/include.rc mscorrc TARGET_CPP_FILE) + +- add_library_clr(mscorrc STATIC ++ add_library_clr(mscorrc_obj OBJECT + ${TARGET_CPP_FILE} + ) ++ add_library(mscorrc INTERFACE) ++ target_sources(mscorrc INTERFACE $) + endif(CLR_CMAKE_HOST_WIN32) +diff --git a/src/coreclr/src/gcinfo/CMakeLists.txt b/src/coreclr/src/gcinfo/CMakeLists.txt +index b0b67462562..50a1722a8ea 100644 +--- a/src/coreclr/src/gcinfo/CMakeLists.txt ++++ b/src/coreclr/src/gcinfo/CMakeLists.txt +@@ -16,11 +16,14 @@ endif(CLR_CMAKE_TARGET_ARCH_I386) + + convert_to_absolute_path(GCINFO_SOURCES ${GCINFO_SOURCES}) + +-add_library_clr(gcinfo +- STATIC ++add_library_clr(gcinfo_obj ++ OBJECT + ${GCINFO_SOURCES} + ) + ++add_library(gcinfo INTERFACE) ++target_sources(gcinfo INTERFACE $) ++ + add_library_clr(gcinfo_crossgen + STATIC + ${GCINFO_SOURCES} +diff --git a/src/coreclr/src/inc/CMakeLists.txt b/src/coreclr/src/inc/CMakeLists.txt +index 60fad88e77d..4f75d3a882d 100644 +--- a/src/coreclr/src/inc/CMakeLists.txt ++++ b/src/coreclr/src/inc/CMakeLists.txt +@@ -58,7 +58,9 @@ if(FEATURE_JIT_PITCHING) + endif(FEATURE_JIT_PITCHING) + + # Compile *_i.cpp to lib +-_add_library(corguids ${CORGUIDS_SOURCES}) ++_add_library(corguids_obj OBJECT ${CORGUIDS_SOURCES}) ++add_library(corguids INTERFACE) ++target_sources(corguids INTERFACE $) + + # Binplace the inc files for packaging later. + +@@ -75,4 +77,3 @@ _install (FILES cfi.h + gcinfoencoder.h + gcinfotypes.h + DESTINATION inc) +-_install (TARGETS corguids DESTINATION lib) +diff --git a/src/coreclr/src/interop/CMakeLists.txt b/src/coreclr/src/interop/CMakeLists.txt +index d7eaa1b04ae..3924b4fdbb4 100644 +--- a/src/coreclr/src/interop/CMakeLists.txt ++++ b/src/coreclr/src/interop/CMakeLists.txt +@@ -30,7 +30,10 @@ endif(WIN32) + + convert_to_absolute_path(INTEROP_SOURCES ${INTEROP_SOURCES}) + +-add_library_clr(interop +- STATIC ++add_library_clr(interop_obj ++ OBJECT + ${INTEROP_SOURCES} + ) ++ ++add_library(interop INTERFACE) ++target_sources(interop INTERFACE $) +diff --git a/src/coreclr/src/jit/dll/CMakeLists.txt b/src/coreclr/src/jit/dll/CMakeLists.txt +index ec7cddc78ed..01bdbf5a731 100644 +--- a/src/coreclr/src/jit/dll/CMakeLists.txt ++++ b/src/coreclr/src/jit/dll/CMakeLists.txt +@@ -2,17 +2,17 @@ project(ClrJit) + + set_source_files_properties(${JIT_EXPORTS_FILE} PROPERTIES GENERATED TRUE) + ++add_library_clr(clrjit_obj ++ OBJECT ++ ${JIT_CORE_SOURCES} ++ ${JIT_ARCH_SOURCES} ++) ++ + if(CLR_CMAKE_HOST_UNIX) +- add_library_clr(clrjit_static +- STATIC +- ${SHARED_LIB_SOURCES} +- ${JIT_ARCH_SOURCES} +- ) +- add_dependencies(clrjit_static coreclrpal gcinfo) +-else() +- add_library_clr(clrjit_static +- ${SHARED_LIB_SOURCES} +- ${JIT_ARCH_SOURCES} +- ) ++ add_dependencies(clrjit_obj coreclrpal gcinfo) + endif(CLR_CMAKE_HOST_UNIX) +-target_precompile_header(TARGET clrjit_static HEADER jitpch.h ADDITIONAL_INCLUDE_DIRECTORIES ${JIT_SOURCE_DIR}) ++ ++target_precompile_header(TARGET clrjit_obj HEADER jitpch.h ADDITIONAL_INCLUDE_DIRECTORIES ${JIT_SOURCE_DIR}) ++ ++add_library(clrjit_static INTERFACE) ++target_sources(clrjit_static INTERFACE $) +diff --git a/src/coreclr/src/md/ceefilegen/CMakeLists.txt b/src/coreclr/src/md/ceefilegen/CMakeLists.txt +index 90749c806b2..fd0f8424d97 100644 +--- a/src/coreclr/src/md/ceefilegen/CMakeLists.txt ++++ b/src/coreclr/src/md/ceefilegen/CMakeLists.txt +@@ -25,8 +25,11 @@ if (CLR_CMAKE_TARGET_WIN32) + list(APPEND CEEFILEGEN_SOURCES ${CEEFILEGEN_HEADERS}) + endif (CLR_CMAKE_TARGET_WIN32) + +-add_library_clr(ceefgen +- STATIC ++add_library_clr(ceefgen_obj ++ OBJECT + ${CEEFILEGEN_SOURCES} + ) +-target_precompile_header(TARGET ceefgen HEADER stdafx.h) ++target_precompile_header(TARGET ceefgen_obj HEADER stdafx.h) ++ ++add_library(ceefgen INTERFACE) ++target_sources(ceefgen INTERFACE $) +diff --git a/src/coreclr/src/md/compiler/CMakeLists.txt b/src/coreclr/src/md/compiler/CMakeLists.txt +index 3b916cdc9fe..f9f80db2500 100644 +--- a/src/coreclr/src/md/compiler/CMakeLists.txt ++++ b/src/coreclr/src/md/compiler/CMakeLists.txt +@@ -58,9 +58,11 @@ add_library_clr(mdcompiler_dac ${MDCOMPILER_SOURCES}) + set_target_properties(mdcompiler_dac PROPERTIES DAC_COMPONENT TRUE) + target_precompile_header(TARGET mdcompiler_dac HEADER stdafx.h) + +-add_library_clr(mdcompiler_wks ${MDCOMPILER_SOURCES}) +-target_compile_definitions(mdcompiler_wks PRIVATE FEATURE_METADATA_EMIT_ALL) +-target_precompile_header(TARGET mdcompiler_wks HEADER stdafx.h) ++add_library_clr(mdcompiler_wks_obj OBJECT ${MDCOMPILER_SOURCES}) ++target_compile_definitions(mdcompiler_wks_obj PRIVATE FEATURE_METADATA_EMIT_ALL) ++target_precompile_header(TARGET mdcompiler_wks_obj HEADER stdafx.h) ++add_library(mdcompiler_wks INTERFACE) ++target_sources(mdcompiler_wks INTERFACE $) + + add_library_clr(mdcompiler-dbi ${MDCOMPILER_SOURCES}) + set_target_properties(mdcompiler-dbi PROPERTIES DBI_COMPONENT TRUE) +diff --git a/src/coreclr/src/md/enc/CMakeLists.txt b/src/coreclr/src/md/enc/CMakeLists.txt +index 7220736b9ca..82af8434296 100644 +--- a/src/coreclr/src/md/enc/CMakeLists.txt ++++ b/src/coreclr/src/md/enc/CMakeLists.txt +@@ -48,9 +48,11 @@ add_library_clr(mdruntimerw_dac ${MDRUNTIMERW_SOURCES}) + set_target_properties(mdruntimerw_dac PROPERTIES DAC_COMPONENT TRUE) + target_precompile_header(TARGET mdruntimerw_dac HEADER stdafx.h) + +-add_library_clr(mdruntimerw_wks ${MDRUNTIMERW_SOURCES}) +-target_compile_definitions(mdruntimerw_wks PRIVATE FEATURE_METADATA_EMIT_ALL) +-target_precompile_header(TARGET mdruntimerw_wks HEADER stdafx.h) ++add_library_clr(mdruntimerw_wks_obj OBJECT ${MDRUNTIMERW_SOURCES}) ++target_compile_definitions(mdruntimerw_wks_obj PRIVATE FEATURE_METADATA_EMIT_ALL) ++target_precompile_header(TARGET mdruntimerw_wks_obj HEADER stdafx.h) ++add_library(mdruntimerw_wks INTERFACE) ++target_sources(mdruntimerw_wks INTERFACE $) + + add_library_clr(mdruntimerw-dbi ${MDRUNTIMERW_SOURCES}) + set_target_properties(mdruntimerw-dbi PROPERTIES DBI_COMPONENT TRUE) +diff --git a/src/coreclr/src/md/hotdata/CMakeLists.txt b/src/coreclr/src/md/hotdata/CMakeLists.txt +index c6168d2a4b0..88475cb72f4 100644 +--- a/src/coreclr/src/md/hotdata/CMakeLists.txt ++++ b/src/coreclr/src/md/hotdata/CMakeLists.txt +@@ -33,8 +33,10 @@ add_library_clr(mdhotdata_dac ${MDHOTDATA_SOURCES}) + set_target_properties(mdhotdata_dac PROPERTIES DAC_COMPONENT TRUE) + target_precompile_header(TARGET mdhotdata_dac HEADER external.h) + +-add_library_clr(mdhotdata_full ${MDHOTDATA_SOURCES}) +-target_precompile_header(TARGET mdhotdata_full HEADER external.h) ++add_library_clr(mdhotdata_full_obj OBJECT ${MDHOTDATA_SOURCES}) ++target_precompile_header(TARGET mdhotdata_full_obj HEADER external.h) ++add_library(mdhotdata_full INTERFACE) ++target_sources(mdhotdata_full INTERFACE $) + + add_library_clr(mdhotdata_crossgen ${MDHOTDATA_SOURCES}) + set_target_properties(mdhotdata_crossgen PROPERTIES CROSSGEN_COMPONENT TRUE) +diff --git a/src/coreclr/src/md/runtime/CMakeLists.txt b/src/coreclr/src/md/runtime/CMakeLists.txt +index 6dc193e14a7..7e0e83f1114 100644 +--- a/src/coreclr/src/md/runtime/CMakeLists.txt ++++ b/src/coreclr/src/md/runtime/CMakeLists.txt +@@ -47,9 +47,11 @@ add_library_clr(mdruntime_dac ${MDRUNTIME_SOURCES}) + set_target_properties(mdruntime_dac PROPERTIES DAC_COMPONENT TRUE) + target_precompile_header(TARGET mdruntime_dac HEADER stdafx.h) + +-add_library_clr(mdruntime_wks ${MDRUNTIME_SOURCES}) +-target_compile_definitions(mdruntime_wks PRIVATE FEATURE_METADATA_EMIT_ALL) +-target_precompile_header(TARGET mdruntime_wks HEADER stdafx.h) ++add_library_clr(mdruntime_wks_obj OBJECT ${MDRUNTIME_SOURCES}) ++target_compile_definitions(mdruntime_wks_obj PRIVATE FEATURE_METADATA_EMIT_ALL) ++target_precompile_header(TARGET mdruntime_wks_obj HEADER stdafx.h) ++add_library(mdruntime_wks INTERFACE) ++target_sources(mdruntime_wks INTERFACE $) + + add_library_clr(mdruntime-dbi ${MDRUNTIME_SOURCES}) + set_target_properties(mdruntime-dbi PROPERTIES DBI_COMPONENT TRUE) +diff --git a/src/coreclr/src/pal/src/CMakeLists.txt b/src/coreclr/src/pal/src/CMakeLists.txt +index e7c1629d5b2..7818deef050 100644 +--- a/src/coreclr/src/pal/src/CMakeLists.txt ++++ b/src/coreclr/src/pal/src/CMakeLists.txt +@@ -256,10 +256,12 @@ add_library(coreclrpal + # > warning for library: libtracepointprovider.a the table of contents is empty (no object file members in the library define global symbols) + # + if(CLR_CMAKE_TARGET_LINUX) +- add_library(tracepointprovider +- STATIC ++ add_library(tracepointprovider_obj ++ OBJECT + misc/tracepointprovider.cpp + ) ++ add_library(tracepointprovider INTERFACE) ++ target_sources(tracepointprovider INTERFACE $) + endif(CLR_CMAKE_TARGET_LINUX) + + if(CLR_CMAKE_TARGET_OSX) +diff --git a/src/coreclr/src/pal/src/eventprovider/dummyprovider/CMakeLists.txt b/src/coreclr/src/pal/src/eventprovider/dummyprovider/CMakeLists.txt +index 39b9826d1ab..8e6968cf783 100644 +--- a/src/coreclr/src/pal/src/eventprovider/dummyprovider/CMakeLists.txt ++++ b/src/coreclr/src/pal/src/eventprovider/dummyprovider/CMakeLists.txt +@@ -1,8 +1,8 @@ +-include(FindPython) ++include(FindPythonInterp) + + set (GENERATE_SCRIPT ${CLR_DIR}/src/scripts/genDummyProvider.py) + +-set(GENERATE_COMMAND ${Python_EXECUTABLE} ${GENERATE_SCRIPT} --man ${EVENT_MANIFEST} --intermediate ${CMAKE_CURRENT_BINARY_DIR}) ++set(GENERATE_COMMAND ${PYTHON_EXECUTABLE} ${GENERATE_SCRIPT} --man ${EVENT_MANIFEST} --intermediate ${CMAKE_CURRENT_BINARY_DIR}) + + execute_process( + COMMAND ${GENERATE_COMMAND} --dry-run +diff --git a/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt b/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt +index 234dea19b75..d55dab3557f 100644 +--- a/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt ++++ b/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt +@@ -1,7 +1,7 @@ +-include(FindPython) ++include(FindPythonInterp) + set (GENERATE_SCRIPT ${CLR_DIR}/src/scripts/genLttngProvider.py) + +-set(GENERATE_COMMAND ${Python_EXECUTABLE} ${GENERATE_SCRIPT} --man ${EVENT_MANIFEST} --intermediate ${CMAKE_CURRENT_BINARY_DIR}) ++set(GENERATE_COMMAND ${PYTHON_EXECUTABLE} ${GENERATE_SCRIPT} --man ${EVENT_MANIFEST} --intermediate ${CMAKE_CURRENT_BINARY_DIR}) + + 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 ++++ b/src/coreclr/src/unwinder/CMakeLists.txt +@@ -20,8 +20,10 @@ list(APPEND UNWINDER_SOURCES + convert_to_absolute_path(UNWINDER_SOURCES ${UNWINDER_SOURCES}) + + if(CLR_CMAKE_HOST_UNIX) +- add_library_clr(unwinder_wks ${UNWINDER_SOURCES}) +- add_dependencies(unwinder_wks eventing_headers) ++ add_library_clr(unwinder_wks_obj OBJECT ${UNWINDER_SOURCES}) ++ add_dependencies(unwinder_wks_obj eventing_headers) ++ add_library(unwinder_wks INTERFACE) ++ target_sources(unwinder_wks INTERFACE $) + endif(CLR_CMAKE_HOST_UNIX) + + add_library_clr(unwinder_dac ${UNWINDER_SOURCES}) +diff --git a/src/coreclr/src/utilcode/CMakeLists.txt b/src/coreclr/src/utilcode/CMakeLists.txt +index aa28b2db603..f8082fc9076 100644 +--- a/src/coreclr/src/utilcode/CMakeLists.txt ++++ b/src/coreclr/src/utilcode/CMakeLists.txt +@@ -98,7 +98,9 @@ convert_to_absolute_path(UTILCODE_CROSSGEN_SOURCES ${UTILCODE_CROSSGEN_SOURCES}) + convert_to_absolute_path(UTILCODE_STATICNOHOST_SOURCES ${UTILCODE_STATICNOHOST_SOURCES}) + + add_library_clr(utilcode_dac STATIC ${UTILCODE_DAC_SOURCES}) +-add_library_clr(utilcode STATIC ${UTILCODE_SOURCES}) ++add_library_clr(utilcode_obj OBJECT ${UTILCODE_SOURCES}) ++add_library(utilcode INTERFACE) ++target_sources(utilcode INTERFACE $) + add_library_clr(utilcodestaticnohost STATIC ${UTILCODE_STATICNOHOST_SOURCES}) + add_library_clr(utilcode_crossgen STATIC ${UTILCODE_CROSSGEN_SOURCES}) + +@@ -106,9 +108,9 @@ if(CLR_CMAKE_HOST_UNIX) + target_link_libraries(utilcodestaticnohost nativeresourcestring) + target_link_libraries(utilcode_crossgen nativeresourcestring) + target_link_libraries(utilcode_dac nativeresourcestring) +- target_link_libraries(utilcode nativeresourcestring) ++ target_link_libraries(utilcode INTERFACE nativeresourcestring) + add_dependencies(utilcode_dac coreclrpal) +- add_dependencies(utilcode coreclrpal) ++ add_dependencies(utilcode_obj coreclrpal) + endif(CLR_CMAKE_HOST_UNIX) + + +@@ -121,10 +123,10 @@ set_target_properties(utilcode_crossgen PROPERTIES CROSSGEN_COMPONENT TRUE) + target_compile_definitions(utilcode_dac PRIVATE SELF_NO_HOST) + target_compile_definitions(utilcodestaticnohost PRIVATE SELF_NO_HOST) + add_dependencies(utilcode_dac ${UTILCODE_DEPENDENCIES}) +-add_dependencies(utilcode ${UTILCODE_DEPENDENCIES}) ++add_dependencies(utilcode_obj ${UTILCODE_DEPENDENCIES}) + add_dependencies(utilcode_crossgen ${UTILCODE_DEPENDENCIES}) + add_dependencies(utilcodestaticnohost ${UTILCODE_DEPENDENCIES}) + target_precompile_header(TARGET utilcode_dac HEADER stdafx.h) +-target_precompile_header(TARGET utilcode HEADER stdafx.h) ++target_precompile_header(TARGET utilcode_obj HEADER stdafx.h) + target_precompile_header(TARGET utilcode_crossgen HEADER stdafx.h) + target_precompile_header(TARGET utilcodestaticnohost HEADER stdafx.h) +diff --git a/src/coreclr/src/vm/CMakeLists.txt b/src/coreclr/src/vm/CMakeLists.txt +index 3e37cebdc10..2b20d7d910a 100644 +--- a/src/coreclr/src/vm/CMakeLists.txt ++++ b/src/coreclr/src/vm/CMakeLists.txt +@@ -923,7 +923,7 @@ list(APPEND VM_HEADERS_DAC + + if (CLR_CMAKE_TARGET_WIN32) + list(APPEND VM_SOURCES_WKS ${VM_HEADERS_WKS}) +- list(APPEND VM_SOURCES_WKS_ARCH_ASM ${VM_HEADERS_WKS_ARCH_ASM}) ++ list(APPEND VM_SOURCES_WKS ${VM_HEADERS_WKS_ARCH_ASM}) + list(APPEND VM_SOURCES_DAC ${VM_HEADERS_DAC}) + endif(CLR_CMAKE_TARGET_WIN32) + +diff --git a/src/coreclr/src/vm/eventing/CMakeLists.txt b/src/coreclr/src/vm/eventing/CMakeLists.txt +index 98dd158df54..e2bf024fc59 100644 +--- a/src/coreclr/src/vm/eventing/CMakeLists.txt ++++ b/src/coreclr/src/vm/eventing/CMakeLists.txt +@@ -8,12 +8,13 @@ else() + set(NEED_XPLAT_HEADER ON) + endif() + +-include(FindPython) ++include(FindPythonInterp) + + set (EventingHeaders + ${GENERATED_INCLUDE_DIR}/etmdummy.h + ${GENERATED_INCLUDE_DIR}/clretwallmain.h + ${GENERATED_INCLUDE_DIR}/clreventpipewriteevents.h ++ ${GENERATED_INCLUDE_DIR}/clrproviders.h + ) + + if (NEED_XPLAT_HEADER) +@@ -24,7 +25,7 @@ endif() + set(GENEVENTING_SCRIPT ${CLR_DIR}/src/scripts/genEventing.py) + + add_custom_target(eventing_headers +- ${Python_EXECUTABLE} ${GENEVENTING_SCRIPT} --man ${EVENT_MANIFEST} --inc ${GENERATED_INCLUDE_DIR} --dummy ${GENERATED_INCLUDE_DIR}/etmdummy.h ${NONEXTERN_ARG} ${NOXPLATHEADER_ARG} ++ ${PYTHON_EXECUTABLE} ${GENEVENTING_SCRIPT} --man ${EVENT_MANIFEST} --inc ${GENERATED_INCLUDE_DIR} --dummy ${GENERATED_INCLUDE_DIR}/etmdummy.h ${NONEXTERN_ARG} ${NOXPLATHEADER_ARG} + DEPENDS ${EVENT_MANIFEST} ${GENEVENTING_SCRIPT} + VERBATIM + ) +diff --git a/src/coreclr/src/vm/eventing/EtwProvider/CMakeLists.txt b/src/coreclr/src/vm/eventing/EtwProvider/CMakeLists.txt +index 34a067e1ec5..4c7df2fbb3c 100644 +--- a/src/coreclr/src/vm/eventing/EtwProvider/CMakeLists.txt ++++ b/src/coreclr/src/vm/eventing/EtwProvider/CMakeLists.txt +@@ -1,4 +1,4 @@ +-include(FindPython) ++include(FindPythonInterp) + + set(ETW_PROVIDER_SCRIPT ${CLR_DIR}/src/scripts/genEtwProvider.py) + +@@ -14,5 +14,5 @@ set (ETW_PROVIDER_OUTPUTS + set_source_files_properties(${ETW_PROVIDER_OUTPUTS} PROPERTIES GENERATED TRUE) + + add_custom_target(eventprovider +- ${Python_EXECUTABLE} ${ETW_PROVIDER_SCRIPT} --man ${EVENT_MANIFEST} --exc ${EVENT_EXCLUSIONS} --intermediate ${GENERATED_INCLUDE_DIR} ++ ${PYTHON_EXECUTABLE} ${ETW_PROVIDER_SCRIPT} --man ${EVENT_MANIFEST} --exc ${EVENT_EXCLUSIONS} --intermediate ${GENERATED_INCLUDE_DIR} + DEPENDS ${EVENT_MANIFEST} ${EVENT_EXCLUSIONS} ${ETW_PROVIDER_SCRIPT}) +diff --git a/src/coreclr/src/vm/eventing/eventpipe/CMakeLists.txt b/src/coreclr/src/vm/eventing/eventpipe/CMakeLists.txt +index 00b3f6f386f..00d79737e54 100644 +--- a/src/coreclr/src/vm/eventing/eventpipe/CMakeLists.txt ++++ b/src/coreclr/src/vm/eventing/eventpipe/CMakeLists.txt +@@ -1,9 +1,9 @@ +-include(FindPython) ++include(FindPythonInterp) + + set(CMAKE_INCLUDE_CURRENT_DIR ON) + + set(GENERATE_SCRIPT ${CLR_DIR}/src/scripts/genEventPipe.py) +-set(GENERATE_COMMAND ${Python_EXECUTABLE} ${GENERATE_SCRIPT} --man ${EVENT_MANIFEST} --exc ${EVENT_EXCLUSIONS} --intermediate ${CMAKE_CURRENT_BINARY_DIR} ${NONEXTERN_ARG}) ++set(GENERATE_COMMAND ${PYTHON_EXECUTABLE} ${GENERATE_SCRIPT} --man ${EVENT_MANIFEST} --exc ${EVENT_EXCLUSIONS} --intermediate ${CMAKE_CURRENT_BINARY_DIR} ${NONEXTERN_ARG}) + + execute_process( + COMMAND ${GENERATE_COMMAND} --dry-run +@@ -28,10 +28,8 @@ add_custom_command(OUTPUT ${EVENTPIPE_SOURCES} + COMMAND ${GENERATE_COMMAND} + DEPENDS ${GENERATE_SCRIPT} ${EVENT_MANIFEST} ${EVENT_EXCLUSIONS}) + +-add_library_clr(eventpipe STATIC ${EVENTPIPE_SOURCES}) +-set_target_properties(eventpipe PROPERTIES LINKER_LANGUAGE CXX) +-add_dependencies(eventpipe eventing_headers) +- +-if (NOT CLR_CMAKE_TARGET_WIN32) +- _install(TARGETS eventpipe DESTINATION lib) +-endif() ++add_library_clr(eventpipe_obj OBJECT ${EVENTPIPE_SOURCES}) ++set_target_properties(eventpipe_obj PROPERTIES LINKER_LANGUAGE CXX) ++add_dependencies(eventpipe_obj eventing_headers) ++add_library(eventpipe INTERFACE) ++target_sources(eventpipe INTERFACE $) +diff --git a/src/coreclr/src/vm/wks/CMakeLists.txt b/src/coreclr/src/vm/wks/CMakeLists.txt +index 1e94b575fd6..5d355f6adcb 100644 +--- a/src/coreclr/src/vm/wks/CMakeLists.txt ++++ b/src/coreclr/src/vm/wks/CMakeLists.txt +@@ -7,13 +7,19 @@ if (CLR_CMAKE_TARGET_WIN32) + + endif (CLR_CMAKE_TARGET_WIN32) + +-add_library_clr(cee_wks ${VM_SOURCES_WKS} ${VM_SOURCES_WKS_ARCH_ASM}) +-target_precompile_header(TARGET cee_wks HEADER common.h) ++add_library_clr(cee_wks_core OBJECT ${VM_SOURCES_WKS} ${VM_SOURCES_WKS_ARCH_ASM}) ++add_library_clr(cee_wks_obj OBJECT ${VM_SOURCES_WKS_SPECIAL}) ++ ++target_precompile_header(TARGET cee_wks_core HEADER common.h) ++target_precompile_header(TARGET cee_wks_obj HEADER common.h) ++ + if (MSVC) + # mscorlib.cpp does not compile with precompiled header file + set_source_files_properties(../mscorlib.cpp PROPERTIES COMPILE_FLAGS "/Y-") + endif() +-add_dependencies(cee_wks eventing_headers) ++ ++add_dependencies(cee_wks_core eventing_headers) ++add_dependencies(cee_wks_obj eventing_headers) + + if (CLR_CMAKE_TARGET_WIN32) + +@@ -45,8 +51,16 @@ if (CLR_CMAKE_TARGET_WIN32) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/AsmConstants.inc + ) + +- add_dependencies(cee_wks asmconstants_inc) ++ add_dependencies(cee_wks_core asmconstants_inc) ++ add_dependencies(cee_wks_obj asmconstants_inc) + + endif(NOT CLR_CMAKE_HOST_ARCH_ARM AND NOT CLR_CMAKE_HOST_ARCH_ARM64) + + endif (CLR_CMAKE_TARGET_WIN32) ++ ++add_custom_target(preprocessd_asm DEPENDS ${VM_WKS_ARCH_ASM_OBJECTS}) ++add_dependencies(cee_wks_core preprocessd_asm) ++add_dependencies(cee_wks_obj preprocessd_asm) ++ ++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 ++++ b/src/installer/corehost/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.14.2) ++cmake_minimum_required(VERSION 3.6.2) + + project(corehost) + +diff --git a/src/installer/corehost/cli/exe.cmake b/src/installer/corehost/cli/exe.cmake +index de8cd49396b..732faf97ff9 100644 +--- a/src/installer/corehost/cli/exe.cmake ++++ b/src/installer/corehost/cli/exe.cmake +@@ -5,7 +5,6 @@ + project (${DOTNET_PROJECT_NAME}) + + cmake_policy(SET CMP0011 NEW) +-cmake_policy(SET CMP0083 NEW) + + include(${CMAKE_CURRENT_LIST_DIR}/common.cmake) + +diff --git a/src/installer/corehost/cli/test/mockhostfxr/CMakeLists.txt b/src/installer/corehost/cli/test/mockhostfxr/CMakeLists.txt +index bcf6a051229..8572a6318ec 100644 +--- a/src/installer/corehost/cli/test/mockhostfxr/CMakeLists.txt ++++ b/src/installer/corehost/cli/test/mockhostfxr/CMakeLists.txt +@@ -2,7 +2,6 @@ + # The .NET Foundation licenses this file to you under the MIT license. + # See the LICENSE file in the project root for more information. + +-cmake_minimum_required (VERSION 2.6) + project(mockhostfxr_2_2) + + set(DOTNET_PROJECT_NAME "mockhostfxr_2_2") +diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt +index f14ada69fee..cb174fe5013 100644 +--- a/src/libraries/Native/Unix/CMakeLists.txt ++++ b/src/libraries/Native/Unix/CMakeLists.txt +@@ -1,19 +1,14 @@ +-cmake_minimum_required(VERSION 3.14.2) ++cmake_minimum_required(VERSION 3.6.2) ++if(CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS) ++ # CMake 3.14.5 contains bug fixes for iOS ++ cmake_minimum_required(VERSION 3.14.5) ++ endif() + cmake_policy(SET CMP0042 NEW) + + project(CoreFX C) + + include(${CLR_ENG_NATIVE_DIR}/configuretools.cmake) + +-if(CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS) +- # CMake 3.14.5 contains bug fixes for iOS +- cmake_minimum_required(VERSION 3.14.5) +-endif() +- +-if(NOT CLR_CMAKE_TARGET_ARCH_WASM) +- cmake_policy(SET CMP0083 NEW) +-endif(NOT CLR_CMAKE_TARGET_ARCH_WASM) +- + set(CMAKE_MACOSX_RPATH ON) + set(CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir}) + set(CMAKE_INCLUDE_CURRENT_DIR ON) +@@ -167,7 +162,8 @@ if(CLR_CMAKE_TARGET_UNIX) + if(NOT CLR_CMAKE_TARGET_ARCH_WASM AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS) + if(CLR_CMAKE_TARGET_OSX) + add_definitions(-DTARGET_OSX) +- add_link_options(-Wl,-bind_at_load) ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-bind_at_load") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-bind_at_load" ) + else() + add_compile_options($<$:-Wa,--noexecstack>) + if(CLR_CMAKE_TARGET_SUNOS) +@@ -175,7 +171,8 @@ if(CLR_CMAKE_TARGET_UNIX) + else() + # -z,now is required for full relro. + # see https://www.redhat.com/en/blog/hardening-elf-binaries-using-relocation-read-only-relro +- add_link_options(-Wl,--build-id=sha1 -Wl,-z,relro,-z,now) ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1 -Wl,-z,relro,-z,now") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id=sha1 -Wl,-z,relro,-z,now" ) + endif() + endif() + endif() +diff --git a/src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt +index bcfc5dd106a..ebcb5a02b3f 100644 +--- a/src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt ++++ b/src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt +@@ -79,14 +79,15 @@ if (GEN_SHARED_LIB) + install_with_stripped_symbols (System.Globalization.Native PROGRAMS .) + endif() + +-add_library(System.Globalization.Native-Static +- STATIC ++add_library(System.Globalization.Native-obj ++ OBJECT + ${NATIVEGLOBALIZATION_SOURCES} + ) + +-set_target_properties(System.Globalization.Native-Static PROPERTIES OUTPUT_NAME System.Globalization.Native CLEAN_DIRECT_OUTPUT 1) ++set_target_properties(System.Globalization.Native-obj PROPERTIES OUTPUT_NAME System.Globalization.Native CLEAN_DIRECT_OUTPUT 1) + +-install (TARGETS System.Globalization.Native-Static DESTINATION .) ++add_library(System.Globalization.Native-static INTERFACE) ++target_sources(System.Globalization.Native-static INTERFACE $) + + if(NOT CLR_CMAKE_TARGET_OSX AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND NOT CLR_CMAKE_TARGET_ANDROID) + if (GEN_SHARED_LIB) diff --git a/runtime-dont-strip.patch b/runtime-dont-strip.patch new file mode 100644 index 0000000..694face --- /dev/null +++ b/runtime-dont-strip.patch @@ -0,0 +1,47 @@ +Do not strip native/unmanaged symbols from binaries + +This is a hack. It rips out the calls to strip directly. + +The correct/upstreamable fix is to add a configure/build option to +keep symbols for some builds, such as those needed by upstream. + +diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake +index 8b73581ed14..7697908425e 100644 +--- a/eng/native/functions.cmake ++++ b/eng/native/functions.cmake +@@ -282,7 +282,7 @@ function(target_precompile_header) + endif(MSVC) + endfunction() + +-function(strip_symbols targetName outputFilename) ++function(strip_symbols_renamed targetName outputFilename) + if (CLR_CMAKE_HOST_UNIX) + set(strip_source_file $) + +@@ -336,8 +336,8 @@ function(strip_symbols targetName outputFilename) + endfunction() + + function(install_with_stripped_symbols targetName kind destination) +- strip_symbols(${targetName} symbol_file) +- install_symbols(${symbol_file} ${destination}) ++ # strip_symbols_renamed(${targetName} symbol_file) ++ # install_symbols(${symbol_file} ${destination}) + if ("${kind}" STREQUAL "TARGETS") + set(install_source ${targetName}) + elseif("${kind}" STREQUAL "PROGRAMS") +@@ -375,13 +375,13 @@ function(install_clr) + foreach(targetName ${INSTALL_CLR_TARGETS}) + list(FIND CLR_CROSS_COMPONENTS_LIST ${targetName} INDEX) + if (NOT DEFINED CLR_CROSS_COMPONENTS_LIST OR NOT ${INDEX} EQUAL -1) +- strip_symbols(${targetName} symbol_file) ++ # strip_symbols_renamed(${targetName} symbol_file) + + foreach(destination ${destinations}) + # We don't need to install the export libraries for our DLLs + # since they won't be directly linked against. + install(PROGRAMS $ DESTINATION ${destination}) +- install_symbols(${symbol_file} ${destination}) ++ # install_symbols(${symbol_file} ${destination}) + + if(CLR_CMAKE_PGO_INSTRUMENT) + if(WIN32) diff --git a/runtime-flags-support.patch b/runtime-flags-support.patch new file mode 100644 index 0000000..921e483 --- /dev/null +++ b/runtime-flags-support.patch @@ -0,0 +1,30 @@ +diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh +index b976f5fdc6c..853580b1c7a 100755 +--- a/eng/native/build-commons.sh ++++ b/eng/native/build-commons.sh +@@ -163,6 +163,14 @@ EOF + return + fi + ++ SAVED_CFLAGS="${CFLAGS}" ++ SAVED_CXXFLAGS="${CXXFLAGS}" ++ SAVED_LDFLAGS="${LDFLAGS}" ++ ++ export CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}" ++ export CXXFLAGS="${CXXFLAGS} ${EXTRA_CXXFLAGS}" ++ export LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}" ++ + if [[ "$__StaticAnalyzer" == 1 ]]; then + pushd "$intermediatesDir" + +@@ -181,6 +189,10 @@ EOF + $cmake_command --build "$intermediatesDir" --target install -- -j "$__NumProc" + fi + ++ CFLAGS="${SAVED_CFLAGS}" ++ CXXFLAGS="${SAVED_CXXFLAGS}" ++ LDFLAGS="${SAVED_LDFLAGS}" ++ + local exit_code="$?" + if [[ "$exit_code" != 0 ]]; then + echo "${__ErrMsgPrefix}Failed to build \"$message\"." diff --git a/cli-telemetry-optout.patch b/sdk-telemetry-optout.patch similarity index 82% rename from cli-telemetry-optout.patch rename to sdk-telemetry-optout.patch index 9b01f13..9b92f33 100644 --- a/cli-telemetry-optout.patch +++ b/sdk-telemetry-optout.patch @@ -1,7 +1,7 @@ -diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs +diff --git a/src/Cli/dotnet/Program.cs b/src/Cli/dotnet/Program.cs index de1ebb9e6..6bbf479de 100644 ---- a/src/dotnet/Program.cs -+++ b/src/dotnet/Program.cs +--- a/src/Cli/dotnet/Program.cs ++++ b/src/Cli/dotnet/Program.cs @@ -28,6 +28,13 @@ public class Program public static int Main(string[] args) diff --git a/sources b/sources deleted file mode 100644 index 6762903..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (dotnet-v3.1.103.2-SDK.tar.gz) = 6c4de4914f6d107e59300efb43fae24fffdbb983a5ffeb36fbe26c8071a87e76162ebde0f0aa270ab7cbb666b4ee0ab65cfab98f1dbba2ea9d48809372417ec2 diff --git a/tests/tests.yml b/tests/tests.yml index ede9095..f3825cf 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -7,20 +7,18 @@ - container - atomic repositories: - - repo: "https://github.com/redhat-developer/dotnet-bunny.git" - dest: "dotnet-bunny" - repo: "https://github.com/redhat-developer/dotnet-regular-tests.git" dest: "dotnet-regular-tests" tests: - - build_test_suite: - dir: dotnet-bunny - run: make - - print_test_suite_version: - dir: dotnet-bunny - run: bin/turkey --version - - run_regular_tests: - dir: dotnet-regular-tests - run: ../dotnet-bunny/bin/turkey -l={{ remote_artifacts }} + - download_test_runner: + dir: ./ + run: wget --no-verbose https://github.com/redhat-developer/dotnet-bunny/releases/latest/download/turkey-$(uname -m) -O turkey && chmod +x ./turkey + - print_test_runner_version: + dir: ./ + run: ./turkey --version + - regular: + dir: ./ + run: ./turkey -l={{ remote_artifacts }} -s=$(pwd)/nuget-prerelease dotnet-regular-tests required_packages: - babeltrace - bash-completion diff --git a/update-release b/update-release index d8bcde7..da87262 100755 --- a/update-release +++ b/update-release @@ -26,7 +26,7 @@ while [[ "$#" -gt 0 ]]; do esac done -spec_file=dotnet3.1.spec +spec_file=dotnet5.0.spec sdk_version=${positional_args[0]:-} if [[ -z ${sdk_version} ]]; then