Merge pull request #10 from sergey-tihon/swashbuckle

Dependency to Newtonsoft.Json NuGet  package

Author: sergey-tihon

RELEASE_NOTES.md

@@ -1,4 +1,8 @@
-#### 0.1.3-beta - December 12 2015
+#### 0.2.0 - December 13 2015
+* `AssemblyResolve` handler that resolve location of 3rd party dependencies
+* Added dependencies on `Newtonsoft.Json` NuGet package
+
+#### 0.1.3-beta - December 7 2015
 * Bug fixes
 
 #### 0.1.2-beta - November 22 2015

SwaggerProvider.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider", "src\SwaggerProvider\SwaggerProvider.fsproj", "{AD0B2860-9373-4BD9-906D-6D19F2F7DEE9}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.Runtime", "src\SwaggerProvider.Runtime\SwaggerProvider.Runtime.fsproj", "{AD0B2860-9373-4BD9-906D-6D19F2F7DEE9}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.Tests", "tests\SwaggerProvider.Tests\SwaggerProvider.Tests.fsproj", "{524FCCB2-CEA4-402B-BF6E-EE659966C853}"
 EndProject
@@ -26,6 +26,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Swashbuckle.OWIN.Server", "tests\Swashbuckle.OWIN.Server\Swashbuckle.OWIN.Server.fsproj", "{C2CD65DA-37A4-4A58-B450-C2AA7C8E8D2F}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.DesignTime", "src\SwaggerProvider.DesignTime\SwaggerProvider.DesignTime.fsproj", "{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider", "src\SwaggerProvider\SwaggerProvider.fsproj", "{F5FD2EFD-D6EC-4735-BEE7-DE1A9A35A6FD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -44,6 +48,14 @@ Global
 		{C2CD65DA-37A4-4A58-B450-C2AA7C8E8D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C2CD65DA-37A4-4A58-B450-C2AA7C8E8D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C2CD65DA-37A4-4A58-B450-C2AA7C8E8D2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5FD2EFD-D6EC-4735-BEE7-DE1A9A35A6FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5FD2EFD-D6EC-4735-BEE7-DE1A9A35A6FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5FD2EFD-D6EC-4735-BEE7-DE1A9A35A6FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5FD2EFD-D6EC-4735-BEE7-DE1A9A35A6FD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -52,5 +64,7 @@ Global
 		{AD0B2860-9373-4BD9-906D-6D19F2F7DEE9} = {727FB2BE-A8C5-4537-9C87-7083346E2865}
 		{524FCCB2-CEA4-402B-BF6E-EE659966C853} = {3A51AC71-D3EF-46DE-A7F0-E2B46370C6EE}
 		{C2CD65DA-37A4-4A58-B450-C2AA7C8E8D2F} = {3A51AC71-D3EF-46DE-A7F0-E2B46370C6EE}
+		{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D} = {727FB2BE-A8C5-4537-9C87-7083346E2865}
+		{F5FD2EFD-D6EC-4735-BEE7-DE1A9A35A6FD} = {727FB2BE-A8C5-4537-9C87-7083346E2865}
 	EndGlobalSection
 EndGlobal

build.fsx

@@ -37,11 +37,11 @@ let project = "SwaggerProvider"
 
 // Short summary of the project
 // (used as description in AssemblyInfo and as a short summary for NuGet package)
-let summary = "Type provider for Swagger.io"
+let summary = "F# Type Provider for Swagger"
 
 // Longer description of the project
 // (used as a description for NuGet package; line breaks are automatically cleaned up)
-let description = "Type provider for Swagger.io"
+let description = "F# Type Provider for Swagger"
 
 // List of author names (for NuGet package)
 let authors = [ "Sergey Tihon" ]
@@ -83,29 +83,13 @@ let (|Fsproj|Csproj|Vbproj|) (projFileName:string) =
 
 // Generate assembly info files with the right version & up-to-date information
 Target "AssemblyInfo" (fun _ ->
-    let getAssemblyInfoAttributes projectName =
-        [ Attribute.Title (projectName)
-          Attribute.Product project
-          Attribute.Description summary
-          Attribute.Version release.AssemblyVersion
-          Attribute.FileVersion release.AssemblyVersion ]
-
-    let getProjectDetails projectPath =
-        let projectName = System.IO.Path.GetFileNameWithoutExtension(projectPath)
-        ( projectPath,
-          projectName,
-          System.IO.Path.GetDirectoryName(projectPath),
-          (getAssemblyInfoAttributes projectName)
-        )
-
-    !! "src/**/*.??proj"
-    |> Seq.map getProjectDetails
-    |> Seq.iter (fun (projFileName, projectName, folderName, attributes) ->
-        match projFileName with
-        | Fsproj -> CreateFSharpAssemblyInfo (folderName @@ "AssemblyInfo.fs") attributes
-        | Csproj -> CreateCSharpAssemblyInfo ((folderName @@ "Properties") @@ "AssemblyInfo.cs") attributes
-        | Vbproj -> CreateVisualBasicAssemblyInfo ((folderName @@ "My Project") @@ "AssemblyInfo.vb") attributes
-        )
+    let fileName = "src/Common/AssemblyInfo.fs"
+    CreateFSharpAssemblyInfo fileName
+      [ Attribute.Title gitName
+        Attribute.Product gitName
+        Attribute.Description description
+        Attribute.Version release.AssemblyVersion
+        Attribute.FileVersion release.AssemblyVersion ]
 )
 
 // Copies binaries from default VS location to exepcted bin folder
@@ -115,6 +99,9 @@ Target "CopyBinaries" (fun _ ->
     !! "src/**/*.??proj"
     |>  Seq.map (fun f -> ((System.IO.Path.GetDirectoryName f) @@ "bin/Release", "bin" @@ (System.IO.Path.GetFileNameWithoutExtension f)))
     |>  Seq.iter (fun (fromDir, toDir) -> CopyDir toDir fromDir (fun _ -> true))
+
+    // All Type Providers components should be in the same directory
+    CopyDir "bin/SwaggerProvider" "bin/SwaggerProvider.DesignTime" (fun _ -> true)
 )
 
 // --------------------------------------------------------------------------------------

paket.dependencies

@@ -1,6 +1,6 @@
 source https://nuget.org/api/v2
 
-nuget Newtonsoft.Json
+nuget Newtonsoft.Json >= 7.0.1
 
 github fsharp/FSharp.Data src/Net/UriUtils.fs
 github fsharp/FSharp.Data src/Net/Http.fs
@@ -26,11 +26,11 @@ group Build
 	nuget SourceLink.Fake
 
 	github fsharp/FAKE modules/Octokit/Octokit.fsx
-	
+
 group OWIN
-	
+
 	source https://nuget.org/api/v2
-	
+
 	nuget Microsoft.AspNet.WebApi.OwinSelfHost
 	nuget Swashbuckle.Core
 
@@ -41,6 +41,5 @@ group Test
 	nuget NUnit ~> 2
 	nuget NUnit.Runners ~> 2
 	nuget FSharp.Data
-	nuget FSharp.Core
 
 	github fsprojects/FsUnit src/FsUnit.NUnit/FsUnit.fs

paket.lock

@@ -86,7 +86,6 @@ GROUP Test
 NUGET
   remote: https://nuget.org/api/v2
   specs:
-    FSharp.Core (4.0.0.1)
     FSharp.Data (2.2.5)
       Zlib.Portable (>= 1.10.0) - framework: portable-net40+sl50+wp80+win80
     NUnit (2.6.4)

src/Common/AssemblyInfo.fs

@@ -0,0 +1,12 @@
+namespace System
+open System.Reflection
+
+[<assembly: AssemblyTitleAttribute("SwaggerProvider")>]
+[<assembly: AssemblyProductAttribute("SwaggerProvider")>]
+[<assembly: AssemblyDescriptionAttribute("F# Type Provider for Swagger")>]
+[<assembly: AssemblyVersionAttribute("0.2.0")>]
+[<assembly: AssemblyFileVersionAttribute("0.2.0")>]
+do ()
+
+module internal AssemblyVersionInformation =
+    let [<Literal>] Version = "0.2.0"

src/SwaggerProvider.DesignTime/Configuration.fs

@@ -0,0 +1,101 @@
+/// [omit]
+module SwaggerProvider.Internal.Configuration
+
+open System
+open System.IO
+open System.Reflection
+open System.Configuration
+open System.Collections.Generic
+
+type Logging() =
+    static member logf (s:string) =
+        ()//System.IO.File.AppendAllLines(@"c:\swaggerlog.txt", [|s|])
+
+/// Returns the Assembly object of SwaggerProvider.Runtime.dll (this needs to
+/// work when called from SwaggerProvider.DesignTime.dll)
+let getSwaggerProviderRuntimeAssembly() =
+  AppDomain.CurrentDomain.GetAssemblies()
+  |> Seq.find (fun a -> a.FullName.StartsWith("SwaggerProvider,"))
+
+/// Finds directories relative to 'dirs' using the specified 'patterns'.
+/// Patterns is a string, such as "..\foo\*\bar" split by '\'. Standard
+/// .NET libraries do not support "*", so we have to do it ourselves..
+let rec searchDirectories patterns dirs =
+  match patterns with
+  | [] -> dirs
+  | "*"::patterns ->
+      dirs |> List.collect (Directory.GetDirectories >> List.ofSeq)
+      |> searchDirectories patterns
+  | name::patterns ->
+      dirs |> List.map (fun d -> Path.Combine(d, name))
+      |> searchDirectories patterns
+
+/// Returns the real assembly location - when shadow copying is enabled, this
+/// returns the original assembly location (which may contain other files we need)
+let getAssemblyLocation (assem:Assembly) =
+  if System.AppDomain.CurrentDomain.ShadowCopyFiles then
+      (new System.Uri(assem.EscapedCodeBase)).LocalPath
+  else assem.Location
+
+/// Reads the 'SwaggerProvider.dll.config' file and gets the 'ProbingLocations'
+/// parameter from the configuration file. Resolves the directories and returns
+/// them as a list.
+let getProbingLocations() =
+  try
+    let root = getSwaggerProviderRuntimeAssembly() |> getAssemblyLocation
+    Logging.logf <| sprintf "Root %s" root
+    let config = System.Configuration.ConfigurationManager.OpenExeConfiguration(root)
+    let pattern = config.AppSettings.Settings.["ProbingLocations"]
+    Logging.logf <| sprintf "Pattern %s" pattern.Value
+    if pattern <> null then
+      [ yield root
+        let pattern = pattern.Value.Split(';', ',') |> List.ofSeq
+        for pat in pattern do
+          let roots = [ Path.GetDirectoryName(root) ]
+          for dir in roots |> searchDirectories (List.ofSeq (pat.Split('/','\\'))) do
+            if Directory.Exists(dir) then yield dir ]
+    else []
+  with :? ConfigurationErrorsException | :? KeyNotFoundException -> []
+
+/// Given an assembly name, try to find it in either assemblies
+/// loaded in the current AppDomain, or in one of the specified
+/// probing directories.
+let resolveReferencedAssembly (asmName:string) =
+
+  // Do not interfere with loading FSharp.Core resources, see #97
+  if asmName.StartsWith "FSharp.Core.resources" then null else
+
+  // First, try to find the assembly in the currently loaded assemblies
+  let fullName = AssemblyName(asmName)
+  let loadedAsm =
+    System.AppDomain.CurrentDomain.GetAssemblies()
+    |> Seq.tryFind (fun a -> AssemblyName.ReferenceMatchesDefinition(fullName, a.GetName()))
+  match loadedAsm with
+  | Some asm -> asm
+  | None ->
+
+    // Otherwise, search the probing locations for a DLL file
+    let libraryName =
+      let idx = asmName.IndexOf(',')
+      if idx > 0 then asmName.Substring(0, idx) else asmName
+
+    let locations = getProbingLocations()
+    Logging.logf <| sprintf "Probing locations: %A" locations
+
+    let asm = locations |> Seq.tryPick (fun dir ->
+      let library = Path.Combine(dir, libraryName+".dll")
+      if File.Exists(library) then
+        Logging.logf <| sprintf "Found assembly, checking version! (%s)" library
+        // We do a ReflectionOnlyLoad so that we can check the version
+        let refAssem = Assembly.ReflectionOnlyLoadFrom(library)
+        // If it matches, we load the actual assembly
+        if refAssem.FullName = asmName then
+          Logging.logf "...version matches, returning!"
+          Some(Assembly.LoadFrom(library))
+        else
+          Logging.logf "...version mismatch, skipping"
+          None
+      else None)
+
+    if asm = None then Logging.logf "Assembly not found!"
+    defaultArg asm null

src/SwaggerProvider/DefinitionCompiler.fs renamed to src/SwaggerProvider.DesignTime/DefinitionCompiler.fs

@@ -18,12 +18,8 @@ type DefinitionCompiler (schema:SwaggerObject) =
                 GetterCode = (fun [this] -> Expr.FieldGet (this, providedField)),
                 SetterCode = (fun [this;v] -> Expr.FieldSet(this, providedField, v)))
         if name <> propertyName then
-            let attribute =
-                { new Reflection.CustomAttributeData() with
-                    member __.Constructor =  typeof<Newtonsoft.Json.JsonPropertyAttribute>.GetConstructor([|typeof<string>|])
-                    member __.ConstructorArguments = [|Reflection.CustomAttributeTypedArgument(typeof<string>, name)|] :> System.Collections.Generic.IList<_>
-                    member __.NamedArguments = [||] :> System.Collections.Generic.IList<_> }
-            property.AddCustomAttribute(attribute)
+            property.AddCustomAttribute
+                <| SwaggerProvider.Internal.RuntimeHelpers.getPropertyNameAttribute name
         property
 
     let rec compileDefinition (name:string) =