Skip to content

Commit ee36587

Browse files
authored
Merge pull request #17744 from dotnet/merges/main-to-release/dev17.12
Merge main to release/dev17.12
2 parents adf7d94 + b9df594 commit ee36587

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/Compiler/Facilities/LanguageFeatures.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@ type LanguageVersion(versionText) =
213213
LanguageFeature.LowerSimpleMappingsInComprehensionsToFastLoops, languageVersion90
214214
LanguageFeature.ParsedHashDirectiveArgumentNonQuotes, languageVersion90
215215
LanguageFeature.EmptyBodiedComputationExpressions, languageVersion90
216-
LanguageFeature.EnforceAttributeTargets, languageVersion90
217216
LanguageFeature.ConsistentNowarnLineDirectiveInteraction, languageVersion90
218217

219218
// F# preview
219+
LanguageFeature.EnforceAttributeTargets, previewVersion // waiting for fix of https://github.com/dotnet/fsharp/issues/17731
220220
LanguageFeature.UnmanagedConstraintCsharpInterop, previewVersion // not enabled because: https://github.com/dotnet/fsharp/issues/17509
221221
LanguageFeature.FromEndSlicing, previewVersion // Unfinished features --- needs work
222222
LanguageFeature.AllowAccessModifiersToAutoPropertiesGettersAndSetters, previewVersion
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
neg110.fs(5,3,5,15): typecheck error FS1133: No constructors are available for the type 'NotAttribute'
2-
31
neg110.fs(5,3,5,15): typecheck error FS3242: This type does not inherit Attribute, it will not work correctly with other .NET languages.
2+

0 commit comments

Comments
 (0)