From 9a7e357d5005890ba79b7bb140eb433a63de5523 Mon Sep 17 00:00:00 2001
From: Tuomas Hietanen <thorium@iki.fi>
Date: Fri, 19 Apr 2024 11:21:43 +0100
Subject: [PATCH] ResolutionPath assembly load fix, fix for #818

---
 docs/RELEASE_NOTES.md                              | 3 +++
 src/Common/AssemblyInfo.fs                         | 8 ++++----
 src/SQLProvider.Runtime/SQLProvider.Runtime.fsproj | 2 +-
 src/SQLProvider.Runtime/Utils.fs                   | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md
index ce654316..63c09699 100644
--- a/docs/RELEASE_NOTES.md
+++ b/docs/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 1.3.36 - 19.04.2024
+* ResolutionPath assembly load fix, fix for #818
+
 ### 1.3.35 - 09.04.2024
 * Support navigation property queries in mocks
 
diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs
index 0c81c9d9..04c6cc5f 100644
--- a/src/Common/AssemblyInfo.fs
+++ b/src/Common/AssemblyInfo.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("SQLProvider")>]
 [<assembly: AssemblyProductAttribute("SQLProvider")>]
 [<assembly: AssemblyDescriptionAttribute("Type providers for SQL database access.")>]
-[<assembly: AssemblyVersionAttribute("1.3.35")>]
-[<assembly: AssemblyFileVersionAttribute("1.3.35")>]
+[<assembly: AssemblyVersionAttribute("1.3.36")>]
+[<assembly: AssemblyFileVersionAttribute("1.3.36")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "SQLProvider"
     let [<Literal>] AssemblyProduct = "SQLProvider"
     let [<Literal>] AssemblyDescription = "Type providers for SQL database access."
-    let [<Literal>] AssemblyVersion = "1.3.35"
-    let [<Literal>] AssemblyFileVersion = "1.3.35"
+    let [<Literal>] AssemblyVersion = "1.3.36"
+    let [<Literal>] AssemblyFileVersion = "1.3.36"
diff --git a/src/SQLProvider.Runtime/SQLProvider.Runtime.fsproj b/src/SQLProvider.Runtime/SQLProvider.Runtime.fsproj
index e4267bd5..3a484097 100644
--- a/src/SQLProvider.Runtime/SQLProvider.Runtime.fsproj
+++ b/src/SQLProvider.Runtime/SQLProvider.Runtime.fsproj
@@ -11,7 +11,7 @@
     <DefineConstants>TP_RUNTIME;NETSTANDARD;NO_GENERATIVE</DefineConstants>
     <AssemblyName>FSharp.Data.SqlProvider</AssemblyName>
     <Name>FSharp.Data.SqlProvider</Name>
-    <DocumentationFile>..\..\bin\net48\FSharp.Data.SqlProvider.XML</DocumentationFile>
+    <DocumentationFile>..\..\bin\net472\FSharp.Data.SqlProvider.XML</DocumentationFile>
     <OutputPath>..\..\bin\</OutputPath>
     <PackageReleaseNotes>https://github.com/fsprojects/SQLProvider/blob/master/docs/RELEASE_NOTES.md</PackageReleaseNotes>
     <PackageProjectUrl>https://fsprojects.github.io/SQLProvider</PackageProjectUrl>
diff --git a/src/SQLProvider.Runtime/Utils.fs b/src/SQLProvider.Runtime/Utils.fs
index 635da6af..35f86e49 100644
--- a/src/SQLProvider.Runtime/Utils.fs
+++ b/src/SQLProvider.Runtime/Utils.fs
@@ -461,7 +461,7 @@ module internal Reflection =
             |> Array.filter (fun ra -> assemblyNames |> List.exists(fun (a:string) -> ra.Contains(a)))
             |> Array.toList
         
-        let resolutionPaths =
+        let resolutionPathsFiles =
             assemblyNames 
             |> List.collect (fun asm ->
                 if List.isEmpty resolutionPaths then
@@ -513,7 +513,7 @@ module internal Reflection =
             |> Seq.concat |> Seq.toList
 
         let allPaths =
-            (assemblyNames @ resolutionPaths @ referencedPaths @ currentPaths) 
+            (assemblyNames @ resolutionPathsFiles @ referencedPaths @ currentPaths) 
             |> Seq.distinct |> Seq.toList
 
         let tryLoadFromMemory () =