Downgrade R.NET reference and new release

jccampagne · Jan 13, 2015 · a9e650c · a9e650c
1 parent 747113a
commit a9e650c
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 91 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -17,3 +17,5 @@
 * 1.1.1-alpha - Support Paket project structure, Fix ILMerge issues
 * 1.1.2-alpha - Reference ILRepack through NuGet, but disable it (breaks on Mono)
 * 1.1.3-alpha - Fix remaining Mono issues and add documentation
+* 1.1.4-alpha - Fix load script in the NuGet package
+* 1.1.5-alpha - Downgrade R.NET version and update load script
diff --git a/nuget/RProvider.nuspec b/nuget/RProvider.nuspec
@@ -15,9 +15,8 @@
     <tags>@tags@</tags>
     <language>en-US</language>
     <dependencies>
-      <dependency id="R.NET.Community" version="[1.5.19]" />
-      <dependency id="R.NET.Community.FSharp" version="[0.1.11]" />
-      <dependency id="DynamicInterop" version="[0.7.1]" />
+      <dependency id="R.NET.Community" version="[1.5.16]" />
+      <dependency id="R.NET.Community.FSharp" version="[0.1.9]" />
     </dependencies>    
     <references>
       <reference file="RProvider.Runtime.dll" />

diff --git a/paket.dependencies b/paket.dependencies
@@ -3,7 +3,8 @@ source https://www.nuget.org/api/v2
 nuget FsCheck.Xunit
 nuget FSharp.Data
 nuget FSharp.Formatting
-nuget R.NET.Community.FSharp
+nuget R.NET.Community 1.5.16
+nuget R.NET.Community.FSharp 0.1.9
 nuget xunit.runners
 nuget FAKE
 nuget NuGet.CommandLine

diff --git a/paket.lock b/paket.lock
@@ -1,7 +1,6 @@
 NUGET
   remote: https://www.nuget.org/api/v2
   specs:
-    DynamicInterop (0.7.1.0)
     FAKE (3.13.4)
     FsCheck (1.0.4)
     FsCheck.Xunit (1.0.4)
@@ -15,10 +14,9 @@ NUGET
       FSharp.Compiler.Service (>= 0.0.81)
     ILRepack (1.25.0)
     NuGet.CommandLine (2.8.3)
-    R.NET.Community (1.5.19)
-      DynamicInterop (>= 0.7.1)
-    R.NET.Community.FSharp (0.1.11)
-      R.NET.Community (>= 1.5.19)
+    R.NET.Community (1.5.16)
+    R.NET.Community.FSharp (0.1.9)
+      R.NET.Community (>= 1.5.16)
     xunit (1.9.2)
     xunit.runners (1.9.2)
     Zlib.Portable (1.10.0)

diff --git a/src/RProvider.DesignTime/RProvider.DesignTime.fsproj b/src/RProvider.DesignTime/RProvider.DesignTime.fsproj
@@ -92,17 +92,6 @@
 	</Target>
 	-->
   <Import Project="..\..\.paket\paket.targets" />
-  <Choose>
-    <When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
-      <ItemGroup>
-        <Reference Include="DynamicInterop">
-          <HintPath>..\..\packages\DynamicInterop\lib\net40\DynamicInterop.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
   <Choose>
     <When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
       <ItemGroup>

diff --git a/src/RProvider/RProvider.Runtime.fsproj b/src/RProvider/RProvider.Runtime.fsproj
@@ -81,17 +81,6 @@
 	</Target>
 	-->
   <Import Project="..\..\.paket\paket.targets" />
-  <Choose>
-    <When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
-      <ItemGroup>
-        <Reference Include="DynamicInterop">
-          <HintPath>..\..\packages\DynamicInterop\lib\net40\DynamicInterop.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
   <Choose>
     <When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
       <ItemGroup>

diff --git a/src/RProvider/RProvider.Server.fsproj b/src/RProvider/RProvider.Server.fsproj
@@ -87,17 +87,6 @@
     <Copy SourceFiles="..\..\packages\FSharp.Core\lib\net40\FSharp.Core.sigdata" DestinationFolder="$(OutputPath)" />
   </Target>
   <Import Project="..\..\.paket\paket.targets" />
-  <Choose>
-    <When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
-      <ItemGroup>
-        <Reference Include="DynamicInterop">
-          <HintPath>..\..\packages\DynamicInterop\lib\net40\DynamicInterop.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
   <Choose>
     <When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
       <ItemGroup>

diff --git a/src/RProvider/RProvider.fsproj b/src/RProvider/RProvider.fsproj
@@ -81,17 +81,6 @@
 	</Target>
 	-->
   <Import Project="..\..\.paket\paket.targets" />
