Skip to content

.NET Standard only FCS (alternate title: yeet netfx from FCS) #10135

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

Merged
merged 7 commits into from
Sep 17, 2020
Merged

.NET Standard only FCS (alternate title: yeet netfx from FCS) #10135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e1f9196
.NET Standard 2.0 FCS
cartermp Sep 16, 2020
662169b
formatting
cartermp Sep 16, 2020
31c1d65
Update
cartermp Sep 16, 2020
67d34c5
yeet
cartermp Sep 16, 2020
722ac93
Merge branch 'main' into nsfcs
cartermp Sep 16, 2020
a6ce07a
Update tests stuff
cartermp Sep 16, 2020
b01110d
more test updates
cartermp Sep 16, 2020
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
2 changes: 0 additions & 2 deletions eng/Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ try {
if ($testDesktop) {
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.ComponentTests\" -noTestFilter $true
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.UnitTests\"
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" -targetFramework $desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Private.Scripting.UnitTests\"
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" -targetFramework $desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Build.UnitTests\"
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests\"
Expand Down Expand Up @@ -534,7 +533,6 @@ try {
}

if ($testCompilerService) {
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
}

Expand Down
1 change: 0 additions & 1 deletion src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
<AllowCrossTargeting>true</AllowCrossTargeting>
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
<DefineConstants>$(DefineConstants);MSBUILD_AT_LEAST_15</DefineConstants>
<DefineConstants>$(DefineConstants);LOCALIZATION_FCOMP</DefineConstants>
<OtherFlags>$(OtherFlags) --warnon:1182 /warnon:3390 --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
<Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
Expand Down
54 changes: 18 additions & 36 deletions src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;netstandard2.0</TargetFrameworks>
<TargetFramework Condition="'$(OS)' == 'Unix'">netstandard2.0</TargetFramework>
<AssemblyName>FSharp.Compiler.Service</AssemblyName>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<NoWarn>$(NoWarn);44;62;69;65;54;61;75;62;9;2003;NU5125</NoWarn>
<AllowCrossTargeting>true</AllowCrossTargeting>
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_AS_DLL</DefineConstants>
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
<OtherFlags>$(OtherFlags) /warnon:1182 /warnon:3390 --times</OtherFlags>
<Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
<Tailcalls>true</Tailcalls>
<!-- .tail annotations always emitted for this binary, even in debug mode -->
<NGenBinary>true</NGenBinary>

<FsYaccOutputFolder>$(IntermediateOutputPath)$(TargetFramework)\</FsYaccOutputFolder>
<FsLexOutputFolder>$(IntermediateOutputPath)$(TargetFramework)\</FsLexOutputFolder>

<PackageId>FSharp.Compiler.Service</PackageId>
<NuspecFile>FSharp.Compiler.Service.nuspec</NuspecFile>
<IsPackable Condition="'$(OS)' != 'Unix'">true</IsPackable>
<IsPackable>true</IsPackable>
<PackageDescription>The F# Compiler Services package For F# $(FSLanguageVersion) exposes additional functionality for implementing F# language bindings, additional tools based on the compiler or refactoring tools. The package also includes F# interactive service that can be used for embedding F# scripting into your applications. Contains code from the F# Software Foundation.</PackageDescription>
<PackageReleaseNotes>/blob/main/release-notes.md#FSharp-Compiler-Service-$(FSharpCompilerServiceReleaseNotesVersion)</PackageReleaseNotes>
<PackageTags>F#, fsharp, interactive, compiler, editor</PackageTags>
Expand All @@ -33,24 +32,15 @@

<ItemGroup>
<InternalsVisibleTo Include="fsc" />
<InternalsVisibleTo Include="fsi" />
<InternalsVisibleTo Include="FSharp.LanguageService" />
<InternalsVisibleTo Include="FSharp.LanguageService.Base" />
<InternalsVisibleTo Include="FSharp.ProjectSystem.Base" />
<InternalsVisibleTo Include="FSharp.ProjectSystem.FSharp" />
<InternalsVisibleTo Include="FSharp.ProjectSystem.PropertyPages" />
<InternalsVisibleTo Include="FSharp.Compiler.Interactive.Settings" />
<InternalsVisibleTo Include="FSharp.Compiler.Server.Shared" />
<InternalsVisibleTo Include="FSharp.Compiler.Service.Tests" />
<InternalsVisibleTo Include="FSharp.Compiler.Service.MSBuild.v12" />
<InternalsVisibleTo Include="FSharp.Compiler.UnitTests" />
<InternalsVisibleTo Include="Test" />
<InternalsVisibleTo Include="VisualFSharp.Salsa" />
<InternalsVisibleTo Include="VisualFSharp.UnitTests" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net472'">
<InternalsVisibleTo Include="fsiAnyCpu" />
<InternalsVisibleTo Include="FSharp.Compiler.UnitTests" />
<InternalsVisibleTo Include="FSharp.Compiler.Service.Tests" />
<InternalsVisibleTo Include="HostedCompilerServer" />
<InternalsVisibleTo Include="FSharp.Tests.FSharpSuite" />
<InternalsVisibleTo Include="LanguageServiceProfiling" />
<InternalsVisibleTo Include="CompilerServiceBenchmarks" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -254,10 +244,10 @@
<Link>AbsIL\ilsupp.fs</Link>
</Compile>
<Compile Include="$(FsYaccOutputFolder)ilpars.fs">
<Link>AbsIL\ilpars.fs</Link>
<Link>AbsIL\FsYaccOut\ilpars.fs</Link>
</Compile>
<Compile Include="$(FsLexOutputFolder)illex.fs">
<Link>AbsIL\illex.fs</Link>
<Link>AbsIL\FsLexOut\illex.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilbinary.fsi">
<Link>AbsIL\ilbinary.fsi</Link>
Expand Down Expand Up @@ -355,10 +345,10 @@
<Link>ParserAndUntypedAST\ParseHelpers.fs</Link>
</Compile>
<Compile Include="$(FsYaccOutputFolder)pppars.fs">
<Link>ParserAndUntypedAST\pppars.fs</Link>
<Link>ParserAndUntypedAST\FsYaccOutput\pppars.fs</Link>
</Compile>
<Compile Include="$(FsYaccOutputFolder)pars.fs">
<Link>ParserAndUntypedAST\pars.fs</Link>
<Link>ParserAndUntypedAST\FsYaccOutput\pars.fs</Link>
</Compile>
<Compile Include="..\lexhelp.fsi">
<Link>ParserAndUntypedAST\lexhelp.fsi</Link>
Expand All @@ -367,10 +357,10 @@
<Link>ParserAndUntypedAST\lexhelp.fs</Link>
</Compile>
<Compile Include="$(FsYaccOutputFolder)pplex.fs">
<Link>ParserAndUntypedAST\pplex.fs</Link>
<Link>ParserAndUntypedAST\FsLex\pplex.fsl</Link>
</Compile>
<Compile Include="$(FsYaccOutputFolder)lex.fs">
<Link>ParserAndUntypedAST\lex.fs</Link>
<Link>ParserAndUntypedAST\FsLex\lex.fs</Link>
</Compile>
<Compile Include="..\LexFilter.fs">
<Link>ParserAndUntypedAST\LexFilter.fs</Link>
Expand Down Expand Up @@ -745,16 +735,8 @@
<PackageReference Include="FSharp.Core" Version="$(FSharpCorePreviewPackageVersion)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<PackageReference Include="System.IO.Compression" Version="$(SystemIoCompressionVersion)" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.Startswith('netstandard'))">
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="$(SystemDiagnosticsTraceSourceVersion)" />
Expand All @@ -779,4 +761,4 @@
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
</ItemGroup>
</Project>
</Project>
7 changes: 0 additions & 7 deletions src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
<group targetFramework=".NETStandard2.0">
<dependency id="FSharp.Core" version="$FSharpCoreVersion$" />
</group>
<group targetFramework="net472">
<dependency id="FSharp.Core" version="$FSharpCoreVersion$" />
</group>
</dependencies>

</metadata>
Expand All @@ -19,11 +16,7 @@
<file src="FSharp.Compiler.Service\$Configuration$\netstandard2.0\FSharp.Compiler.Service.dll" target="lib\netstandard2.0" />
<file src="FSharp.Compiler.Service\$Configuration$\netstandard2.0\FSharp.Compiler.Service.xml" target="lib\netstandard2.0" />

<file src="FSharp.Compiler.Service\$Configuration$\net472\FSharp.Compiler.Service.dll" target="lib\net472" />
<file src="FSharp.Compiler.Service\$Configuration$\net472\FSharp.Compiler.Service.xml" target="lib\net472" />

<!-- resources -->
<file src="FSharp.Compiler.Service\$Configuration$\netstandard2.0\**\FSharp.Compiler.Service.resources.dll" target="lib\netstandard2.0" />
<file src="FSharp.Compiler.Service\$Configuration$\net472\**\FSharp.Compiler.Service.resources.dll" target="lib\net472" />
</files>
</package>
1 change: 0 additions & 1 deletion src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
<AllowCrossTargeting>true</AllowCrossTargeting>
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
<DefineConstants>$(DefineConstants);MSBUILD_AT_LEAST_15</DefineConstants>
<OtherFlags>$(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
<Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
</PropertyGroup>
Expand Down
7 changes: 0 additions & 7 deletions src/fsharp/LegacyMSBuildReferenceResolver.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ module LegacyMSBuildReferenceResolver
match v with
| Net45 -> Some TargetDotNetFrameworkVersion.Version45
| Net451 -> Some TargetDotNetFrameworkVersion.Version451
#if MSBUILD_AT_LEAST_15
| Net452 -> Some TargetDotNetFrameworkVersion.Version452
| Net46 -> Some TargetDotNetFrameworkVersion.Version46
| Net461 -> Some TargetDotNetFrameworkVersion.Version461
Expand All @@ -88,7 +87,6 @@ module LegacyMSBuildReferenceResolver
| Net471 -> Some TargetDotNetFrameworkVersion.Version471
| Net472 -> Some TargetDotNetFrameworkVersion.Version472
| Net48 -> Some TargetDotNetFrameworkVersion.Version48
#endif
| _ -> assert false; None
match v with
| Some v ->
Expand All @@ -112,8 +110,6 @@ module LegacyMSBuildReferenceResolver
let HighestInstalledRefAssembliesOrDotNETFramework () =
let getHighestInstalledDotNETFramework () =
try
// The Mono build still uses an ancient version of msbuild from around Dev 14
#if MSBUILD_AT_LEAST_15
if box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version48)) <> null then Net48
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version472)) <> null then Net472
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version471)) <> null then Net471
Expand All @@ -124,9 +120,6 @@ module LegacyMSBuildReferenceResolver
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version46)) <> null then Net46
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version452)) <> null then Net452
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version451)) <> null then Net451
#else
if box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version451)) <> null then Net451
#endif
elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version45)) <> null then Net45
else Net45 // version is 4.5 assumed since this code is running.
with _ -> Net45
Expand Down
2 changes: 0 additions & 2 deletions src/fsharp/SimulatedMSBuildReferenceResolver.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ let private SimulatedMSBuildResolver =
match v with
| Net45 -> Some TargetDotNetFrameworkVersion.Version45
| Net451 -> Some TargetDotNetFrameworkVersion.Version451
#if MSBUILD_AT_LEAST_15
| Net452 -> Some TargetDotNetFrameworkVersion.Version452
| Net46 -> Some TargetDotNetFrameworkVersion.Version46
| Net461 -> Some TargetDotNetFrameworkVersion.Version461
Expand All @@ -69,7 +68,6 @@ let private SimulatedMSBuildResolver =
| Net471 -> Some TargetDotNetFrameworkVersion.Version471
| Net472 -> Some TargetDotNetFrameworkVersion.Version472
| Net48 -> Some TargetDotNetFrameworkVersion.Version48
#endif
| _ -> assert false; None
match v with
| Some v ->
Expand Down
15 changes: 0 additions & 15 deletions tests/FSharp.Compiler.Service.Tests/App.config
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions tests/FSharp.Compiler.Service.Tests/CSharp_Analysis/CSharp_Analysis.csproj
View file
Open in desktop

