Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
<FSCoreShippedVersion>6.0.0.0</FSCoreShippedVersion>
<!-- -->
<!-- FSharp.Compiler.Service version -->
<FCSMajorVersion>42</FCSMajorVersion>
<FCSMajorVersion>43</FCSMajorVersion>
<FCSMinorVersion>7</FCSMinorVersion>
<FCSBuildVersion>100</FCSBuildVersion>
<FCSBuildVersion>102</FCSBuildVersion>
<FCSRevisionVersion>$(FSRevisionVersion)</FCSRevisionVersion>
<FSharpCompilerServicePackageVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion)</FSharpCompilerServicePackageVersion>
<FSharpCompilerServiceVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion).$(FCSRevisionVersion)</FSharpCompilerServiceVersion>
Expand Down
4 changes: 0 additions & 4 deletions src/Compiler/FSComp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -962,10 +962,6 @@ typeInfoFromFirst,"from %s"
typeInfoFromNext,"also from %s"
typeInfoGeneratedProperty,"generated property"
typeInfoGeneratedType,"generated type"
assemblyResolutionFoundByAssemblyFoldersKey,"Found by AssemblyFolders registry key"
assemblyResolutionFoundByAssemblyFoldersExKey,"Found by AssemblyFoldersEx registry key"
assemblyResolutionNetFramework,".NET Framework"
assemblyResolutionGAC,"Global Assembly Cache"
1089,recursiveClassHierarchy,"Recursive class hierarchy in type '%s'"
1090,InvalidRecursiveReferenceToAbstractSlot,"Invalid recursive reference to an abstract slot"
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<_,_>'."
Expand Down
5 changes: 0 additions & 5 deletions src/Compiler/FSharp.Compiler.Service.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,6 @@
<Compile Include="Interactive\fsi.fsi" />
<Compile Include="Interactive\fsi.fs" />
<!-- A legacy resolver used to help with scripting diagnostics in the Visual Studio tools -->
<Compile Include="Legacy\LegacyMSBuildReferenceResolver.fsi" Condition="'$(MonoPackaging)' != 'true'" />
<Compile Include="Legacy\LegacyMSBuildReferenceResolver.fs" Condition="'$(MonoPackaging)' != 'true'" />
<!-- an old API for testing the compiler and gathering diagnostics in-memory -->
<Compile Include="Legacy\LegacyHostedCompilerForTesting.fs" Condition="'$(MonoPackaging)' != 'true'" />
</ItemGroup>
Expand Down Expand Up @@ -492,9 +490,6 @@
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
</ItemGroup>

</Project>
3 changes: 0 additions & 3 deletions src/Compiler/FSharp.Compiler.Service.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="FSharp.Core" version="$FSharpCorePackageVersion$" exclude="Build,Analyzers" />
<dependency id="Microsoft.Build.Framework" version="$MicrosoftBuildFrameworkPackageVersion$" exclude="Build,Analyzers" />
<dependency id="Microsoft.Build.Tasks.Core" version="$MicrosoftBuildTasksCorePackageVersion$" exclude="Build,Analyzers" />
<dependency id="Microsoft.Build.Utilities.Core" version="$MicrosoftBuildUtilitiesCorePackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Buffers" version="$SystemBuffersPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Collections.Immutable" version="$SystemCollectionsImmutablePackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Memory" version="$SystemMemoryPackageVersion$" exclude="Build,Analyzers" />
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/Facilities/ReferenceResolver.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace FSharp.Compiler.CodeAnalysis

exception internal LegacyResolutionFailure
exception LegacyResolutionFailure

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

[<AllowNullLiteral>]
type internal ILegacyReferenceResolver =
type ILegacyReferenceResolver =
/// Get the "v4.5.1"-style moniker for the highest installed .NET Framework version.
/// This is the value passed back to Resolve if no explicit "mscorlib" has been given.
///
Expand Down
10 changes: 5 additions & 5 deletions src/Compiler/Facilities/ReferenceResolver.fsi
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ namespace FSharp.Compiler.CodeAnalysis

open System

exception internal LegacyResolutionFailure
exception LegacyResolutionFailure

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

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

type internal LegacyResolvedFile =
type LegacyResolvedFile =
{
/// Item specification.
itemSpec: string
Expand All @@ -27,7 +27,7 @@ type internal LegacyResolvedFile =
}

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