Rebased to latest

ncave · Nov 14, 2022 · b0f9962 · b0f9962
1 parent 03a7539
commit b0f9962
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 11 deletions.
diff --git a/buildtools/buildtools.targets b/buildtools/buildtools.targets
@@ -20,7 +20,7 @@
           BeforeTargets="CoreCompile">
 
     <PropertyGroup>
-        <FsLexPath Condition="'$(FsLexPath)' == ''">$(ArtifactsDir)\bin\fslex\Release\net6.0\fslex.dll</FsLexPath>
+        <FsLexPath Condition="'$(FsLexPath)' == ''">$(ArtifactsDir)\bin\fslex\Release\net7.0\fslex.dll</FsLexPath>
     </PropertyGroup>
 
     <!-- Create the output directory -->
@@ -44,7 +44,7 @@
           BeforeTargets="CoreCompile">
 
     <PropertyGroup>
-        <FsYaccPath Condition="'$(FsYaccPath)' == ''">$(ArtifactsDir)\bin\fsyacc\Release\net6.0\fsyacc.dll</FsYaccPath>
+        <FsYaccPath Condition="'$(FsYaccPath)' == ''">$(ArtifactsDir)\bin\fsyacc\Release\net7.0\fsyacc.dll</FsYaccPath>
     </PropertyGroup>
 
     <!-- Create the output directory -->

diff --git a/buildtools/fslex/fslex.fsproj b/buildtools/fslex/fslex.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>

diff --git a/buildtools/fsyacc/fsyacc.fsproj b/buildtools/fsyacc/fsyacc.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>

diff --git a/fcs/fcs-fable/FSStrings.fs b/fcs/fcs-fable/FSStrings.fs
@@ -939,7 +939,7 @@ let resources =
         "Override implementations should be given as part of the initial declaration of a type."
       );
       ( "IntfImplInIntrinsicAugmentation",
-        "Interface implementations in augmentations are now deprecated. Interface implementations should be given on the initial declaration of a type."
+        "Interface implementations should normally be given on the initial declaration of a type. Interface implementations in augmentations may lead to accessing static bindings before they are initialized, though only if the interface implementation is invoked during initialization of the static data, and in turn access the static data. You may remove this warning using #nowarn \"69\" if you have checked this is not the case."
       );
       ( "IntfImplInExtrinsicAugmentation",
         "Interface implementations should be given on the initial declaration of a type."
@@ -995,4 +995,7 @@ let resources =
       ( "NotUpperCaseConstructorWithoutRQA",
         "Lowercase discriminated union cases are only allowed when using RequireQualifiedAccess attribute"
       );
+      ( "ErrorFromAddingTypeEquationTuples",
+        "Type mismatch. Expecting a tuple of length {0} of type\n    {1}    \nbut given a tuple of length {2} of type\n    {3}    {4}\n"
+      );
     ]
diff --git a/fcs/fcs-fable/fcs-fable.fsproj b/fcs/fcs-fable/fcs-fable.fsproj
@@ -7,13 +7,10 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <DefineConstants>$(DefineConstants);FABLE_COMPILER</DefineConstants>
-    <!-- <DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants> -->
-    <!-- <DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants> -->
-    <!-- <DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants> -->
     <DefineConstants>$(DefineConstants);FX_NO_WEAKTABLE</DefineConstants>
     <DefineConstants>$(DefineConstants);NO_TYPEPROVIDERS</DefineConstants>
     <DefineConstants>$(DefineConstants);NO_INLINE_IL_PARSER</DefineConstants>
-    <DefineConstants>$(DefineConstants);USE_SHIPPED_FSCORE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FSHARPCORE_USE_PACKAGE</DefineConstants>
     <OtherFlags>$(OtherFlags) --warnon:1182 --nowarn:57</OtherFlags>
     <!-- <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> -->
   </PropertyGroup>
@@ -335,6 +332,8 @@
     <!-- <Compile Include="$(FSharpSourcesRoot)/Service/ServiceStructure.fs" /> -->
     <!-- <Compile Include="$(FSharpSourcesRoot)/Service/ServiceAnalysis.fsi" /> -->
     <!-- <Compile Include="$(FSharpSourcesRoot)/Service/ServiceAnalysis.fs" /> -->
+    <!-- <Compile Include="$(FSharpSourcesRoot)/Interactive/FSharpInteractiveServer.fsi" /> -->
+    <!-- <Compile Include="$(FSharpSourcesRoot)/Interactive/FSharpInteractiveServer.fs" /> -->
     <!-- <Compile Include="$(FSharpSourcesRoot)/Interactive/ControlledExecution.fs" /> -->
     <!-- <Compile Include="$(FSharpSourcesRoot)/Interactive/fsi.fsi" /> -->
     <!-- <Compile Include="$(FSharpSourcesRoot)/Interactive/fsi.fs" /> -->

diff --git a/fcs/fcs-fable/test/fcs-fable-test.fsproj b/fcs/fcs-fable/test/fcs-fable-test.fsproj
@@ -18,9 +18,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- <PackageReference Include="FSharp.Core" Version="6.0.5" /> -->
+    <!-- <PackageReference Include="FSharp.Core" Version="7.0.0" /> -->
     <!-- <Reference Include="../../../artifacts/bin/FSharp.Compiler.Service/Release/netstandard2.0/FSharp.Core.dll" /> -->
-    <PackageReference Include="Fable.Core" Version="3.7.1" />
+    <PackageReference Include="Fable.Core" Version="4.0.0-*" />
   </ItemGroup>
 
 </Project>
diff --git a/fcs/fcs-fable/test/nuget.config b/fcs/fcs-fable/test/nuget.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+</configuration>