This file was deleted.

37 changes: 3 additions & 34 deletions tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,17 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<TargetExt>.dll</TargetExt>
<RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.1</TargetFrameworks>
<RuntimeIdentifiers Condition="'$(OS)' == 'Unix'">linux-x64;osx-x64</RuntimeIdentifiers>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
<NoWarn>$(NoWarn);44;75;</NoWarn>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateProgramFile>false</GenerateProgramFile>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<UnitTestType>nunit</UnitTestType>
</PropertyGroup>

<ItemGroup>
<Compile Include="LibraryTestFx.fs" />
<Compile Include="SurfaceArea.net472.fs" Condition="'$(TargetFramework)'=='net472'" />
<Compile Include="SurfaceArea.netstandard.fs" Condition="'$(TargetFramework)'!='net472'" />
<Compile Include="SurfaceArea.netstandard.fs" />
<Compile Include="..\service\FsUnit.fs">
<Link>FsUnit.fs</Link>
</Compile>
Expand Down Expand Up @@ -79,33 +70,11 @@
<Compile Include="..\service\Program.fs">
<Link>Program.fs</Link>
</Compile>
<NoneSubstituteText Include="App.config">
<Pattern1>{{FSCoreVersion}}</Pattern1>
<Replacement1>$(FSCoreVersion)</Replacement1>
</NoneSubstituteText>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dotnet.ProjInfo" Version="0.20.0" />
<PackageReference Include="Dotnet.ProjInfo" Version="0.37.0" />
<ProjectReference Include="..\..\src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net472'">
<Reference Include="mscorlib" />
<Reference Include="System.Runtime" />
<Reference Include="System.IO" />
<Reference Include="System" />
<Reference Include="System.Numerics" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Drawing" />
<Reference Include="System.Configuration" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="UIAutomationTypes" />
<ProjectReference Include="CSharp_Analysis\CSharp_Analysis.csproj" />
</ItemGroup>
</Project>
Loading