From 198b380da44f5dde16e96f7feafb3ed941093914 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Tue, 9 Jul 2024 12:52:46 +0200 Subject: [PATCH 1/5] Create UseLocalCompiler.Directory.Build.props Added props file, which will point to locally build compiler (Debug configuration), which can simply be included in contributor's project (via ` `) to test changes. --- UseLocalCompiler.Directory.Build.props | 32 ++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 UseLocalCompiler.Directory.Build.props diff --git a/UseLocalCompiler.Directory.Build.props b/UseLocalCompiler.Directory.Build.props new file mode 100644 index 00000000000..382ee3b312a --- /dev/null +++ b/UseLocalCompiler.Directory.Build.props @@ -0,0 +1,32 @@ + + + Debug + + $(MSBuildThisFileDirectory) + $(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net8.0/fsc.dll + + true + + true + + $(LocalFSCDllPath) + $(LocalFSCDllPath) + + False + True + + $(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(Configuration)/net8.0 + $(LocalFSharpBuildBinPath)/FSharp.Build.dll + $(LocalFSharpBuildBinPath)/Microsoft.FSharp.Targets + $(LocalFSharpBuildBinPath)/Microsoft.FSharp.NetSdk.props + $(LocalFSharpBuildBinPath)/Microsoft.FSharp.NetSdk.targets + $(LocalFSharpBuildBinPath)/Microsoft.FSharp.Overrides.NetSdk.targets + + + + + + + + + From 5218137a66c416bc264ed5941626628b4e48991b Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Tue, 9 Jul 2024 12:58:30 +0200 Subject: [PATCH 2/5] Update UseLocalCompiler.Directory.Build.props Co-authored-by: Tomas Grosup --- UseLocalCompiler.Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UseLocalCompiler.Directory.Build.props b/UseLocalCompiler.Directory.Build.props index 382ee3b312a..71d5629c578 100644 --- a/UseLocalCompiler.Directory.Build.props +++ b/UseLocalCompiler.Directory.Build.props @@ -1,6 +1,6 @@ - Debug + Debug $(MSBuildThisFileDirectory) $(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net8.0/fsc.dll From 9cd131b12fe38e46cc3bcc9c4dd3abecf6a06dfe Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Tue, 9 Jul 2024 12:59:13 +0200 Subject: [PATCH 3/5] Update UseLocalCompiler.Directory.Build.props Co-authored-by: Tomas Grosup --- UseLocalCompiler.Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UseLocalCompiler.Directory.Build.props b/UseLocalCompiler.Directory.Build.props index 71d5629c578..ae6821ab925 100644 --- a/UseLocalCompiler.Directory.Build.props +++ b/UseLocalCompiler.Directory.Build.props @@ -2,7 +2,7 @@ Debug - $(MSBuildThisFileDirectory) + $(MSBuildThisFileDirectory) $(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net8.0/fsc.dll true From 7b3d2f9df519d9538a94803d353a48ee74ed259c Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Tue, 9 Jul 2024 13:02:36 +0200 Subject: [PATCH 4/5] Update UseLocalCompiler.Directory.Build.props Co-authored-by: Tomas Grosup --- UseLocalCompiler.Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UseLocalCompiler.Directory.Build.props b/UseLocalCompiler.Directory.Build.props index ae6821ab925..587bc381a18 100644 --- a/UseLocalCompiler.Directory.Build.props +++ b/UseLocalCompiler.Directory.Build.props @@ -15,7 +15,7 @@ False True - $(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(Configuration)/net8.0 + $(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net8.0 $(LocalFSharpBuildBinPath)/FSharp.Build.dll $(LocalFSharpBuildBinPath)/Microsoft.FSharp.Targets $(LocalFSharpBuildBinPath)/Microsoft.FSharp.NetSdk.props From 403ecad5b39ed0d1a42eb7e99cc225c1d3426609 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Tue, 9 Jul 2024 14:33:10 +0200 Subject: [PATCH 5/5] Fixes --- UseLocalCompiler.Directory.Build.props | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/UseLocalCompiler.Directory.Build.props b/UseLocalCompiler.Directory.Build.props index 587bc381a18..7a59848a0dd 100644 --- a/UseLocalCompiler.Directory.Build.props +++ b/UseLocalCompiler.Directory.Build.props @@ -1,16 +1,14 @@ - Debug + Release - $(MSBuildThisFileDirectory) - $(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net8.0/fsc.dll + $(MSBuildThisFileDirectory) true - true - $(LocalFSCDllPath) - $(LocalFSCDllPath) + $(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net8.0/fsc.dll + $(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net8.0/fsc.dll False True