-  <Choose>
-    <When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
-      <ItemGroup>
-        <Reference Include="DynamicInterop">
-          <HintPath>..\..\packages\DynamicInterop\lib\net40\DynamicInterop.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
   <Choose>
     <When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
       <ItemGroup>

diff --git a/src/RProvider/RProvider.fsx b/src/RProvider/RProvider.fsx
@@ -4,18 +4,28 @@
 #I "bin"
 #I "../bin"
 #I "../../bin"
-#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/R.NET.Community.1.5.15/lib/net40"
-#I "packages/R.NET.Community.FSharp.0.1.8/lib/net40"
-#I "../packages/R.NET.Community.FSharp.0.1.8/lib/net40"
-#I "../../packages/R.NET.Community.FSharp.0.1.8/lib/net40"
-#I "../../../packages/R.NET.Community.FSharp.0.1.8/lib/net40"
+// With version number when referenced through NuGet
+#I "packages/R.NET.Community.1.5.16/lib/net40"
+#I "../packages/R.NET.Community.1.5.16/lib/net40"
+#I "../../packages/R.NET.Community.1.5.16/lib/net40"
+#I "../../../packages/R.NET.Community.1.5.16/lib/net40"
+#I "packages/R.NET.Community.FSharp.0.1.9/lib/net40"
+#I "../packages/R.NET.Community.FSharp.0.1.9/lib/net40"
+#I "../../packages/R.NET.Community.FSharp.0.1.9/lib/net40"
+#I "../../../packages/R.NET.Community.FSharp.0.1.9/lib/net40"
 #I "packages/RProvider.1.1.3-alpha/lib/net40"
 #I "../packages/RProvider.1.1.3-alpha/lib/net40"
 #I "../../packages/RProvider.1.1.3-alpha/lib/net40"
 #I "../../../packages/RProvider.1.1.3-alpha/lib/net40"
+// Without version number when referenced through Paket
+#I "packages/R.NET.Community/lib/net40"
+#I "../packages/R.NET.Community/net40"
+#I "../../packages/R.NET.Community/lib/net40"
+#I "../../../packages/R.NET.Community/lib/net40"
+#I "packages/R.NET.Community.FSharp/lib/net40"
+#I "../packages/R.NET.Community.FSharp/lib/net40"
+#I "../../packages/R.NET.Community.FSharp/lib/net40"
+#I "../../../packages/R.NET.Community.FSharp/lib/net40"
 #I "packages/RProvider/lib/net40"
 #I "../packages/RProvider/lib/net40"
 #I "../../packages/RProvider/lib/net40"

diff --git a/src/RWrapperGenerator/RWrapperGenerator.fsproj b/src/RWrapperGenerator/RWrapperGenerator.fsproj
@@ -43,14 +43,6 @@
       <Paket>True</Paket>
       <Link>paket-files/ProvidedTypes.fsi</Link>
     </Content>
-    <Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.StarterPack\src\ProvidedTypes.fs">
-      <Paket>True</Paket>
-      <Link>paket-files/ProvidedTypes.fs</Link>
-    </Compile>
-    <Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.StarterPack\src\DebugProvidedTypes.fs">
-      <Paket>True</Paket>
-      <Link>paket-files/DebugProvidedTypes.fs</Link>
-    </Compile>
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <Private>True</Private>
     </Reference>
@@ -63,6 +55,14 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.StarterPack\src\ProvidedTypes.fs">
+      <Paket>True</Paket>
+      <Link>paket-files/ProvidedTypes.fs</Link>
+    </Compile>
+    <Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.StarterPack\src\DebugProvidedTypes.fs">
+      <Paket>True</Paket>
+      <Link>paket-files/DebugProvidedTypes.fs</Link>
+    </Compile>
     <Compile Include="..\Common\AssemblyInfo.fs">
       <Link>AssemblyInfo.fs</Link>
     </Compile>
@@ -115,17 +115,6 @@
   </Target>
   -->
   <Import Project="..\..\.paket\paket.targets" />
-  <Choose>
-    <When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
-      <ItemGroup>
-        <Reference Include="DynamicInterop">
-          <HintPath>..\..\packages\DynamicInterop\lib\net40\DynamicInterop.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
   <Choose>
     <When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
       <ItemGroup>

diff --git a/tests/Test.RProvider/Test.RProvider.fsproj b/tests/Test.RProvider/Test.RProvider.fsproj
@@ -81,17 +81,6 @@
   </Target>
   -->
   <Import Project="..\..\.paket\paket.targets" />
-  <Choose>
-    <When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
-      <ItemGroup>
-        <Reference Include="DynamicInterop">
-          <HintPath>..\..\packages\DynamicInterop\lib\net40\DynamicInterop.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
   <Choose>
     <When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
       <ItemGroup>