Merge pull request #11 from SilkyFowl/SilkyFowl/issue7

SilkyFowl · Jun 22, 2022 · e68bf49 · e68bf49
2 parents 73a2525 + 37296e8
commit e68bf49
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,11 @@
+### 0.0.1-alpha4
+
+* Remove unnecessary dependencies
+
+### 0.0.1-alpha3
+
+* Fix Dependencies
+
 ### 0.0.1-alpha2
 
 * Add License

diff --git a/build.fsx b/build.fsx
@@ -78,6 +78,10 @@ module Nuspec =
     open System.IO.Compression
 
     let addLicense (proj: ProjSetting) =
+        let xn = XName.Get
+
+        let ns localName =
+            XName.Get(localName, "http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd")
 
         let unzipedPath =
             outputPath
@@ -91,17 +95,20 @@ module Nuspec =
 
         let nupkgDoc = XDocument.Load nuspecPath
 
-        let xn localName =
-            XName.Get(localName, "http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd")
-
-        nupkgDoc.Descendants(xn "authors")
+        nupkgDoc.Descendants(ns "authors")
         |> Seq.iter (fun metadata ->
             metadata.AddAfterSelf(
-                XElement(xn "requireLicenseAcceptance", "false"),
-                XElement(xn "license", XAttribute(XName.Get "type", "file"), "LICENSE.md"),
-                XElement(xn "licenseUrl", "https://aka.ms/deprecateLicenseUrl")
+                XElement(ns "requireLicenseAcceptance", "false"),
+                XElement(ns "license", XAttribute(xn "type", "file"), "LICENSE.md"),
+                XElement(ns "licenseUrl", "https://aka.ms/deprecateLicenseUrl")
             ))
 
+        if proj = analyzerProjSetting then
+            nupkgDoc.Descendants(ns "dependency")
+            |> Seq.filter (fun dependency -> dependency.Attribute(xn "id").Value <> "FSharp.Analyzers.SDK")
+            |> Seq.toList
+            |> List.iter (fun dependency -> dependency.Remove())
+
         nupkgDoc.Save nuspecPath
         Shell.rm nupkgPath
 
@@ -141,15 +148,13 @@ Target.create "Pack" (fun _ ->
                 SelfContained = Some false
                 Framework = Some "net6.0" })
 
-        let isAvalyzer = setting.projSetting = analyzerProjSetting
-
         Paket.pack (fun p ->
             { p with
                 ToolType = ToolType.CreateLocalTool()
                 TemplateFile = Option.toObj setting.templateParams.TemplateFilePath
                 OutputPath = outputPath
-                MinimumFromLockFile = not isAvalyzer
-                IncludeReferencedProjects = not isAvalyzer })
+                MinimumFromLockFile = true
+                IncludeReferencedProjects = true })
 
         Nuspec.addLicense setting.projSetting)
 

diff --git a/src/Avalonia.FuncUI.LiveView.Analyzer/paket.template b/src/Avalonia.FuncUI.LiveView.Analyzer/paket.template
@@ -1,10 +1,10 @@
 type project
 id SilkyFowl.Avalonia.FuncUI.LiveView.Analyzer
-version 0.0.1-alpha2
+version 0.0.1-alpha4
 description Live fs/fsx previewer for Avalonia.FuncUI.
 authors SilkyFowl
 projectUrl https://github.com/SilkyFowl/Avalonia.FuncUI.LiveView
-releaseNotes Add License
+releaseNotes Remove unnecessary dependencies
 files
     ..\..\LICENSE.md ==> 
     bin\Release\net6.0\publish ==> lib\net6.0
diff --git a/src/Avalonia.FuncUI.LiveView/paket.template b/src/Avalonia.FuncUI.LiveView/paket.template
@@ -1,8 +1,8 @@
 type project
 id SilkyFowl.Avalonia.FuncUI.LiveView
-version 0.0.1-alpha2
+version 0.0.1-alpha4
 description Live fs/fsx previewer for Avalonia.FuncUI.
 authors SilkyFowl
 projectUrl https://github.com/SilkyFowl/Avalonia.FuncUI.LiveView
-releaseNotes Add License
+releaseNotes Remove unnecessary dependencies
 files ..\..\LICENSE.md ==>