mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Enable FSharp in the VMR for non-source-build (#18895)

Browse source 
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
This commit is contained in:
Viktor Hofer 2024-04-02 14:13:53 +02:00 committed by GitHub
parent b4714ed75f
commit dc9d9b50ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/SourceBuild/content/repo-projects/Directory.Build.targets
View file

@ -53,7 +53,6 @@
<!-- Exclude repositories that currently don't build when not building source-only. --> <!-- Exclude repositories that currently don't build when not building source-only. -->
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'"> <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<TransitiveRepositoryReference Remove="nuget-client" /> <TransitiveRepositoryReference Remove="nuget-client" />
<TransitiveRepositoryReference Remove="fsharp" />
</ItemGroup> </ItemGroup>
</Target> </Target>

4
src/SourceBuild/content/repo-projects/fsharp.proj
View file

@ -10,12 +10,14 @@
<BuildActions>$(FlagParameterPrefix)pack $(FlagParameterPrefix)publish</BuildActions> <BuildActions>$(FlagParameterPrefix)pack $(FlagParameterPrefix)publish</BuildActions>
<BuildArgs>$(BuildArgs) /p:TreatWarningsAsErrors=false</BuildArgs> <BuildArgs>$(BuildArgs) /p:TreatWarningsAsErrors=false</BuildArgs>
<BuildArgs>$(BuildArgs) /p:GenerateResourceUsePreserializedResources=true</BuildArgs>
<!-- <!--
dotnet/fsharp has a custom eng/build.sh script that handles its own sourcebuild arg dotnet/fsharp has a custom eng/build.sh script that handles its own sourcebuild arg
differently from the ArcadeBuildFromSource MSBuild arg. Including both args is fine, but the differently from the ArcadeBuildFromSource MSBuild arg. Including both args is fine, but the
custom sourcebuild arg is the one that's required. This avoids running bootstrapping twice. custom sourcebuild arg is the one that's required. This avoids running bootstrapping twice.
--> -->
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)sourcebuild $(FlagParameterPrefix)tfm $(NetCurrent) /p:SourceBuildBootstrapTfm=$(NetCurrent)</BuildArgs> <BuildArgs Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(BuildArgs) $(FlagParameterPrefix)sourcebuild $(FlagParameterPrefix)tfm $(NetCurrent) /p:SourceBuildBootstrapTfm=$(NetCurrent)</BuildArgs>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>