From 358eda163d7102413c95617fcda2e364d9545a58 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sat, 15 Jun 2024 00:16:30 -0700 Subject: [PATCH 01/10] Build a .dll if 'CustomNativeMain' is set --- .../Microsoft.NETCore.Native.Windows.targets | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets index 18c3c1f017a9ff..31ba18e32fe9ea 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets @@ -84,19 +84,19 @@ The .NET Foundation licenses this file to you under the MIT license. - + - - + + - + From e539a5b7db311817549480634a18eec81bf099cc Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sat, 15 Jun 2024 10:22:07 -0700 Subject: [PATCH 02/10] Merge the stack size linker arg --- .../BuildIntegration/Microsoft.NETCore.Native.Windows.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets index 31ba18e32fe9ea..19b78cab57874a 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets @@ -92,11 +92,10 @@ The .NET Foundation licenses this file to you under the MIT license. - + - From 853789cee52040c06976a8f90bd45f87805250d8 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sat, 15 Jun 2024 10:36:48 -0700 Subject: [PATCH 03/10] Switch on 'NativeLib' instead for .exe args --- .../Microsoft.NETCore.Native.Windows.targets | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets index 19b78cab57874a..6d29d0e3619e8c 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets @@ -23,7 +23,7 @@ The .NET Foundation licenses this file to you under the MIT license. Runtime.WorkstationGC Runtime.ServerGC bootstrapper - bootstrapperdll + bootstrapperdll Runtime.VxsortEnabled Runtime.VxsortDisabled standalonegc-disabled @@ -84,15 +84,15 @@ The .NET Foundation licenses this file to you under the MIT license. - + - - + + From d7d2b30aa30412d1e8a0628b1114b63331bb68ca Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sat, 15 Jun 2024 10:42:46 -0700 Subject: [PATCH 04/10] Update Microsoft.NETCore.Native.Unix.targets --- .../BuildIntegration/Microsoft.NETCore.Native.Unix.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets index d3dc85e04f82e4..b65c9bb1001b86 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets @@ -122,8 +122,8 @@ The .NET Foundation licenses this file to you under the MIT license. - - + + From b63a47a6b0d0ac98af5686f38a38bed187e7fe43 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sat, 15 Jun 2024 11:08:54 -0700 Subject: [PATCH 05/10] Simplify linker subsystem and .exe args Co-authored-by: Jan Kotas --- .../BuildIntegration/Microsoft.NETCore.Native.Windows.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets index 6d29d0e3619e8c..01b097af8e3ae3 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets @@ -91,8 +91,8 @@ The .NET Foundation licenses this file to you under the MIT license. - - + + From d469bbdc754c70a7c4503611fce6171701cc35a3 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sat, 15 Jun 2024 13:12:14 -0700 Subject: [PATCH 06/10] Revert changes to Unix .targets --- .../BuildIntegration/Microsoft.NETCore.Native.Unix.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets index b65c9bb1001b86..d3dc85e04f82e4 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets @@ -122,8 +122,8 @@ The .NET Foundation licenses this file to you under the MIT license. - - + + From 859cde129b88ec10572b7ebd490e262fd3c04b9e Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Sat, 15 Jun 2024 17:58:37 -0700 Subject: [PATCH 07/10] Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets --- .../BuildIntegration/Microsoft.NETCore.Native.Windows.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets index 01b097af8e3ae3..30cb894715d264 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets @@ -91,7 +91,7 @@ The .NET Foundation licenses this file to you under the MIT license. - + From 20c4b52f024baf7bb547740ef4f5fbc1d929d3c6 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Sat, 15 Jun 2024 18:16:22 -0700 Subject: [PATCH 08/10] Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets --- .../BuildIntegration/Microsoft.NETCore.Native.Windows.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets index 30cb894715d264..064e4e2a9001d0 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets @@ -23,7 +23,7 @@ The .NET Foundation licenses this file to you under the MIT license. Runtime.WorkstationGC Runtime.ServerGC bootstrapper - bootstrapperdll + bootstrapperdll Runtime.VxsortEnabled Runtime.VxsortDisabled standalonegc-disabled From 26a094bff5cba2ae5292572d307aaf595fa54275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Wed, 19 Jun 2024 07:34:29 +0200 Subject: [PATCH 09/10] Update Microsoft.NETCore.Native.Windows.targets --- .../BuildIntegration/Microsoft.NETCore.Native.Windows.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets index 064e4e2a9001d0..7d26a09262915b 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets @@ -91,7 +91,7 @@ The .NET Foundation licenses this file to you under the MIT license. - + From 03717000131ac8fac617e0651bc1e48d7d7b0738 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Fri, 19 Jul 2024 13:16:55 -0700 Subject: [PATCH 10/10] Actually output a .dll if 'NativeLib' is set --- .../nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets index 6e74ee24ca8a55..9f210a00880b77 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets @@ -62,7 +62,7 @@ The .NET Foundation licenses this file to you under the MIT license. $(NativeObjectExt) - true + true .exe