From b0f99622e65ccdd6a7c64ca9e0c0d16cc175eef8 Mon Sep 17 00:00:00 2001 From: ncave <777696+ncave@users.noreply.github.com> Date: Mon, 14 Nov 2022 08:44:09 -0800 Subject: [PATCH] Rebased to latest --- buildtools/buildtools.targets | 4 ++-- buildtools/fslex/fslex.fsproj | 2 +- buildtools/fsyacc/fsyacc.fsproj | 2 +- fcs/fcs-fable/FSStrings.fs | 5 ++++- fcs/fcs-fable/fcs-fable.fsproj | 7 +++---- fcs/fcs-fable/test/fcs-fable-test.fsproj | 4 ++-- fcs/fcs-fable/test/nuget.config | 8 ++++++++ 7 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 fcs/fcs-fable/test/nuget.config diff --git a/buildtools/buildtools.targets b/buildtools/buildtools.targets index 8332b53a237..3b2fa489c66 100644 --- a/buildtools/buildtools.targets +++ b/buildtools/buildtools.targets @@ -20,7 +20,7 @@ BeforeTargets="CoreCompile"> - $(ArtifactsDir)\bin\fslex\Release\net6.0\fslex.dll + $(ArtifactsDir)\bin\fslex\Release\net7.0\fslex.dll @@ -44,7 +44,7 @@ BeforeTargets="CoreCompile"> - $(ArtifactsDir)\bin\fsyacc\Release\net6.0\fsyacc.dll + $(ArtifactsDir)\bin\fsyacc\Release\net7.0\fsyacc.dll diff --git a/buildtools/fslex/fslex.fsproj b/buildtools/fslex/fslex.fsproj index fe737d00331..8577bf4e3af 100644 --- a/buildtools/fslex/fslex.fsproj +++ b/buildtools/fslex/fslex.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) true false diff --git a/buildtools/fsyacc/fsyacc.fsproj b/buildtools/fsyacc/fsyacc.fsproj index 839c919617d..e3a4b88a3a0 100644 --- a/buildtools/fsyacc/fsyacc.fsproj +++ b/buildtools/fsyacc/fsyacc.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) true false diff --git a/fcs/fcs-fable/FSStrings.fs b/fcs/fcs-fable/FSStrings.fs index d53f0601514..b4d6e985d65 100644 --- 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" + ); ] \ No newline at end of file diff --git a/fcs/fcs-fable/fcs-fable.fsproj b/fcs/fcs-fable/fcs-fable.fsproj index 0838086cda8..15867ae4746 100644 --- a/fcs/fcs-fable/fcs-fable.fsproj +++ b/fcs/fcs-fable/fcs-fable.fsproj @@ -7,13 +7,10 @@ netstandard2.0 $(DefineConstants);FABLE_COMPILER - - - $(DefineConstants);FX_NO_WEAKTABLE $(DefineConstants);NO_TYPEPROVIDERS $(DefineConstants);NO_INLINE_IL_PARSER - $(DefineConstants);USE_SHIPPED_FSCORE + $(DefineConstants);FSHARPCORE_USE_PACKAGE $(OtherFlags) --warnon:1182 --nowarn:57 @@ -335,6 +332,8 @@ + + diff --git a/fcs/fcs-fable/test/fcs-fable-test.fsproj b/fcs/fcs-fable/test/fcs-fable-test.fsproj index b2d6d836fbc..034059ff898 100644 --- a/fcs/fcs-fable/test/fcs-fable-test.fsproj +++ b/fcs/fcs-fable/test/fcs-fable-test.fsproj @@ -18,9 +18,9 @@ - + - + diff --git a/fcs/fcs-fable/test/nuget.config b/fcs/fcs-fable/test/nuget.config new file mode 100644 index 00000000000..6ce97590acd --- /dev/null +++ b/fcs/fcs-fable/test/nuget.config @@ -0,0 +1,8 @@ + + + + + + + +