Skip to content

Commit 875dbcc

Browse files
authored
Remove dependence on microsoft.build from FCS (#14341)
* temp * remove msbuild dependence from fcs * remove temp diagnostic
1 parent 4e7b3cb commit 875dbcc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1270
-976
lines changed

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<FSCoreShippedVersion>6.0.0.0</FSCoreShippedVersion>
3232
<!-- -->
3333
<!-- FSharp.Compiler.Service version -->
34-
<FCSMajorVersion>42</FCSMajorVersion>
34+
<FCSMajorVersion>43</FCSMajorVersion>
3535
<FCSMinorVersion>7</FCSMinorVersion>
36-
<FCSBuildVersion>100</FCSBuildVersion>
36+
<FCSBuildVersion>102</FCSBuildVersion>
3737
<FCSRevisionVersion>$(FSRevisionVersion)</FCSRevisionVersion>
3838
<FSharpCompilerServicePackageVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion)</FSharpCompilerServicePackageVersion>
3939
<FSharpCompilerServiceVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion).$(FCSRevisionVersion)</FSharpCompilerServiceVersion>

src/Compiler/FSComp.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -962,10 +962,6 @@ typeInfoFromFirst,"from %s"
962962
typeInfoFromNext,"also from %s"
963963
typeInfoGeneratedProperty,"generated property"
964964
typeInfoGeneratedType,"generated type"
965-
assemblyResolutionFoundByAssemblyFoldersKey,"Found by AssemblyFolders registry key"
966-
assemblyResolutionFoundByAssemblyFoldersExKey,"Found by AssemblyFoldersEx registry key"
967-
assemblyResolutionNetFramework,".NET Framework"
968-
assemblyResolutionGAC,"Global Assembly Cache"
969965
1089,recursiveClassHierarchy,"Recursive class hierarchy in type '%s'"
970966
1090,InvalidRecursiveReferenceToAbstractSlot,"Invalid recursive reference to an abstract slot"
971967
1091,eventHasNonStandardType,"The event '%s' has a non-standard type. If this event is declared in another CLI language, you may need to access this event using the explicit %s and %s methods for the event. If this event is declared in F#, make the type of the event an instantiation of either 'IDelegateEvent<_>' or 'IEvent<_,_>'."

src/Compiler/FSharp.Compiler.Service.fsproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,6 @@
461461
<Compile Include="Interactive\fsi.fsi" />
462462
<Compile Include="Interactive\fsi.fs" />
463463
<!-- A legacy resolver used to help with scripting diagnostics in the Visual Studio tools -->
464-
<Compile Include="Legacy\LegacyMSBuildReferenceResolver.fsi" Condition="'$(MonoPackaging)' != 'true'" />
465-
<Compile Include="Legacy\LegacyMSBuildReferenceResolver.fs" Condition="'$(MonoPackaging)' != 'true'" />
466464
<!-- an old API for testing the compiler and gathering diagnostics in-memory -->
467465
<Compile Include="Legacy\LegacyHostedCompilerForTesting.fs" Condition="'$(MonoPackaging)' != 'true'" />
468466
</ItemGroup>
@@ -492,9 +490,6 @@
492490
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
493491
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
494492
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
495-
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
496-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
497-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
498493
</ItemGroup>
499494

500495
</Project>

src/Compiler/FSharp.Compiler.Service.nuspec

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<dependencies>
77
<group targetFramework=".NETStandard2.0">
88
<dependency id="FSharp.Core" version="$FSharpCorePackageVersion$" exclude="Build,Analyzers" />
9-
<dependency id="Microsoft.Build.Framework" version="$MicrosoftBuildFrameworkPackageVersion$" exclude="Build,Analyzers" />
10-
<dependency id="Microsoft.Build.Tasks.Core" version="$MicrosoftBuildTasksCorePackageVersion$" exclude="Build,Analyzers" />
11-
<dependency id="Microsoft.Build.Utilities.Core" version="$MicrosoftBuildUtilitiesCorePackageVersion$" exclude="Build,Analyzers" />
129
<dependency id="System.Buffers" version="$SystemBuffersPackageVersion$" exclude="Build,Analyzers" />
1310
<dependency id="System.Collections.Immutable" version="$SystemCollectionsImmutablePackageVersion$" exclude="Build,Analyzers" />
1411
<dependency id="System.Memory" version="$SystemMemoryPackageVersion$" exclude="Build,Analyzers" />

src/Compiler/Facilities/ReferenceResolver.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace FSharp.Compiler.CodeAnalysis
44

5-
exception internal LegacyResolutionFailure
5+
exception LegacyResolutionFailure
66

77
[<RequireQualifiedAccess>]
88
type LegacyResolutionEnvironment =
@@ -28,7 +28,7 @@ type LegacyResolvedFile =
2828
sprintf "LegacyResolvedFile(%s)" this.itemSpec
2929

3030
[<AllowNullLiteral>]
31-
type internal ILegacyReferenceResolver =
31+
type ILegacyReferenceResolver =
3232
/// Get the "v4.5.1"-style moniker for the highest installed .NET Framework version.
3333
/// This is the value passed back to Resolve if no explicit "mscorlib" has been given.
3434
///

src/Compiler/Facilities/ReferenceResolver.fsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ namespace FSharp.Compiler.CodeAnalysis
44

55
open System
66

7-
exception internal LegacyResolutionFailure
7+
exception LegacyResolutionFailure
88

99
[<RequireQualifiedAccess>]
10-
type internal LegacyResolutionEnvironment =
10+
type LegacyResolutionEnvironment =
1111
/// Indicates a script or source being edited or compiled. Uses reference assemblies (not implementation assemblies).
1212
| EditingOrCompilation of isEditing: bool
1313

1414
/// Indicates a script or source being dynamically compiled and executed. Uses implementation assemblies.
1515
| CompilationAndEvaluation
1616

17-
type internal LegacyResolvedFile =
17+
type LegacyResolvedFile =
1818
{
1919
/// Item specification.
2020
itemSpec: string
@@ -27,7 +27,7 @@ type internal LegacyResolvedFile =
2727
}
2828

2929
[<AllowNullLiteral>]
30-
type internal ILegacyReferenceResolver =
30+
type ILegacyReferenceResolver =
3131
/// Get the "v4.5.1"-style moniker for the highest installed .NET Framework version.
3232
/// This is the value passed back to Resolve if no explicit "mscorlib" has been given.
3333
///
@@ -59,5 +59,5 @@ type internal ILegacyReferenceResolver =
5959
// outside FSharp.Compiler.Service
6060
[<Class; AllowNullLiteral; Obsolete("This API is obsolete and not for external use")>]
6161
type LegacyReferenceResolver =
62-
internal new: impl: ILegacyReferenceResolver -> LegacyReferenceResolver
62+
new: impl: ILegacyReferenceResolver -> LegacyReferenceResolver
6363
member internal Impl: ILegacyReferenceResolver

0 commit comments

Comments
 (0)