From 9a05b184f74fc299ddd33bccb74d153e0692d8c8 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Wed, 14 Sep 2022 11:06:42 +0200 Subject: [PATCH 1/8] source-build: support building runtime using non-portable runtime packages. Currently source-build performs a 'runtime-portable' build that produces 'linux-{arch}' packages that are used when building target runtime (non-portable). With this change, we can use the non-portable packages that are produced by a previous (non-portable) 'runtime' build. This helps eliminate the 'runtime-portable' build. --- Directory.Build.targets | 13 +++++++++++++ src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 541cdfb59f27f9..e65b8ba38302c0 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -7,6 +7,19 @@ false + + + + %(KnownFrameworkReference.RuntimePackRuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier) + + + %(KnownCrossgen2Pack.Crossgen2RuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier) + + + diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj index 1614166ff4ff2c..14c875d5e052f5 100644 --- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj +++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj @@ -13,7 +13,7 @@ $(RuntimeBinDir)ilc-published/ true - true + true true From 73d3229039b104bd77aae328732521d9e0828030 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Thu, 15 Sep 2022 09:05:46 +0200 Subject: [PATCH 2/8] Avoid references to Microsoft.AspNetCore.App.. --- Directory.Build.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Directory.Build.targets b/Directory.Build.targets index e65b8ba38302c0..79b0f28516df10 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -18,6 +18,8 @@ %(KnownCrossgen2Pack.Crossgen2RuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier) + + From 10be2744e624b833c43eecbf3f6f6896d415b7d7 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Tue, 20 Sep 2022 08:14:44 +0200 Subject: [PATCH 3/8] crossgen2: set RuntimeIdentifier explicitly. --- src/coreclr/tools/aot/crossgen2/crossgen2.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj index 12864a2341ee8e..ac2a5f71c178a3 100644 --- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj +++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj @@ -10,7 +10,8 @@ true linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm - $(PackageRID) + $(PackageRID) + false false true From 4e5e662e7690f7ab35b2ee2a5e07ef0e4c6e349e Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Wed, 28 Sep 2022 06:58:53 +0200 Subject: [PATCH 4/8] PR feedback --- Directory.Build.targets | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 79b0f28516df10..a2807d6cc2cf28 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -7,26 +7,26 @@ false + + + + + - + - %(KnownFrameworkReference.RuntimePackRuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier) + $(PackageRID) - %(KnownCrossgen2Pack.Crossgen2RuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier) + $(PackageRID) - - - - - true linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm - $(PackageRID) - false + $(PackageRID) false true From 04b68cbd25dcbe04ece08a6bc17c608054f91f88 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Wed, 28 Sep 2022 18:21:14 +0200 Subject: [PATCH 6/8] PR feedback. --- Directory.Build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index a2807d6cc2cf28..244569df0c2a37 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -17,10 +17,10 @@ for Microsoft.NETCore.App.Runtime. and Microsoft.NETCore.App.Crossgen2.. --> - + $(PackageRID) - + $(PackageRID) From 997ded92244b09c24b5580a4cf50dd0cfc7bd834 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Sat, 8 Oct 2022 08:12:29 +0200 Subject: [PATCH 7/8] Revert changes to ILCompiler.csproj. --- src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj index 14c875d5e052f5..1614166ff4ff2c 100644 --- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj +++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj @@ -13,7 +13,7 @@ $(RuntimeBinDir)ilc-published/ true - true + true true From cefa413cc8d3bbc1dc7e86fcdbaeff1a2717831a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 12 Oct 2022 10:43:23 +0200 Subject: [PATCH 8/8] Update Directory.Build.targets --- Directory.Build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 244569df0c2a37..ef9e5f5810c7fa 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -16,8 +16,8 @@ When .NET gets built from source, make the SDK aware there are bootstrap packages for Microsoft.NETCore.App.Runtime. and Microsoft.NETCore.App.Crossgen2.. --> - - + + $(PackageRID)