From 6b198197f8c4a3a558121408ad960c50f3af3fc6 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Wed, 7 Aug 2024 20:00:46 +0200 Subject: [PATCH 01/42] Pack MIBC files --- src/Directory.Build.props | 65 +++++++++++++++++++ src/Directory.Build.targets | 29 +++++++++ .../Microsoft.FSharp.Compiler.fsproj | 1 + .../Microsoft.FSharp.Compiler.nuspec | 5 +- 4 files changed, 99 insertions(+), 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 68eba530bc9..f81380e0d3b 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -9,4 +9,69 @@ false + + linux + osx + windows + + $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) + + + + + + $([System.IO.Path]::Combine($(ArtifactsDir), 'mibc')) + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 5937c5678c8..0ed5014cc11 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,4 +1,33 @@ + + + + + + $([System.IO.Path]::Combine($(NuGetPackageRoot), %(MIBCPackage.Identity), %(MIBCPackage.Version))) + + + + + + + + + + + + + + diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj index 48865a60de5..5aa2d84a268 100644 --- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj +++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj @@ -26,6 +26,7 @@ + diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec index fed8e38fae3..657262b66a7 100644 --- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec +++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec @@ -43,7 +43,10 @@ - + + + + From 3f3153fa3bace43a8729955d75bf5a0a47bdf2c9 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Thu, 8 Aug 2024 19:30:45 +0200 Subject: [PATCH 02/42] Update Directory.Build.targets --- src/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 0ed5014cc11..8aad931e028 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -2,7 +2,7 @@ - + From afe74e3030c345ade316428194046ee2a65961ac Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 8 Aug 2024 15:28:01 -0700 Subject: [PATCH 03/42] temp --- NuGet.config | 2 ++ src/Directory.Build.props | 51 ------------------------------------- src/Directory.Build.targets | 29 --------------------- src/fsc/fsc.targets | 26 +++++++++++++++++++ 4 files changed, 28 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index 72a88909ad8..e348c8b6abe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,8 @@ + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index f81380e0d3b..09d4f88b864 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,56 +22,5 @@ $([System.IO.Path]::Combine($(ArtifactsDir), 'mibc')) - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 8aad931e028..5937c5678c8 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,33 +1,4 @@ - - - - - - $([System.IO.Path]::Combine($(NuGetPackageRoot), %(MIBCPackage.Identity), %(MIBCPackage.Version))) - - - - - - - - - - - - - - diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets index 1c67ceb393a..5bd78cbd7e3 100644 --- a/src/fsc/fsc.targets +++ b/src/fsc/fsc.targets @@ -44,6 +44,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -52,6 +74,10 @@ + + + + From efa30cbb8c28d91219b433a40ac4b456f15fe209 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 8 Aug 2024 20:03:51 -0700 Subject: [PATCH 04/42] temp --- src/fsc/fsc.targets | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets index 5bd78cbd7e3..b250e1a528f 100644 --- a/src/fsc/fsc.targets +++ b/src/fsc/fsc.targets @@ -46,23 +46,19 @@ - - - - - + + + + + - - - - - - + + + - - + @@ -77,7 +73,20 @@ - + + + + + + + + + +Code language: HTML, XML (xml) + + From 11b14abe774fe265fc8bbbef199f5dac6890c5f0 Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Fri, 9 Aug 2024 02:35:41 -0700 Subject: [PATCH 05/42] mibc copies --- src/fsc/fsc.targets | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets index b250e1a528f..f5be3ab1a34 100644 --- a/src/fsc/fsc.targets +++ b/src/fsc/fsc.targets @@ -46,22 +46,21 @@ - - - - - + + + + + - - - + + + - + - @@ -76,17 +75,15 @@ - - + + + - + - -Code language: HTML, XML (xml) - - From f6ebb7bfcba83e1bf86c27720ab14895279bdb71 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Fri, 9 Aug 2024 12:59:24 +0200 Subject: [PATCH 06/42] Update fsc.targets --- src/fsc/fsc.targets | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets index f5be3ab1a34..8d5cc47f229 100644 --- a/src/fsc/fsc.targets +++ b/src/fsc/fsc.targets @@ -45,20 +45,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + From 22977e512d41a4dc9824bae61202edfe3dd78a4a Mon Sep 17 00:00:00 2001 From: psfinaki Date: Fri, 9 Aug 2024 15:12:50 +0200 Subject: [PATCH 07/42] Update SourceBuildPrebuiltBaseline.xml --- eng/SourceBuildPrebuiltBaseline.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 4416e9693af..5d57c591b21 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -25,5 +25,8 @@ + + + From f101b74e8173e6afd3551e0193eb327047aeb9a1 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Fri, 9 Aug 2024 15:17:34 +0200 Subject: [PATCH 08/42] only F# --- src/Directory.Build.props | 2 -- src/fsc/fsc.targets | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 09d4f88b864..fadf53933da 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -17,8 +17,6 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) - - $([System.IO.Path]::Combine($(ArtifactsDir), 'mibc')) diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets index 8d5cc47f229..cc3e2d1e086 100644 --- a/src/fsc/fsc.targets +++ b/src/fsc/fsc.targets @@ -80,7 +80,7 @@ - + Date: Fri, 9 Aug 2024 15:44:59 +0200 Subject: [PATCH 09/42] Update SourceBuildPrebuiltBaseline.xml --- eng/SourceBuildPrebuiltBaseline.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 5d57c591b21..20136c6db38 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -27,6 +27,6 @@ - + From 9bff2d8b7cc13616ebea301720844db0bf67f5ef Mon Sep 17 00:00:00 2001 From: psfinaki Date: Fri, 9 Aug 2024 16:00:23 +0200 Subject: [PATCH 10/42] Update SourceBuildPrebuiltBaseline.xml --- eng/SourceBuildPrebuiltBaseline.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 20136c6db38..62eea5da651 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -25,8 +25,10 @@ - - - + + + + + From 1cdb4885d3a870c29cfc25a873ee4fdf1232cd1a Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Mon, 12 Aug 2024 16:05:34 +0200 Subject: [PATCH 11/42] Fix --- Directory.Build.targets | 28 +++++++++++++++ src/Directory.Build.props | 12 ------- .../Microsoft.FSharp.Compiler.fsproj | 2 +- src/fsc/fsc.targets | 36 ------------------- 4 files changed, 29 insertions(+), 49 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 8a1a1fa4a3f..56003cc0292 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -3,6 +3,34 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index fadf53933da..68eba530bc9 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -9,16 +9,4 @@ false - - linux - osx - windows - - $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) - - - - $([System.IO.Path]::Combine($(ArtifactsDir), 'mibc')) - - diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj index 5aa2d84a268..cf32143763b 100644 --- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj +++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj @@ -26,7 +26,7 @@ - + diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets index cc3e2d1e086..a392c183c35 100644 --- a/src/fsc/fsc.targets +++ b/src/fsc/fsc.targets @@ -44,26 +44,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -72,21 +52,5 @@ - - - - - - - - - - - - - From 15a855a0c53b327925f0099698498e8eb5788a4f Mon Sep 17 00:00:00 2001 From: psfinaki Date: Mon, 12 Aug 2024 15:24:36 +0200 Subject: [PATCH 12/42] don't bother for specific OS and stuff --- src/Directory.Build.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 68eba530bc9..52ec993ed4c 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -9,4 +9,8 @@ false + + $([System.IO.Path]::Combine($(ArtifactsDir), 'mibc')) + + From 04d46e80c215f4bea06ba3dd02545a66771419c1 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Mon, 12 Aug 2024 16:03:15 +0200 Subject: [PATCH 13/42] Update SourceBuildPrebuiltBaseline.xml --- eng/SourceBuildPrebuiltBaseline.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 62eea5da651..d21ba1535f0 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -25,10 +25,8 @@ + + + - - - - - From 217d0e746226473eb009a66bdde239579da95fc7 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Mon, 12 Aug 2024 16:12:32 +0200 Subject: [PATCH 14/42] Add forgotten applying to proto --- src/fsc/fscProject/fsc.fsproj | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj index 889ece967ad..db9934cb7ab 100644 --- a/src/fsc/fscProject/fsc.fsproj +++ b/src/fsc/fscProject/fsc.fsproj @@ -9,9 +9,18 @@ + linux + osx + windows_nt + $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) + $(MibcTargetOS)-$(MibcTargetArchitecture) + + $(ArtifactsDir)\mibc\optimization.$(MibcCurrentMachineArcitecture).mibc.runtime\DotNet_FSharp.mibc + $(FSharpNetCoreProductTargetFramework) $(EnablePublishReadyToRun) $(NETCoreSdkRuntimeIdentifier) + $(MibcFile) @@ -24,6 +33,10 @@ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ + + + + From c46454e71f1590f5801bde4649c44b6baa58f353 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Mon, 12 Aug 2024 16:14:46 +0200 Subject: [PATCH 15/42] Use linux pgo on mac --- src/fsc/fscProject/fsc.fsproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj index db9934cb7ab..305b519a215 100644 --- a/src/fsc/fscProject/fsc.fsproj +++ b/src/fsc/fscProject/fsc.fsproj @@ -10,7 +10,8 @@ linux - osx + + linux windows_nt $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) $(MibcTargetOS)-$(MibcTargetArchitecture) From 869e3ae5b6f3fc476c6ec0ea5f5334c709089e2d Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Mon, 12 Aug 2024 16:31:16 +0200 Subject: [PATCH 16/42] fix locking files --- Directory.Build.targets | 5 +++++ src/fsc/fscProject/fsc.fsproj | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 56003cc0292..189c5c98547 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -29,6 +29,11 @@ SourceFiles="@(MibcFiles)" DestinationFolder="$(ArtifactsDir)\mibc\%(MibcPackage.Identity)\" SkipUnchangedFiles="true" /> + + diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj index 305b519a215..7583d3ea606 100644 --- a/src/fsc/fscProject/fsc.fsproj +++ b/src/fsc/fscProject/fsc.fsproj @@ -16,7 +16,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) $(MibcTargetOS)-$(MibcTargetArchitecture) - $(ArtifactsDir)\mibc\optimization.$(MibcCurrentMachineArcitecture).mibc.runtime\DotNet_FSharp.mibc + $(ArtifactsDir)\mibc-proto\optimization.$(MibcCurrentMachineArcitecture).mibc.runtime\DotNet_FSharp.mibc $(FSharpNetCoreProductTargetFramework) $(EnablePublishReadyToRun) From 0386c3b43c121306574d401dee6d4a3f60548a1d Mon Sep 17 00:00:00 2001 From: psfinaki Date: Mon, 12 Aug 2024 18:00:56 +0200 Subject: [PATCH 17/42] Try something --- Directory.Build.targets | 18 +++++++++++++++--- src/fsc/fsc.targets | 1 + src/fsc/fscProject/fsc.fsproj | 4 ---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 189c5c98547..97f0ce2f74b 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -16,11 +16,12 @@ - + + BeforeTargets="CopyPackageFilesToProto"> + @@ -29,7 +30,18 @@ SourceFiles="@(MibcFiles)" DestinationFolder="$(ArtifactsDir)\mibc\%(MibcPackage.Identity)\" SkipUnchangedFiles="true" /> - + + + + + + + + + + diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj index 7583d3ea606..f3daad4132e 100644 --- a/src/fsc/fscProject/fsc.fsproj +++ b/src/fsc/fscProject/fsc.fsproj @@ -34,10 +34,6 @@ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ - - - - From d4062e99533d18eacb3cb4dccf8d8f73d7c4edd2 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Mon, 12 Aug 2024 18:58:33 +0200 Subject: [PATCH 18/42] revert --- Directory.Build.targets | 18 +++--------------- src/fsc/fscProject/fsc.fsproj | 4 ++++ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 97f0ce2f74b..189c5c98547 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -16,12 +16,11 @@ - + - + BeforeTargets="Build;Pack"> @@ -30,18 +29,7 @@ SourceFiles="@(MibcFiles)" DestinationFolder="$(ArtifactsDir)\mibc\%(MibcPackage.Identity)\" SkipUnchangedFiles="true" /> - - - - - - - - - + $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ + + + + From 9ce5b09047c7a23adf08658b3ec010ab2d6c136d Mon Sep 17 00:00:00 2001 From: psfinaki Date: Wed, 14 Aug 2024 17:05:27 +0200 Subject: [PATCH 19/42] up --- Directory.Build.targets | 33 -------------------------- eng/restore/optimizationData.targets | 35 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 33 deletions(-) create mode 100644 eng/restore/optimizationData.targets diff --git a/Directory.Build.targets b/Directory.Build.targets index 189c5c98547..8a1a1fa4a3f 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -3,39 +3,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets new file mode 100644 index 00000000000..cd5425b29ac --- /dev/null +++ b/eng/restore/optimizationData.targets @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 0d56b9788a7a917e871ae0c14ae8d83ab9c2d3bf Mon Sep 17 00:00:00 2001 From: psfinaki Date: Wed, 14 Aug 2024 17:11:14 +0200 Subject: [PATCH 20/42] up --- eng/SourceBuildPrebuiltBaseline.xml | 2 +- eng/restore/optimizationData.targets | 2 +- src/Directory.Build.props | 4 ---- .../Microsoft.FSharp.Compiler.nuspec | 4 ++-- src/fsc/fscProject/fsc.fsproj | 1 - 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index d21ba1535f0..d9c80333a81 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -25,7 +25,7 @@ - + diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets index cd5425b29ac..16475c5a35b 100644 --- a/eng/restore/optimizationData.targets +++ b/eng/restore/optimizationData.targets @@ -17,7 +17,7 @@ Name="CopyPackageFiles" AfterTargets="Restore" BeforeTargets="Build;Pack"> - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 52ec993ed4c..68eba530bc9 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -9,8 +9,4 @@ false - - $([System.IO.Path]::Combine($(ArtifactsDir), 'mibc')) - - diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec index 657262b66a7..4322ee7d965 100644 --- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec +++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec @@ -43,10 +43,10 @@ - + - + diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj index 7583d3ea606..8bd158e81e0 100644 --- a/src/fsc/fscProject/fsc.fsproj +++ b/src/fsc/fscProject/fsc.fsproj @@ -15,7 +15,6 @@ windows_nt $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) $(MibcTargetOS)-$(MibcTargetArchitecture) - $(ArtifactsDir)\mibc-proto\optimization.$(MibcCurrentMachineArcitecture).mibc.runtime\DotNet_FSharp.mibc $(FSharpNetCoreProductTargetFramework) From aca86c30ab65e5725debca467388768f2d2660c4 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Wed, 14 Aug 2024 17:28:24 +0200 Subject: [PATCH 21/42] try something --- Directory.Build.targets | 4 +++- eng/restore/optimizationData.targets | 6 +----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 8a1a1fa4a3f..dca3137e64f 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -2,6 +2,7 @@ + - - + From c4acbd0c5bbb3a5f26b18e91ab3f5d423ca41f28 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Wed, 14 Aug 2024 18:28:09 +0200 Subject: [PATCH 22/42] Update Directory.Build.targets --- Directory.Build.targets | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index dca3137e64f..f6e1d340e29 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -2,7 +2,6 @@ - @@ -20,12 +20,12 @@ \ No newline at end of file diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj index 8bd158e81e0..fe040990b6c 100644 --- a/src/fsc/fscProject/fsc.fsproj +++ b/src/fsc/fscProject/fsc.fsproj @@ -15,7 +15,7 @@ windows_nt $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) $(MibcTargetOS)-$(MibcTargetArchitecture) - $(ArtifactsDir)\mibc-proto\optimization.$(MibcCurrentMachineArcitecture).mibc.runtime\DotNet_FSharp.mibc + $(ArtifactsDir)mibc-proto\optimization.$(MibcCurrentMachineArcitecture).mibc.runtime\DotNet_FSharp.mibc $(FSharpNetCoreProductTargetFramework) $(EnablePublishReadyToRun) From f349e6a204cf778f01c1e7893e6aa3e8d03360da Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Mon, 19 Aug 2024 16:36:16 +0200 Subject: [PATCH 24/42] Pass arguments explicitly --- Directory.Build.targets | 9 +++++++-- eng/restore/optimizationData.targets | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 14372c4e8c6..b22f93d10f3 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -37,7 +37,12 @@ - - + + diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets index 9542635b3a0..e09a0ad6de2 100644 --- a/eng/restore/optimizationData.targets +++ b/eng/restore/optimizationData.targets @@ -6,7 +6,7 @@ - + @@ -16,12 +16,12 @@ - + + SkipUnchangedFiles="true" /> Date: Mon, 19 Aug 2024 17:24:21 +0200 Subject: [PATCH 25/42] Have an explicit task in proto --- proto.proj | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/proto.proj b/proto.proj index 2d07b389fa6..63c8ffcd029 100644 --- a/proto.proj +++ b/proto.proj @@ -33,4 +33,13 @@ + + + + From beacded63f3548ff91f0b988acc30c0fe3a4173c Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Mon, 19 Aug 2024 17:27:11 +0200 Subject: [PATCH 26/42] Have an explicit task in proto --- proto.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto.proj b/proto.proj index 63c8ffcd029..f51a8776bb8 100644 --- a/proto.proj +++ b/proto.proj @@ -36,7 +36,7 @@ From 2b6259bd979a4eb1bdf8529fe5e5a60a67794904 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Mon, 19 Aug 2024 18:31:48 +0200 Subject: [PATCH 27/42] Should be good now? --- Directory.Build.targets | 13 ++++++++++--- eng/restore/optimizationData.targets | 4 ---- proto.proj | 9 --------- src/fsc/fscProject/fsc.fsproj | 2 +- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index b22f93d10f3..8aed019a00f 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -37,12 +37,19 @@ - + + + + + + + + diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets index e09a0ad6de2..5a525bd99c1 100644 --- a/eng/restore/optimizationData.targets +++ b/eng/restore/optimizationData.targets @@ -8,10 +8,6 @@ - - - - diff --git a/proto.proj b/proto.proj index f51a8776bb8..2d07b389fa6 100644 --- a/proto.proj +++ b/proto.proj @@ -33,13 +33,4 @@ - - - - diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj index fe040990b6c..273881bcb74 100644 --- a/src/fsc/fscProject/fsc.fsproj +++ b/src/fsc/fscProject/fsc.fsproj @@ -33,7 +33,7 @@ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ - + From 947da2fe5b54bab640097d0e70861e0b820d8460 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Mon, 19 Aug 2024 20:08:05 +0200 Subject: [PATCH 28/42] Should be good now? Please --- Directory.Build.targets | 3 --- src/Compiler/FSharp.Compiler.Service.fsproj | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 8aed019a00f..e727a243380 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -39,9 +39,6 @@ - - - + + + + From 346c655c6c8904f8e7ea25e281137c10babde882 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Tue, 20 Aug 2024 09:47:31 +0200 Subject: [PATCH 29/42] Move restore baack --- Directory.Build.targets | 3 +++ src/Compiler/FSharp.Compiler.Service.fsproj | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index e727a243380..8aed019a00f 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -39,6 +39,9 @@ + + + - - - - From 2757c54dbae3fae88dd87477fd5dc449b0ffb424 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Tue, 20 Aug 2024 16:46:29 +0200 Subject: [PATCH 30/42] Try something --- tests/fsharp/single-test.fs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs index 8cfc4647d51..6ec9d0599af 100644 --- a/tests/fsharp/single-test.fs +++ b/tests/fsharp/single-test.fs @@ -138,6 +138,10 @@ let generateProjectArtifacts (pc:ProjectConfiguration) outputType (targetFramewo let generateProjBody = let template = @" + + true + + $(OUTPUTTYPE) $(TARGETFRAMEWORK) From a1fb4de60267393f22e363df250950e53b8d01d6 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Tue, 20 Aug 2024 17:55:59 +0200 Subject: [PATCH 31/42] hah --- tests/fsharp/single-test.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs index 6ec9d0599af..1a0e9c8dba4 100644 --- a/tests/fsharp/single-test.fs +++ b/tests/fsharp/single-test.fs @@ -139,7 +139,7 @@ let generateProjectArtifacts (pc:ProjectConfiguration) outputType (targetFramewo let template = @" - true + $(NoWarn);NU1604;NU1103 From 386f882e7058cc146ec4bc3d09f2334cf833cc9e Mon Sep 17 00:00:00 2001 From: psfinaki Date: Wed, 21 Aug 2024 14:12:21 +0200 Subject: [PATCH 32/42] well how bout this bro --- eng/restore/optimizationData.targets | 2 +- tests/fsharp/single-test.fs | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets index 5a525bd99c1..324fc488f4c 100644 --- a/eng/restore/optimizationData.targets +++ b/eng/restore/optimizationData.targets @@ -1,6 +1,6 @@ - + diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs index 1a0e9c8dba4..2c1da4f1954 100644 --- a/tests/fsharp/single-test.fs +++ b/tests/fsharp/single-test.fs @@ -137,11 +137,6 @@ let generateProjectArtifacts (pc:ProjectConfiguration) outputType (targetFramewo let debug = if pc.Optimize then "True" else "False" let generateProjBody = let template = @" - - - $(NoWarn);NU1604;NU1103 - - $(OUTPUTTYPE) $(TARGETFRAMEWORK) @@ -158,6 +153,7 @@ let generateProjectArtifacts (pc:ProjectConfiguration) outputType (targetFramewo $(RestoreFromArtifactsPath) $(RestoreAdditionalProjectSources);$(RestoreFromArtifactsPath) LatestMajor + true From 19478df3952f89f6657fac1cabee4de4def23be0 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Wed, 21 Aug 2024 15:54:58 +0200 Subject: [PATCH 33/42] Update single-test.fs --- tests/fsharp/single-test.fs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs index 2c1da4f1954..af7a0958165 100644 --- a/tests/fsharp/single-test.fs +++ b/tests/fsharp/single-test.fs @@ -137,6 +137,7 @@ let generateProjectArtifacts (pc:ProjectConfiguration) outputType (targetFramewo let debug = if pc.Optimize then "True" else "False" let generateProjBody = let template = @" + $(OUTPUTTYPE) $(TARGETFRAMEWORK) From c4587c5fe2f6716d4d479b592cd0d2174ecc0236 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Wed, 21 Aug 2024 15:55:35 +0200 Subject: [PATCH 34/42] Update SourceBuildPrebuiltBaseline.xml --- eng/SourceBuildPrebuiltBaseline.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index d9c80333a81..4416e9693af 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -25,8 +25,5 @@ - - - From 9f9e5d1fc640ef2493044019e6eaf7cdcc1700b1 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Wed, 21 Aug 2024 15:58:40 +0200 Subject: [PATCH 35/42] Update optimizationData.targets --- eng/restore/optimizationData.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets index 324fc488f4c..2f71a9ea6b3 100644 --- a/eng/restore/optimizationData.targets +++ b/eng/restore/optimizationData.targets @@ -1,6 +1,7 @@ - + + From df42c2d7b1862cf9c667a6ed746c9f292e9d5399 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Thu, 22 Aug 2024 13:41:30 +0200 Subject: [PATCH 36/42] oops --- eng/restore/optimizationData.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets index 2f71a9ea6b3..7dcb8b2592f 100644 --- a/eng/restore/optimizationData.targets +++ b/eng/restore/optimizationData.targets @@ -1,7 +1,7 @@ - + From 11fbefd2a166178079d36623b067344849b1945b Mon Sep 17 00:00:00 2001 From: psfinaki Date: Thu, 22 Aug 2024 13:55:23 +0200 Subject: [PATCH 37/42] Update optimizationData.targets --- eng/restore/optimizationData.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets index 7dcb8b2592f..7a3762713f2 100644 --- a/eng/restore/optimizationData.targets +++ b/eng/restore/optimizationData.targets @@ -1,7 +1,7 @@ - + From f0de7e2b16c3fff93d75a49e9e022cecdc4103fa Mon Sep 17 00:00:00 2001 From: psfinaki Date: Thu, 22 Aug 2024 14:09:14 +0200 Subject: [PATCH 38/42] more hacks --- src/fsc/fscProject/fsc.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj index 273881bcb74..8fcaa95831f 100644 --- a/src/fsc/fscProject/fsc.fsproj +++ b/src/fsc/fscProject/fsc.fsproj @@ -33,7 +33,7 @@ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ - + From 61260697460836befac2aa9e57b1f73188d8bfeb Mon Sep 17 00:00:00 2001 From: psfinaki Date: Thu, 22 Aug 2024 14:28:34 +0200 Subject: [PATCH 39/42] aaaaaand more hacks --- src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj index cf32143763b..4ec64593718 100644 --- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj +++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj @@ -26,6 +26,9 @@ + + + From e641163ab9d461476c563c4cfd22a94620763b09 Mon Sep 17 00:00:00 2001 From: psfinaki Date: Thu, 22 Aug 2024 17:27:41 +0200 Subject: [PATCH 40/42] up --- Directory.Build.props | 1 + Directory.Build.targets | 2 +- eng/restore/optimizationData.targets | 3 +-- src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj | 2 +- src/fsc/fscProject/fsc.fsproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 043c4b01feb..97dbc90a7b2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,6 +7,7 @@ $(MSBuildThisFileDirectory) true net9.0 + $(DotNetBuildFromSource) - + %(RuntimePackRuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier) diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets index 7a3762713f2..324fc488f4c 100644 --- a/eng/restore/optimizationData.targets +++ b/eng/restore/optimizationData.targets @@ -1,7 +1,6 @@ - - + diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj index 4ec64593718..c5a0ee113a1 100644 --- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj +++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj @@ -28,7 +28,7 @@ - + diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj index 8fcaa95831f..a8d694360c1 100644 --- a/src/fsc/fscProject/fsc.fsproj +++ b/src/fsc/fscProject/fsc.fsproj @@ -33,7 +33,7 @@ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ - + From ce37717b74edc400c829a2d3609245e452a2b3ae Mon Sep 17 00:00:00 2001 From: psfinaki Date: Thu, 22 Aug 2024 17:41:57 +0200 Subject: [PATCH 41/42] bad copypaste --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1ee8b3dc4b4..573faa9eb9e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,7 +7,7 @@ $(MSBuildThisFileDirectory) true net9.0 - $(DotNetBuildFromSource) + $(DotNetBuildFromSource) - + %(RuntimePackRuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier)