Remove NpgsqlFSharpAnalyzer.Core from the nuget references. Fixes Zai…

…d-Ajaj#9
FoothillSolutions · Aug 31, 2020 · 8510b40 · 8510b40
1 parent b1592a8
commit 8510b40
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 61 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 3.12.1 - 2020-08-31
+* Remove NpgsqlFSharpAnalyzer.Core nuget package reference from the analyzer
+
 ### 3.12.0 - 2020-08-29
 * Parameter nullability inference for parsable queries
 * Detecting the missing columns which are required for INSERT queries

diff --git a/build.fsx b/build.fsx
@@ -255,6 +255,8 @@ let generateAssemblyInfo _ =
      )
 
 let dotnetPack ctx =
+    Shell.cleanDir (__SOURCE_DIRECTORY__ </> "dist")
+
     let args =
         [
             "pack"
@@ -280,6 +282,16 @@ let dotnetPack ctx =
 
             let publishPath = "src" </> "NpgsqlFSharpAnalyzer" </> "bin" </> "Release" </> "netcoreapp2.0" </> "publish"
             ZipFile.ExtractToDirectory(nupkg, nugetParent </> nugetFileName)
+            let nuspecFile = nugetParent </> nugetFileName </> "NpgsqlFSharpAnalyzer.nuspec"
+            // rewriteNuspec
+            nuspecFile
+            |> File.ReadAllLines
+            |> Array.choose (fun line ->
+                if line.Contains "<dependency id=\"NpgsqlFSharpAnalyzer.Core\""
+                then None
+                else Some line)
+            |> fun content -> File.WriteAllLines(nuspecFile, content)
+
             File.Delete nupkg
             Shell.deleteDir (nugetParent </> nugetFileName </> "lib" </> "netcoreapp2.0")
             Shell.copyDir (nugetParent </> nugetFileName </> "lib" </> "netcoreapp2.0") publishPath (fun _ -> true)
@@ -319,6 +331,7 @@ Target.create "DotnetPack" dotnetPack
 Target.create "PublishToNuGet" publishToNuget
 Target.create "Release" ignore
 
+Target.create "PackNoTests" dotnetPack
 //-----------------------------------------------------------------------------
 // Target Dependencies
 //-----------------------------------------------------------------------------

diff --git a/src/FParsec/AssemblyInfo.fs b/src/FParsec/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("FParsec")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.12.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-08-29T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.12.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.12.0")>]
+[<assembly: AssemblyVersionAttribute("3.12.1")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-08-31T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.12.1")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.12.1")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","fdb4e9da4d035afc38f1941a84adf621fd8c2574")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","b1592a80c9432a89e1edf34d5e8dbcb1e1f84338")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FParsec"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.12.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-08-29T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.12.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.12.0"
+    let [<Literal>] AssemblyVersion = "3.12.1"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-08-31T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.12.1"
+    let [<Literal>] AssemblyInformationalVersion = "3.12.1"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "fdb4e9da4d035afc38f1941a84adf621fd8c2574"
+    let [<Literal>] AssemblyMetadata_GitHash = "b1592a80c9432a89e1edf34d5e8dbcb1e1f84338"
diff --git a/src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs b/src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("NpgsqlFSharpAnalyzer.Core")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.12.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-08-29T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.12.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.12.0")>]
+[<assembly: AssemblyVersionAttribute("3.12.1")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-08-31T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.12.1")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.12.1")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","fdb4e9da4d035afc38f1941a84adf621fd8c2574")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","b1592a80c9432a89e1edf34d5e8dbcb1e1f84338")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer.Core"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.12.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-08-29T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.12.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.12.0"
+    let [<Literal>] AssemblyVersion = "3.12.1"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-08-31T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.12.1"
+    let [<Literal>] AssemblyInformationalVersion = "3.12.1"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "fdb4e9da4d035afc38f1941a84adf621fd8c2574"
+    let [<Literal>] AssemblyMetadata_GitHash = "b1592a80c9432a89e1edf34d5e8dbcb1e1f84338"
diff --git a/src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs b/src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("NpgsqlFSharpAnalyzer")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.12.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-08-29T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.12.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.12.0")>]
+[<assembly: AssemblyVersionAttribute("3.12.1")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-08-31T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.12.1")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.12.1")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","fdb4e9da4d035afc38f1941a84adf621fd8c2574")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","b1592a80c9432a89e1edf34d5e8dbcb1e1f84338")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.12.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-08-29T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.12.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.12.0"
+    let [<Literal>] AssemblyVersion = "3.12.1"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-08-31T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.12.1"
+    let [<Literal>] AssemblyInformationalVersion = "3.12.1"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "fdb4e9da4d035afc38f1941a84adf621fd8c2574"
+    let [<Literal>] AssemblyMetadata_GitHash = "b1592a80c9432a89e1edf34d5e8dbcb1e1f84338"
diff --git a/src/NpgsqlFSharpParser/AssemblyInfo.fs b/src/NpgsqlFSharpParser/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("NpgsqlFSharpParser")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.12.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-08-29T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.12.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.12.0")>]
+[<assembly: AssemblyVersionAttribute("3.12.1")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-08-31T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.12.1")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.12.1")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","fdb4e9da4d035afc38f1941a84adf621fd8c2574")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","b1592a80c9432a89e1edf34d5e8dbcb1e1f84338")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpParser"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.12.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-08-29T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.12.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.12.0"
+    let [<Literal>] AssemblyVersion = "3.12.1"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-08-31T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.12.1"
+    let [<Literal>] AssemblyInformationalVersion = "3.12.1"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "fdb4e9da4d035afc38f1941a84adf621fd8c2574"
+    let [<Literal>] AssemblyMetadata_GitHash = "b1592a80c9432a89e1edf34d5e8dbcb1e1f84338"
diff --git a/src/NpgsqlFSharpVs/source.extension.vsixmanifest b/src/NpgsqlFSharpVs/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"
     xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="FSharpLintVs.ef00bfc3-a899-45fc-aae8-afecf8673aaf" Version="3.12.0" Language="en-US" Publisher="Zaid Ajaj" />
+        <Identity Id="FSharpLintVs.ef00bfc3-a899-45fc-aae8-afecf8673aaf" Version="3.12.1" Language="en-US" Publisher="Zaid Ajaj" />
         <DisplayName>NpgsqlFSharpVs</DisplayName>
         <Description xml:space="preserve">F# Analyzer for embedded SQL syntax analysis, type-checking for parameters and result sets and nullable column detection when writing queries using Npgsql.FSharp.</Description>
         <MoreInfo>https://github.com/Zaid-Ajaj/Npgsql.FSharp.Analyzer</MoreInfo>

diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs b/tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("NpgsqlFSharpAnalyzer.Tests")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.12.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-08-29T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.12.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.12.0")>]
+[<assembly: AssemblyVersionAttribute("3.12.1")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-08-31T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.12.1")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.12.1")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","fdb4e9da4d035afc38f1941a84adf621fd8c2574")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","b1592a80c9432a89e1edf34d5e8dbcb1e1f84338")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer.Tests"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.12.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-08-29T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.12.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.12.0"
+    let [<Literal>] AssemblyVersion = "3.12.1"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-08-31T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.12.1"
+    let [<Literal>] AssemblyInformationalVersion = "3.12.1"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "fdb4e9da4d035afc38f1941a84adf621fd8c2574"
+    let [<Literal>] AssemblyMetadata_GitHash = "b1592a80c9432a89e1edf34d5e8dbcb1e1f84338"
diff --git a/tests/examples/hashing/AssemblyInfo.fs b/tests/examples/hashing/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("examples")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.12.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-08-29T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.12.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.12.0")>]
+[<assembly: AssemblyVersionAttribute("3.12.1")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-08-31T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.12.1")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.12.1")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","fdb4e9da4d035afc38f1941a84adf621fd8c2574")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","b1592a80c9432a89e1edf34d5e8dbcb1e1f84338")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "examples"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.12.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-08-29T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.12.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.12.0"
+    let [<Literal>] AssemblyVersion = "3.12.1"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-08-31T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.12.1"
+    let [<Literal>] AssemblyInformationalVersion = "3.12.1"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "fdb4e9da4d035afc38f1941a84adf621fd8c2574"
+    let [<Literal>] AssemblyMetadata_GitHash = "b1592a80c9432a89e1edf34d5e8dbcb1e1f84338"