Release fix for F# 3.1.2 (shadow copying)

This also changes R.NET reference to require a specific version. This is more correct, because otherwise the `RProvider.fsx` script won't work when a new version of R.NET is released (it has a specific version in the `#r` path). The same is a problem for Deedle and FsLab (fix follows).
RussellPolitzky · Sep 9, 2014 · d4a3c53 · d4a3c53
1 parent bf930e5
commit d4a3c53
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -10,4 +10,5 @@
 * 1.0.12 - Use correct folders in NuGet package
 * 1.0.13 - Fix the Print extension method
 * 1.0.14 - Fix the module clash error in FsLab (#46). Fix assembly resolution (#117). Update NuGET and automatically update FAKE(#116).
-* 1.0.15 - Fix bad upload to NuGet.org
+* 1.0.15 - Fix bad upload to NuGet.org
+* 1.0.16 - Fix shadow copying (#122) and require specific R.NET version
diff --git a/nuget/RProvider.nuspec b/nuget/RProvider.nuspec
@@ -15,8 +15,8 @@
     <tags>@tags@</tags>
     <language>en-US</language>
     <dependencies>
-      <dependency id="R.NET.Community" version="1.5.15" />
-      <dependency id="R.NET.Community.FSharp" version="0.1.8" />
+      <dependency id="R.NET.Community" version="[1.5.15]" />
+      <dependency id="R.NET.Community.FSharp" version="[0.1.8]" />
     </dependencies>    
   </metadata>
   <files>

diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs
@@ -5,9 +5,9 @@ open System.Reflection
 [<assembly: AssemblyCompanyAttribute("BlueMountain Capital")>]
 [<assembly: AssemblyProductAttribute("RProvider")>]
 [<assembly: AssemblyDescriptionAttribute("An F# Type Provider providing strongly typed access to the R statistical package.")>]
-[<assembly: AssemblyVersionAttribute("1.0.15")>]
-[<assembly: AssemblyFileVersionAttribute("1.0.15")>]
+[<assembly: AssemblyVersionAttribute("1.0.16")>]
+[<assembly: AssemblyFileVersionAttribute("1.0.16")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "1.0.15"
+    let [<Literal>] Version = "1.0.16"
diff --git a/src/RProvider/RProvider.fsx b/src/RProvider/RProvider.fsx
@@ -8,10 +8,10 @@
 #I "../packages/R.NET.Community.1.5.15/lib/net40"
 #I "../../packages/R.NET.Community.1.5.15/lib/net40"
 #I "../../../packages/R.NET.Community.1.5.15/lib/net40"
-#I "packages/RProvider.1.0.15/lib/net40"
-#I "../packages/RProvider.1.0.15/lib/net40"
-#I "../../packages/RProvider.1.0.15/lib/net40"
-#I "../../../packages/RProvider.1.0.15/lib/net40"
+#I "packages/RProvider.1.0.16/lib/net40"
+#I "../packages/RProvider.1.0.16/lib/net40"
+#I "../../packages/RProvider.1.0.16/lib/net40"
+#I "../../../packages/RProvider.1.0.16/lib/net40"
 // Reference RProvider and RDotNet 
 #r "RDotNet.dll"
 #r "RProvider.dll"