From 8b6d15ca8190a0ae4abb4a7a451658a8895184da Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Thu, 12 Jul 2018 09:59:09 -0700 Subject: [PATCH 1/5] remove TypeChecker validation --- src/fsharp/TypeChecker.fs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index 99af25b15f6..879956b002a 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -17309,7 +17309,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)) From 1be4e0bf3866c4cecb2f42af41d7821bfac43499 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 12 Jul 2018 16:47:56 -0700 Subject: [PATCH 2/5] update testcase baselines --- tests/fsharp/core/versionAttributes/out.stderr.bsl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/fsharp/core/versionAttributes/out.stderr.bsl b/tests/fsharp/core/versionAttributes/out.stderr.bsl index 86fdb0fe4d1..89d567a7575 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================================================= From 85f90836df0dc737875821dc3e51b9a8053a9b59 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Thu, 12 Jul 2018 18:43:32 -0700 Subject: [PATCH 3/5] Update fsharpqa tests --- .../CustomAttributes/AttributeUsage/X_AssemblyVersion01.fs | 2 -- .../CustomAttributes/AttributeUsage/X_AssemblyVersion02.fs | 2 -- 2 files changed, 4 deletions(-) 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 bffe0e26fdf..fffa537e1b4 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 c7bfb33e206..3be7ab70bef 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 () From 1e98e2adf6668de3706e800b801d31e1d984729b Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 13 Jul 2018 19:21:50 -0700 Subject: [PATCH 4/5] Feedback --- build/targets/GenerateAssemblyAttributes.targets | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/targets/GenerateAssemblyAttributes.targets b/build/targets/GenerateAssemblyAttributes.targets index b082253c43d..11206a9b76d 100644 --- a/build/targets/GenerateAssemblyAttributes.targets +++ b/build/targets/GenerateAssemblyAttributes.targets @@ -26,8 +26,6 @@ $(IntermediateOutputPath)$(MSBuildProjectName).AssemblyVersion$(DefaultLanguageSourceExtension) - - 2003;$(NoWarn) From b4ccb0dda8e5b44c2184c56390f9f990b8bb981a Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 13 Jul 2018 20:23:33 -0700 Subject: [PATCH 5/5] Update nowarn test --- tests/fsharp/core/versionAttributes/NoWarn2003.fs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/fsharp/core/versionAttributes/NoWarn2003.fs b/tests/fsharp/core/versionAttributes/NoWarn2003.fs index 130e8547155..be2350b451b 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