Added frameworkAssemblies to nuspec templating

fsprojects · Mar 31, 2015 · e23df9d · e23df9d
1 parent 1db0c6c
commit e23df9d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/app/FakeLib/NuGet/NugetHelper.fs b/src/app/FakeLib/NuGet/NugetHelper.fs
@@ -19,6 +19,10 @@ type NugetFrameworkReferences =
     { FrameworkVersion : string
       References : NugetReferences }
 
+type NugetFrameworkAssemblyReferences =
+    { FrameworkVersion : string
+      AssemblyName : string }
+
 type NugetSymbolPackage =
     /// Do not build symbol packages
     | None = 0
@@ -51,6 +55,7 @@ type NuGetParams =
       DependenciesByFramework : NugetFrameworkDependencies list
       References : NugetReferences
       ReferencesByFramework : NugetFrameworkReferences list
+      FrameworkAssemblies : NugetFrameworkAssemblyReferences list
       IncludeReferencedProjects : bool
       PublishTrials : int
       Publish : bool
@@ -78,6 +83,7 @@ let NuGetDefaults() =
       DependenciesByFramework = []
       References = []
       ReferencesByFramework = []
+      FrameworkAssemblies = []
       IncludeReferencedProjects = false
       OutputPath = "./NuGet"
       WorkingDir = "./NuGet"
@@ -153,9 +159,18 @@ let private createNuSpecFromTemplate parameters (templateNuSpec:FileInfo) =
         parameters.ReferencesByFramework
         |> Seq.map (fun x -> (x.FrameworkVersion, getReferencesTags x.References))
         |> getFrameworkGroup
-    
+
     let referencesXml = sprintf "<references>%s</references>" (references + referencesByFramework)
 
+    let getFrameworkAssemblyTags references =
+        references
+        |> Seq.map (fun x -> sprintf "<frameworkAssembly assemblyName=\"%s\" targetFramework=\"%s\" />" x.AssemblyName x.FrameworkVersion)
+        |> toLines
+
+    let frameworkAssembliesXml =
+        if parameters.FrameworkAssemblies = [] then ""
+        else sprintf "<frameworkAssemblies>%s</frameworkAssemblies>" (parameters.FrameworkAssemblies |> getFrameworkAssemblyTags)
+
     let getDependenciesTags dependencies = 
         dependencies
         |> Seq.map (fun (package, version) -> sprintf "<dependency id=\"%s\" version=\"%s\" />" package version)
@@ -207,6 +222,7 @@ let private createNuSpecFromTemplate parameters (templateNuSpec:FileInfo) =
         |> List.map (fun (placeholder, replacement) -> placeholder, xmlEncode replacement)
         |> List.append [ "@dependencies@", dependenciesXml
                          "@references@", referencesXml
+                         "@frameworkAssemblies@", frameworkAssembliesXml
                          "@files@", filesXml ]
 
     processTemplates replacements [ specFile ]

diff --git a/src/test/Test.FAKECore/PackageMgt/NugetSpecs.cs b/src/test/Test.FAKECore/PackageMgt/NugetSpecs.cs
@@ -47,6 +47,7 @@ public class when_packing_with_nuspec_template
                     publishUrl: p.PublishUrl,
                     references: p.References,
                     referencesByFramework: p.ReferencesByFramework,
+                    frameworkAssemblies: p.FrameworkAssemblies,
                     releaseNotes: p.ReleaseNotes,
                     symbolPackage: p.SymbolPackage,
                     tags: p.Tags,
@@ -101,6 +102,7 @@ public class when_packing_with_csproj_and_complete_nuspec_alongside
                     publishUrl: p.PublishUrl,
                     references: p.References,
                     referencesByFramework: p.ReferencesByFramework,
+                    frameworkAssemblies: p.FrameworkAssemblies,
                     releaseNotes: p.ReleaseNotes,
                     symbolPackage: p.SymbolPackage,
                     tags: p.Tags,
@@ -167,6 +169,7 @@ public class when_packing_with_a_complete_nuspec_file
                     publishUrl: p.PublishUrl,
                     references: p.References,
                     referencesByFramework: p.ReferencesByFramework,
+                    frameworkAssemblies: p.FrameworkAssemblies,
                     releaseNotes: p.ReleaseNotes,
                     symbolPackage: p.SymbolPackage,
                     tags: p.Tags,