From f3d6119c7ff34e0b09fa4881117c4893e26df13a Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Mon, 16 Sep 2024 20:01:56 +0200 Subject: [PATCH 1/4] Revert "Move attribute enforcement from v9 to preview (#17739)" This reverts commit b9df594e2a94020a5c0e07113f1725e364d4c30f. --- src/Compiler/Facilities/LanguageFeatures.fs | 2 +- tests/fsharp/typecheck/sigs/neg110.bsl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index 5f16aead30a..530d0e5f2ba 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -213,10 +213,10 @@ type LanguageVersion(versionText) = LanguageFeature.LowerSimpleMappingsInComprehensionsToFastLoops, languageVersion90 LanguageFeature.ParsedHashDirectiveArgumentNonQuotes, languageVersion90 LanguageFeature.EmptyBodiedComputationExpressions, languageVersion90 + LanguageFeature.EnforceAttributeTargets, languageVersion90 LanguageFeature.ConsistentNowarnLineDirectiveInteraction, languageVersion90 // F# preview - LanguageFeature.EnforceAttributeTargets, previewVersion // waiting for fix of https://github.com/dotnet/fsharp/issues/17731 LanguageFeature.UnmanagedConstraintCsharpInterop, previewVersion // not enabled because: https://github.com/dotnet/fsharp/issues/17509 LanguageFeature.FromEndSlicing, previewVersion // Unfinished features --- needs work LanguageFeature.AllowAccessModifiersToAutoPropertiesGettersAndSetters, previewVersion diff --git a/tests/fsharp/typecheck/sigs/neg110.bsl b/tests/fsharp/typecheck/sigs/neg110.bsl index 1cdd563a742..7df68004899 100644 --- a/tests/fsharp/typecheck/sigs/neg110.bsl +++ b/tests/fsharp/typecheck/sigs/neg110.bsl @@ -1,2 +1,3 @@ -neg110.fs(5,3,5,15): typecheck error FS3242: This type does not inherit Attribute, it will not work correctly with other .NET languages. +neg110.fs(5,3,5,15): typecheck error FS1133: No constructors are available for the type 'NotAttribute' +neg110.fs(5,3,5,15): typecheck error FS3242: This type does not inherit Attribute, it will not work correctly with other .NET languages. From 47753f806723e53d67f2d5580d1ecaf044c27bb5 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Tue, 17 Sep 2024 10:56:52 +0200 Subject: [PATCH 2/4] Update tests/fsharp/typecheck/sigs/neg110.bsl --- tests/fsharp/typecheck/sigs/neg110.bsl | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/fsharp/typecheck/sigs/neg110.bsl b/tests/fsharp/typecheck/sigs/neg110.bsl index 7df68004899..48df5e347dd 100644 --- a/tests/fsharp/typecheck/sigs/neg110.bsl +++ b/tests/fsharp/typecheck/sigs/neg110.bsl @@ -1,3 +1 @@ -neg110.fs(5,3,5,15): typecheck error FS1133: No constructors are available for the type 'NotAttribute' - neg110.fs(5,3,5,15): typecheck error FS3242: This type does not inherit Attribute, it will not work correctly with other .NET languages. From 57a3ae48308fec6d4aff9d24bb724826694096b6 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Tue, 17 Sep 2024 10:57:30 +0200 Subject: [PATCH 3/4] Update tests/fsharp/typecheck/sigs/neg110.bsl --- tests/fsharp/typecheck/sigs/neg110.bsl | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/fsharp/typecheck/sigs/neg110.bsl b/tests/fsharp/typecheck/sigs/neg110.bsl index 48df5e347dd..1cdd563a742 100644 --- a/tests/fsharp/typecheck/sigs/neg110.bsl +++ b/tests/fsharp/typecheck/sigs/neg110.bsl @@ -1 +1,2 @@ neg110.fs(5,3,5,15): typecheck error FS3242: This type does not inherit Attribute, it will not work correctly with other .NET languages. + From 88fa2f94211684a600c5f2530ac2d7e688d7f422 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Tue, 17 Sep 2024 13:04:31 +0200 Subject: [PATCH 4/4] Update src/Compiler/Facilities/LanguageFeatures.fs --- src/Compiler/Facilities/LanguageFeatures.fs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index ec97d2027d7..5c311237594 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -213,7 +213,6 @@ type LanguageVersion(versionText) = LanguageFeature.ParsedHashDirectiveArgumentNonQuotes, languageVersion90 LanguageFeature.EmptyBodiedComputationExpressions, languageVersion90 LanguageFeature.EnforceAttributeTargets, languageVersion90 - LanguageFeature.ConsistentNowarnLineDirectiveInteraction, languageVersion90 // F# preview LanguageFeature.UnmanagedConstraintCsharpInterop, previewVersion // not enabled because: https://github.com/dotnet/fsharp/issues/17509