Fix build issues with .NET 6

2021-08-23 10:11:38 +02:00 · 2021-08-23 10:11:38 +02:00 · 3201516e43
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -170,7 +170,7 @@
    <MicrosoftVisualStudioShellInterop160DesignTimeVersion>16.0.1</MicrosoftVisualStudioShellInterop160DesignTimeVersion>
    <MicrosoftVisualStudioShellInterop16DesignTimeVersion>16.0.28924.11111</MicrosoftVisualStudioShellInterop16DesignTimeVersion>
    <MicrosoftVisualStudioThreadingVersion>16.8.55</MicrosoftVisualStudioThreadingVersion>
-    <MicrosoftVisualStudioUtilitiesVersion>16.7.30329.38</MicrosoftVisualStudioUtilitiesVersion>
+    <MicrosoftVisualStudioUtilitiesVersion>16.10.31225.38</MicrosoftVisualStudioUtilitiesVersion>
    <MicrosoftVisualStudioValidationVersion>16.8.33</MicrosoftVisualStudioValidationVersion>
    <MicrosoftVisualStudioWCFReferenceInteropVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropVersion>
    <MicrosoftVSSDKBuildToolsVersion>16.5.2044</MicrosoftVSSDKBuildToolsVersion>
--- a/vsintegration/src/FSharp.Editor/Common/Extensions.fs
+++ b/vsintegration/src/FSharp.Editor/Common/Extensions.fs
@ -57,7 +57,7 @@ type Path with
        try Path.GetFullPath path
        with _ -> path

-    static member GetFileNameSafe path =
+    static member GetFileNameSafe (path: string) =
        try Path.GetFileName path
        with _ -> path

--- a/vsintegration/src/FSharp.Editor/Common/FileService.fs
+++ b/vsintegration/src/FSharp.Editor/Common/FileService.fs
@ -7,7 +7,7 @@ open MonoDevelop.Core
 type Version = int

 type FileSystem (defaultFileSystem : IFileSystem, openDocuments: unit -> Document seq) =
-    static member IsAScript fileName =
+    static member IsAScript (fileName: string) =
        let ext = Path.GetExtension fileName
        [".fsx";".fsscript";".sketchfs"] |> List.exists ((=) ext)

--- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
+++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
@ -1,4 +1,4 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\..\..\MonoDevelop.props" />
  <Import Project="$(ReferencesVSEditor)" />
  <Import Project="$(ReferencesGtk)" />
@ -11,8 +11,6 @@
    <AssemblyName>FSharp.Editor</AssemblyName>
    <UsePartialTypes>False</UsePartialTypes>
    <RestorePackages>False</RestorePackages>
-    <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
-    <!--    <RuntimeIdentifier>win</RuntimeIdentifier>-->
    <OtherFlags>--warnon:1182</OtherFlags>
    <StartAction>Program</StartAction>
    <Externalconsole>true</Externalconsole>
@ -30,6 +28,10 @@
    <OtherFlags>--publicsign</OtherFlags>
    <AssemblyOriginatorKeyFile>..\..\..\src\buildtools\keys\MSFT.snk</AssemblyOriginatorKeyFile>
    <DocumentationFile>..\..\..\..\..\build\bin\AddIns\FSharp.Editor\FSharp.Editor.XML</DocumentationFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
+    <EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
+    <Configurations>Release;Debug</Configurations>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <Optimize>true</Optimize>
@ -52,7 +54,6 @@
  <Target Name="Clean">
    <RemoveDir Directories="..\bin\" />
  </Target>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets" />
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.Xml" />
@ -76,10 +77,10 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="$(NuGetVersionFSharpCore)" />
+    <DownloadNupkg Include="FSharp.Core" Version="4.7.2" ExtensionDir="Packages" />
  </ItemGroup>
  <ItemGroup>
-    <DownloadNupkg Include="FSharp.Core" Version="4.7.2" ExtensionDir="Packages" />
+    <PackageReference Include="FSharp.Core" Version="$(NuGetVersionFSharpCore)" />
    <DownloadNupkg Include="System.ValueTuple" Version="4.5.0" ExtensionDir="Packages" />
    <Compile Include="service\ServiceInterfaceStubGenerator.fsi" />
    <Compile Include="service\ServiceInterfaceStubGenerator.fs" />
@ -219,69 +220,47 @@
      <LastGenOutput>FSharp.Editor.Designer.fs</LastGenOutput>
    </EmbeddedResource>
    <IncludeCopyLocal Include="Newtonsoft.Json.dll" />
