diff --git a/build/targets/GenerateAssemblyAttributes.targets b/build/targets/GenerateAssemblyAttributes.targets index b082253c43dd..11206a9b76d0 100644 --- a/build/targets/GenerateAssemblyAttributes.targets +++ b/build/targets/GenerateAssemblyAttributes.targets @@ -26,8 +26,6 @@ $(IntermediateOutputPath)$(MSBuildProjectName).AssemblyVersion$(DefaultLanguageSourceExtension) - - 2003;$(NoWarn) diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index 2ffcfe75f542..658baff82f44 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -17293,7 +17293,6 @@ let TypeCheckOneImplFile try IL.parseILVersion version |> ignore; true with _ -> false match attrName with - | "System.Reflection.AssemblyInformationalVersionAttribute" | "System.Reflection.AssemblyFileVersionAttribute" //TODO compile error like c# compiler? | "System.Reflection.AssemblyVersionAttribute" when not (isValid()) -> warning(Error(FSComp.SR.fscBadAssemblyVersion(attrName, version), range)) diff --git a/tests/fsharp/core/versionAttributes/NoWarn2003.fs b/tests/fsharp/core/versionAttributes/NoWarn2003.fs index 130e85471550..be2350b451b7 100644 --- a/tests/fsharp/core/versionAttributes/NoWarn2003.fs +++ b/tests/fsharp/core/versionAttributes/NoWarn2003.fs @@ -1,13 +1,12 @@ namespace System open System.Reflection -[] - do () namespace System open System.Reflection #nowarn "2003" -[] +[] + do () \ No newline at end of file diff --git a/tests/fsharp/core/versionAttributes/out.stderr.bsl b/tests/fsharp/core/versionAttributes/out.stderr.bsl index 86fdb0fe4d1c..89d567a75752 100644 --- a/tests/fsharp/core/versionAttributes/out.stderr.bsl +++ b/tests/fsharp/core/versionAttributes/out.stderr.bsl @@ -6,13 +6,9 @@ Test 2================================================= NoWarn2003_2.fs(8,6): warning FS0988: Main module of program is empty: nothing will happen when it is run Test 3================================================= -Warn2003_1.fs(5,42): warning FS2003: The attribute System.Reflection.AssemblyInformationalVersionAttribute specified version '5.0.0-beta024', but this value is invalid and has been ignored - Warn2003_1.fs(7,6): warning FS0988: Main module of program is empty: nothing will happen when it is run Test 4================================================= -Warn2003_2.fs(4,42): warning FS2003: The attribute System.Reflection.AssemblyInformationalVersionAttribute specified version '5.0.0-beta024', but this value is invalid and has been ignored - Warn2003_2.fs(6,6): warning FS0988: Main module of program is empty: nothing will happen when it is run Test 5================================================= diff --git a/tests/fsharpqa/Source/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs b/tests/fsharpqa/Source/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs index bffe0e26fdf3..fffa537e1b42 100644 --- a/tests/fsharpqa/Source/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs +++ b/tests/fsharpqa/Source/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs @@ -1,9 +1,7 @@ // #Regression #Conformance #DeclarationElements #Attributes -//The attribute System.Reflection.AssemblyInformationalVersionAttribute specified version '6\.5\.4\.3\.2', but this value is invalid and has been ignored //The attribute System.Reflection.AssemblyFileVersionAttribute specified version '9\.8\.7\.6\.5', but this value is invalid and has been ignored [] -[] [] do () diff --git a/tests/fsharpqa/Source/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs b/tests/fsharpqa/Source/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs index c7bfb33e2061..3be7ab70bef5 100644 --- a/tests/fsharpqa/Source/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs +++ b/tests/fsharpqa/Source/Conformance/DeclarationElements/CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs @@ -1,9 +1,7 @@ // #Regression #Conformance #DeclarationElements #Attributes -//The attribute System.Reflection.AssemblyInformationalVersionAttribute specified version '6\.5\.\*\.3', but this value is invalid and has been ignored //The attribute System.Reflection.AssemblyFileVersionAttribute specified version '9\.8\.\*\.6', but this value is invalid and has been ignored [] -[] [] do ()