Update to 1.1-preview 1, "all" tests pass (#374)

ErikEJ · Nov 8, 2016 · 104ee2c · 104ee2c
1 parent 59605d4
commit 104ee2c
Show file tree

Hide file tree

Showing 57 changed files with 2,590 additions and 1,369 deletions.
diff --git a/.nuget/nuget.exe b/.nuget/nuget.exe
diff --git a/.nuget/nuget.exe.old b/.nuget/nuget.exe.old
diff --git a/NuGet.Config b/NuGet.Config
@@ -4,7 +4,7 @@
     <add key="automatic" value="False" />
   </packageRestore>
   <packageSources>
-    <add key="AspNetVNext" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
+    <add key="AspNetVNext" value="https://dotnet.myget.org/F/aspnet-1-1-0-preview1/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/NuGetBuild.cmd b/NuGetBuild.cmd
@@ -1,7 +1,7 @@
-.nuget\nuget pack .\src\design35\EntityFramework.SqlServerCompact35.Design.nuspec -version 7.0.0-rc1
-.nuget\nuget pack .\src\provider35\EntityFramework.SqlServerCompact35.nuspec -version 7.0.0-rc1
+.nuget\nuget pack .\src\design35\EntityFrameworkCore.SqlServerCompact35.Design.nuspec -version 1.1.0-preview1-final
+.nuget\nuget pack .\src\provider35\EntityFrameworkCore.SqlServerCompact35.nuspec -version 1.1.0-preview1-final
 
-.nuget\nuget pack .\src\design40\EntityFramework.SqlServerCompact40.Design.nuspec -version 7.0.0-rc1
-.nuget\nuget pack .\src\provider40\EntityFramework.SqlServerCompact40.nuspec -version 7.0.0-rc1
+.nuget\nuget pack .\src\design40\EntityFrameworkCore.SqlServerCompact40.Design.nuspec -version 1.1.0-preview1-final
+.nuget\nuget pack .\src\provider40\EntityFrameworkCore.SqlServerCompact40.nuspec -version 1.1.0-preview1-final
 
 pause
diff --git a/src/Design35/EntityFramework.SqlServerCompact35.Design.csproj b/src/Design35/EntityFramework.SqlServerCompact35.Design.csproj
@@ -38,56 +38,56 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.1.1.0-alpha1-22167\lib\net451\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.1.1.0-preview1-final\lib\net451\Microsoft.EntityFrameworkCore.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.Relational.1.1.0-alpha1-22167\lib\net451\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.Relational.1.1.0-preview1-final\lib\net451\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Relational.Design, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.Relational.Design.1.1.0-alpha1-22167\lib\net451\Microsoft.EntityFrameworkCore.Relational.Design.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.Relational.Design.1.1.0-preview1-final\lib\net451\Microsoft.EntityFrameworkCore.Relational.Design.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Caching.Abstractions.1.1.0-alpha1-22167\lib\netstandard1.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Extensions.Caching.Abstractions.1.1.0-preview1-final\lib\netstandard1.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Caching.Memory.1.1.0-alpha1-22167\lib\net451\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Extensions.Caching.Memory.1.1.0-preview1-final\lib\net451\Microsoft.Extensions.Caching.Memory.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.1.1.0-alpha1-22167\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.1.1.0-preview1-final\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.0-alpha1-22167\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.0-preview1-final\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.1.1.0-alpha1-22167\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.1.1.0-preview1-final\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.1.0-alpha1-22167\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.1.0-preview1-final\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Options.1.1.0-alpha1-22167\lib\netstandard1.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Extensions.Options.1.1.0-preview1-final\lib\netstandard1.0\Microsoft.Extensions.Options.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.1.1.0-alpha1-22167\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.1.1.0-preview1-final\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Collections.Immutable.1.3.0-preview1-24530-04\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
@@ -96,18 +96,31 @@
     <Reference Include="System.Data.SqlServerCe, Version=3.5.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\Program Files (x86)\Microsoft SQL Server Compact Edition\v3.5\Desktop\System.Data.SqlServerCe.dll</HintPath>
     </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\portable-net45+win8+wpa81\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.3.0-preview1-24530-04\lib\portable-net45+win8+wpa81\System.Diagnostics.DiagnosticSource.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Interactive.Async, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.3.0-preview1-24530-04\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0-preview1-24530-04\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Design40\Internal\SqlCeDatabaseModelfactory.cs">
@@ -151,6 +164,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="EntityFrameworkCore.SqlServerCompact35.Design.nuspec">
       <SubType>Designer</SubType>
     </None>

diff --git a/src/Design35/EntityFrameworkCore.SqlServerCompact35.Design.nuspec b/src/Design35/EntityFrameworkCore.SqlServerCompact35.Design.nuspec
@@ -14,7 +14,7 @@
     <tags>EntityFramework EF sqlce entity framework provider sql server compact sqlservercompact reveng reverseengineer design</tags>
     <dependencies>
         <group targetFramework=".NETFramework4.5">
-            <dependency id="Microsoft.EntityFrameworkCore.Relational.Design" version="[1.1.0-alpha1-22167]" />
+            <dependency id="Microsoft.EntityFrameworkCore.Relational.Design" version="1.1.0-preview1-final" />
          </group>
     </dependencies>
   </metadata>

diff --git a/src/Design35/app.config b/src/Design35/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/src/Design35/packages.config b/src/Design35/packages.config
@@ -1,35 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.EntityFrameworkCore" version="1.1.0-alpha1-22167" targetFramework="net451" />
-  <package id="Microsoft.EntityFrameworkCore.Relational" version="1.1.0-alpha1-22167" targetFramework="net451" />
-  <package id="Microsoft.EntityFrameworkCore.Relational.Design" version="1.1.0-alpha1-22167" targetFramework="net451" />
-  <package id="Microsoft.Extensions.Caching.Abstractions" version="1.1.0-alpha1-22167" targetFramework="net451" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="1.1.0-alpha1-22167" targetFramework="net451" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="1.1.0-alpha1-22167" targetFramework="net451" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.1.0-alpha1-22167" targetFramework="net451" />
-  <package id="Microsoft.Extensions.Logging" version="1.1.0-alpha1-22167" targetFramework="net451" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="1.1.0-alpha1-22167" targetFramework="net451" />
-  <package id="Microsoft.Extensions.Options" version="1.1.0-alpha1-22167" targetFramework="net451" />
-  <package id="Microsoft.Extensions.Primitives" version="1.1.0-alpha1-22167" targetFramework="net451" />
+  <package id="Microsoft.EntityFrameworkCore" version="1.1.0-preview1-final" targetFramework="net451" />
+  <package id="Microsoft.EntityFrameworkCore.Relational" version="1.1.0-preview1-final" targetFramework="net451" />
+  <package id="Microsoft.EntityFrameworkCore.Relational.Design" version="1.1.0-preview1-final" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Caching.Abstractions" version="1.1.0-preview1-final" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="1.1.0-preview1-final" targetFramework="net451" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="1.1.0-preview1-final" targetFramework="net451" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.1.0-preview1-final" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Logging" version="1.1.0-preview1-final" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="1.1.0-preview1-final" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Options" version="1.1.0-preview1-final" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Primitives" version="1.1.0-preview1-final" targetFramework="net451" />
+  <package id="Microsoft.NETCore.Platforms" version="1.1.0-preview1-24530-04" targetFramework="net451" />
+  <package id="NETStandard.Library" version="1.6.1-preview1-24530-04" targetFramework="net451" />
   <package id="Remotion.Linq" version="2.1.1" targetFramework="net451" />
-  <package id="System.Collections" version="4.0.11" targetFramework="net451" />
-  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net451" />
-  <package id="System.Collections.Immutable" version="1.2.0" targetFramework="net451" />
-  <package id="System.ComponentModel" version="4.0.1" targetFramework="net451" />
-  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net451" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net451" />
-  <package id="System.Globalization" version="4.0.11" targetFramework="net451" />
+  <package id="System.Collections" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Collections.Concurrent" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Collections.Immutable" version="1.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.ComponentModel" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Diagnostics.Debug" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Diagnostics.Tools" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Diagnostics.Tracing" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Globalization" version="4.3.0-preview1-24530-04" targetFramework="net451" />
   <package id="System.Interactive.Async" version="3.0.0" targetFramework="net451" />
-  <package id="System.Linq" version="4.1.0" targetFramework="net451" />
-  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net451" />
+  <package id="System.IO" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.IO.Compression" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Linq" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Linq.Expressions" version="4.3.0-preview1-24530-04" targetFramework="net451" />
   <package id="System.Linq.Queryable" version="4.0.1" targetFramework="net451" />
-  <package id="System.ObjectModel" version="4.0.12" targetFramework="net451" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net451" />
-  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net451" />
-  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net451" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="net451" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net451" />
-  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net451" />
-  <package id="System.Threading" version="4.0.11" targetFramework="net451" />
-  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net451" />
+  <package id="System.Net.Http" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Net.Primitives" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.ObjectModel" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Reflection" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Reflection.Extensions" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Reflection.Primitives" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Resources.ResourceManager" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Runtime" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Runtime.Extensions" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Runtime.InteropServices" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Runtime.Numerics" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Text.Encoding" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Text.RegularExpressions" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Threading" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Threading.Tasks" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Threading.Timer" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0-preview1-24530-04" targetFramework="net451" />
+  <package id="System.Xml.XDocument" version="4.3.0-preview1-24530-04" targetFramework="net451" />
 </packages>