+    <ProjectReference Include="..\..\..\..\..\src\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
+      <ReferenceSourceTarget></ReferenceSourceTarget>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\xwt\Xwt\Xwt.csproj">
+      <ReferenceSourceTarget></ReferenceSourceTarget>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\VS-Platform\src\Editor\Core\Def\CoreUtility.csproj">
+      <Aliases>CoreUtility</Aliases>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\fsharpbinding\MonoDevelop.FSharp.Gui\MonoDevelop.FSharp.Gui.csproj">
+    </ProjectReference>
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
+    <PackageReference Include="System.Runtime.Caching" Version="5.0.0" ExcludeAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(NuGetVersionRoslyn)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
    <ProjectReference Include="..\..\..\..\..\src\addins\MonoDevelop.TextEditor\MonoDevelop.TextEditor\MonoDevelop.TextEditor.csproj">
-      <Project>{3F5B5BDA-69D5-441A-8142-AA25C998A997}</Project>
-      <Name>MonoDevelop.TextEditor</Name>
-      <ReferenceSourceTarget></ReferenceSourceTarget>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\fsharpbinding\FSharp\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj">
-      <Project>{4EDEC7A0-782C-41F5-9640-AF4DCD487016}</Project>
-      <Name>Microsoft.CodeAnalysis.ExternalAccess.FSharp</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\src\addins\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
-      <Project>{2C24D515-4A2C-445C-8419-C09231913CFA}</Project>
-      <Name>MonoDevelop.DesignerSupport</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\mono-addins\Mono.Addins\Mono.Addins.csproj">
-      <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
-      <Name>Mono.Addins</Name>
-      <ReferenceSourceTarget></ReferenceSourceTarget>
-      <Private>False</Private>
-    </ProjectReference>
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="$(NuGetVersionRoslyn)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
-    <ProjectReference Include="..\..\..\..\..\src\addins\MonoDevelop.UnitTesting\MonoDevelop.UnitTesting.csproj">
-      <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project>
-      <Name>MonoDevelop.UnitTesting</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\src\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
-      <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
-      <Name>MonoDevelop.Core</Name>
      <ReferenceSourceTarget></ReferenceSourceTarget>
      <Private>False</Private>
    </ProjectReference>
    <PackageReference Include="FSharp.Compiler.Service" Version="$(NuGetVersionFSharpCompilerService)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(NuGetVersionRoslyn)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(NuGetVersionRoslyn)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
-    <PackageReference Include="System.Runtime.Caching" Version="5.0.0" ExcludeAssets="all"/>
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
-    <ProjectReference Include="..\..\..\..\fsharpbinding\MonoDevelop.FSharp.Gui\MonoDevelop.FSharp.Gui.csproj">
-      <Project>{FD0D1033-9145-48E5-8ED8-E2365252878C}</Project>
-      <Name>MonoDevelop.FSharp.Gui</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\VS-Platform\src\Editor\Core\Def\CoreUtility.csproj">
-      <Project>{D6B7E899-542A-4EAB-8F06-E737657B29DE}</Project>
-      <Aliases>CoreUtility</Aliases>
-      <Name>CoreUtility</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
-      <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
-      <Name>MonoDevelop.Debugger</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\xwt\Xwt\Xwt.csproj">
-      <Project>{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}</Project>
-      <Name>Xwt</Name>
+    <ProjectReference Include="..\..\..\..\..\src\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
      <ReferenceSourceTarget></ReferenceSourceTarget>
      <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\src\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
-      <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
-      <Name>MonoDevelop.Ide</Name>
+    <ProjectReference Include="..\..\..\..\..\src\addins\MonoDevelop.UnitTesting\MonoDevelop.UnitTesting.csproj">
+    </ProjectReference>
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="$(NuGetVersionRoslyn)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
+    <ProjectReference Include="..\..\..\..\mono-addins\Mono.Addins\Mono.Addins.csproj">
      <ReferenceSourceTarget></ReferenceSourceTarget>
      <Private>False</Private>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\src\addins\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\fsharpbinding\FSharp\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj">
+    </ProjectReference>
    <PackageReference Include="Newtonsoft.Json" Version="$(NuGetVersionNewtonsoftJson)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
+    <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(NuGetVersionRoslyn)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
    <PackageReference Include="Microsoft.CodeAnalysis.Features" Version="$(NuGetVersionRoslyn)" />
  </ItemGroup>
  <ProjectExtensions>
--- a/vsintegration/src/FSharp.Editor/VSMac/InteractiveSession.fs
+++ b/vsintegration/src/FSharp.Editor/VSMac/InteractiveSession.fs
@ -33,7 +33,7 @@ module binaryDeserializer =
            let (o:'T) = downcast formatter.Deserialize(stream)
            Some o

-type InteractiveSession(pathToExe) =
+type InteractiveSession(pathToExe: string) =
    let (|Completion|_|) (command: string) =
        if command.StartsWith("completion ") then
            let payload = command.[11..]