diff --git a/Directory.Build.props b/Directory.Build.props index e36a8f617c5..573faa9eb9e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,6 +7,7 @@ $(MSBuildThisFileDirectory) true net9.0 + $(DotNetBuildFromSource) + + + + + + + + + diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets new file mode 100644 index 00000000000..324fc488f4c --- /dev/null +++ b/eng/restore/optimizationData.targets @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj index 25f3758c011..b32ad0cd23c 100644 --- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj +++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj @@ -28,6 +28,10 @@ + + + + diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec index fed8e38fae3..4322ee7d965 100644 --- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec +++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec @@ -44,6 +44,9 @@ + + + diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj index 889ece967ad..a8d694360c1 100644 --- a/src/fsc/fscProject/fsc.fsproj +++ b/src/fsc/fscProject/fsc.fsproj @@ -9,9 +9,18 @@ + linux + + linux + windows_nt + $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) + $(MibcTargetOS)-$(MibcTargetArchitecture) + $(ArtifactsDir)mibc-proto\optimization.$(MibcCurrentMachineArcitecture).mibc.runtime\DotNet_FSharp.mibc + $(FSharpNetCoreProductTargetFramework) $(EnablePublishReadyToRun) $(NETCoreSdkRuntimeIdentifier) + $(MibcFile) @@ -24,6 +33,10 @@ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ + + + + diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs index f09acda3818..f859cc05838 100644 --- a/tests/fsharp/single-test.fs +++ b/tests/fsharp/single-test.fs @@ -154,6 +154,7 @@ let generateProjectArtifacts (pc:ProjectConfiguration) outputType (targetFramewo $(RestoreFromArtifactsPath) $(RestoreAdditionalProjectSources);$(RestoreFromArtifactsPath) LatestMajor + true