From 8e244d6dc17a7864822e35cb03585ae194d1157b Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Wed, 17 Jul 2024 12:26:32 +0300
Subject: [PATCH 01/10] Use live apphost when publishing ilc as singlefile
---
eng/Subsets.props | 7 +++--
.../tools/aot/ILCompiler/ILCompiler.csproj | 27 ++++++++++---------
.../aot/crossgen2/crossgen2_publish.csproj | 2 +-
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/eng/Subsets.props b/eng/Subsets.props
index 488b8c43847c0..a20747c37bbf4 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -359,7 +359,6 @@
$(CoreClrProjectRoot)tools\AssemblyChecker\AssemblyChecker.csproj" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true'"/>
-
@@ -523,13 +522,17 @@
+
+
+
+
+
-
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
index ffab9cbb1289b..1ec3f48e9c5c9 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -1,18 +1,28 @@
$(RuntimeBinDir)ilc/
- $(PackageRID)
+ $(OutputRID)
+
+
+ $(PackageRID)
-
+
+ true
+
+
+
+
+
$(RuntimeBinDir)ilc-published/
true
$(ROOTFS_DIR)
- true
+ true
true
true
true
@@ -88,15 +98,6 @@
+ DependsOnTargets="Publish" />
-
-
-
-
-
-
-
diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
index aebad93eae08e..5d2bf85bfd117 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
@@ -8,7 +8,7 @@
true
- $(PackageRID)
+ $(OutputRID)
true
$(NetCoreAppCurrent)
true
From 93c6d8820dc4908faec7c559e2235eb7873756b6 Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Wed, 17 Jul 2024 18:44:25 +0300
Subject: [PATCH 02/10] Block ILCompiler.csproj build on mobile
---
eng/Subsets.props | 2 +-
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 10 +++-------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/eng/Subsets.props b/eng/Subsets.props
index a20747c37bbf4..993c2218355e0 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -524,7 +524,7 @@
-
+
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
index 1ec3f48e9c5c9..fc9ee28c871aa 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -2,18 +2,14 @@
$(RuntimeBinDir)ilc/
$(OutputRID)
-
-
- $(PackageRID)
-
+
true
-
-
+
+
From b00efada2f7a949e483858210fc89aa96f06e935 Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Wed, 17 Jul 2024 18:46:57 +0300
Subject: [PATCH 03/10] Invert condition
---
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
index fc9ee28c871aa..aee226edcbb24 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -8,8 +8,8 @@
true
-
-
+
+
From 351856c73283c6b451aec83c055e4decf8030931 Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Thu, 29 Aug 2024 22:44:10 +0300
Subject: [PATCH 04/10] Limit the scope of build order
---
eng/Subsets.props | 13 +++++--------
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 5 +----
src/installer/pkg/projects/netcoreappRIDs.props | 4 +++-
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/eng/Subsets.props b/eng/Subsets.props
index 993c2218355e0..de41346b42e02 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -123,6 +123,7 @@
<_NativeAotSupportedArch Condition="'$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'loongarch64' or ('$(TargetOS)' == 'windows' and '$(TargetArchitecture)' == 'x86')">true
true
true
+ true
true
@@ -359,6 +360,7 @@
$(CoreClrProjectRoot)tools\AssemblyChecker\AssemblyChecker.csproj" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true'"/>
+
@@ -522,17 +524,13 @@
-
-
-
-
-
+
@@ -540,13 +538,12 @@
-
-
-
+
+
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
index aee226edcbb24..b6f1f106ad586 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -2,10 +2,7 @@
$(RuntimeBinDir)ilc/
$(OutputRID)
-
-
-
- true
+ true
diff --git a/src/installer/pkg/projects/netcoreappRIDs.props b/src/installer/pkg/projects/netcoreappRIDs.props
index 6c84841697b42..b75b0381b902f 100644
--- a/src/installer/pkg/projects/netcoreappRIDs.props
+++ b/src/installer/pkg/projects/netcoreappRIDs.props
@@ -50,7 +50,9 @@
built during official builds, however we wish to include them
in our runtime.json to enable others to provide them. -->
-
+
+ arm64
+
armel
From 97a06865177e64583678c317630b19746520a074 Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Fri, 13 Sep 2024 09:05:00 +0300
Subject: [PATCH 05/10] Address CR feedback
---
eng/Subsets.props | 8 ++++----
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/eng/Subsets.props b/eng/Subsets.props
index de41346b42e02..488b8c43847c0 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -123,7 +123,6 @@
<_NativeAotSupportedArch Condition="'$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'loongarch64' or ('$(TargetOS)' == 'windows' and '$(TargetArchitecture)' == 'x86')">true
true
true
- true
true
@@ -360,7 +359,7 @@
$(CoreClrProjectRoot)tools\AssemblyChecker\AssemblyChecker.csproj" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true'"/>
-
+
@@ -538,12 +537,13 @@
+
+
+
-
-
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
index 128a699dceb46..64eeb1ad8ec37 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -10,7 +10,6 @@
-
$(RuntimeBinDir)ilc-published/
true
From d46a6fd07af92b2b67720e1a4f37192a5c7a63aa Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Fri, 13 Sep 2024 12:22:49 +0300
Subject: [PATCH 06/10] Update
src/coreclr/tools/aot/ILCompiler/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 64eeb1ad8ec37..c3c1fb0196c05 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -2,7 +2,7 @@
$(RuntimeBinDir)ilc/
$(OutputRID)
- true
+ true
From 713e9ec04b9da598d6fde80b6c23d82e53e60efd Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:02:19 +0300
Subject: [PATCH 07/10] Update RID
---
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
index c3c1fb0196c05..47b53eb2f5ba9 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -1,7 +1,8 @@
$(RuntimeBinDir)ilc/
- $(OutputRID)
+ $(PackageRID)
+ $(OutputRID)
true
From 8be0a6a63b795d9e1e215754cd7c29e0592747e4 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Fri, 13 Sep 2024 19:11:49 +0300
Subject: [PATCH 08/10] Use first step in CI (for now)
---
eng/pipelines/runtime.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 8426c37b2061b..e319be8597b3c 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -519,7 +519,7 @@ extends:
jobParameters:
testScope: innerloop
nameSuffix: CoreCLR
- buildArgs: -s clr+libs+host+packs -c $(_BuildConfig) -rc Checked
+ buildArgs: -s clr+libs+host+packs -c $(_BuildConfig) -rc Checked -p:NativeAotSupported=false
timeoutInMinutes: 120
condition: >-
or(
From 46843611869fb51eb3932b76e10953e4739407bf Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Fri, 13 Sep 2024 21:14:16 +0300
Subject: [PATCH 09/10] Add postBuildSteps for step 2
---
eng/pipelines/runtime.yml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index e319be8597b3c..0e42f6f32721a 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -521,6 +521,20 @@ extends:
nameSuffix: CoreCLR
buildArgs: -s clr+libs+host+packs -c $(_BuildConfig) -rc Checked -p:NativeAotSupported=false
timeoutInMinutes: 120
+ postBuildSteps:
+ - template: /eng/pipelines/common/platform-matrix.yml
+ parameters:
+ jobTemplate: /eng/pipelines/common/global-build-job.yml
+ helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+ buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
+ runtimeFlavor: coreclr
+ platforms:
+ - freebsd_x64
+ jobParameters:
+ testScope: innerloop
+ nameSuffix: CoreCLR
+ buildArgs: -s clr.tools+packs -c $(_BuildConfig) -rc Checked
+ timeoutInMinutes: 120
condition: >-
or(
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
From 590332111b8483cdfda9217424077aedc25b5fd7 Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Fri, 13 Sep 2024 21:28:36 +0300
Subject: [PATCH 10/10] fix
---
eng/pipelines/runtime.yml | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 0e42f6f32721a..c62e31d205fd7 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -522,19 +522,8 @@ extends:
buildArgs: -s clr+libs+host+packs -c $(_BuildConfig) -rc Checked -p:NativeAotSupported=false
timeoutInMinutes: 120
postBuildSteps:
- - template: /eng/pipelines/common/platform-matrix.yml
- parameters:
- jobTemplate: /eng/pipelines/common/global-build-job.yml
- helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
- buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
- runtimeFlavor: coreclr
- platforms:
- - freebsd_x64
- jobParameters:
- testScope: innerloop
- nameSuffix: CoreCLR
- buildArgs: -s clr.tools+packs -c $(_BuildConfig) -rc Checked
- timeoutInMinutes: 120
+ - script: $(Build.SourcesDirectory)/build$(scriptExt) ${{ variables.debugOnPrReleaseOnRolling }} -s clr.tools+packs -c $(_BuildConfig) -rc Checked -cross -os freebsd
+ displayName: Build clr.tools and packs
condition: >-
or(
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),