Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activate Server mode for .NET Core compiler #13740

Merged
merged 9 commits into from
Nov 2, 2022
Merged

Activate Server mode for .NET Core compiler #13740

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
05e9239
Activate Server mode for .NET Core compiler
dsyme Aug 22, 2022
075e2e7
Update FSharp.Profiles.props
vzarytovskii Aug 30, 2022
48e9aef
Merge branch 'main' into gc3
vzarytovskii Aug 30, 2022
60165b4
Merge branch 'main' into gc3
dsyme Sep 23, 2022
7474c50
Merge branch 'main' into gc3
dsyme Sep 23, 2022
375d805
Merge branch 'main' into gc3
T-Gro Oct 20, 2022
968c30d
Update FSharp.Profiles.props
dsyme Oct 26, 2022
28e4813
Delete runtimeconfig.template.json
dsyme Oct 26, 2022
8148380
Update fsc.targets
dsyme Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions FSharp.Profiles.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@
</Otherwise>
</Choose>

<PropertyGroup>
<!-- Override the setting for the Arcade UserRuntimeConfig for fsc on .NET Core -->
<UserRuntimeConfig Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(OutputType)' == 'Exe' AND '$(AssemblyName)' == 'fsc'">$(MSBuildThisFileDirectory)src\fsc\runtimeconfig.template.json</UserRuntimeConfig>
dsyme marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/fsc/fsc.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)fscmain.fs" />
<NoneSubstituteText Include="$(MSBuildThisFileDirectory)App.config">
<NoneSubstituteText Include="$(MSBuildThisFileDirectory)App.config" Condition="'$(TargetFramework)' == 'net472'">
<Pattern1>{{FSCoreVersion}}</Pattern1>
<Replacement1>$(FSCoreVersion)</Replacement1>
</NoneSubstituteText>
Expand Down
6 changes: 6 additions & 0 deletions src/fsc/runtimeconfig.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"rollForwardOnNoCandidateFx": 2,
"configProperties": {
"System.GC.Server": true
}
}