Merge branch 'release' into dev

Author: bricelam

.gitignore

@@ -7,7 +7,7 @@
 /.vs/
 /artifacts/
 /packages/
-/src/Microsoft.Data.Sqlite/build/uap10.0/win10-*/
+/src/Microsoft.Data.Sqlite/build/netcore50/win10-*/
 /src/Microsoft.Data.Sqlite/runtimes/
 bin/
 obj/

makefile.shade

@@ -23,13 +23,13 @@ var sqliteDllPath='src/Microsoft.Data.Sqlite/runtimes/win7-x86/native/sqlite3.dl
             "https://www.sqlite.org/2015/sqlite-uap-3090000.vsix",
             Tuple.Create(
                 "Redist/Retail/x86/sqlite3.dll",
-                "src/Microsoft.Data.Sqlite/build/uap10.0/win10-x86/native/sqlite3.dll"),
+                "src/Microsoft.Data.Sqlite/build/netcore50/win10-x86/native/sqlite3.dll"),
             Tuple.Create(
                 "Redist/Retail/x64/sqlite3.dll",
-                "src/Microsoft.Data.Sqlite/build/uap10.0/win10-x64/native/sqlite3.dll"),
+                "src/Microsoft.Data.Sqlite/build/netcore50/win10-x64/native/sqlite3.dll"),
             Tuple.Create(
                 "Redist/Retail/ARM/sqlite3.dll",
-                "src/Microsoft.Data.Sqlite/build/uap10.0/win10-arm/native/sqlite3.dll"));
+                "src/Microsoft.Data.Sqlite/build/netcore50/win10-arm/native/sqlite3.dll"));
     }
 
 functions

src/Microsoft.Data.Sqlite/build/uap10.0/Microsoft.Data.Sqlite.targets renamed to src/Microsoft.Data.Sqlite/build/netcore50/Microsoft.Data.Sqlite.targets

@@ -33,7 +33,7 @@
         "System.Threading.Tasks": "4.0.11-*"
       }
     },
-    "uap10.0": {
+    "netcore50": {
       "dependencies": {
         "Microsoft.CSharp": "4.0.0",
         "System.Collections": "4.0.10",
@@ -54,10 +54,10 @@
   },
   "packInclude": {
     "build/net451/": "build/net451/**",
-    "build/uap10.0/Microsoft.Data.Sqlite.targets": "build/uap10.0/Microsoft.Data.Sqlite.targets",
-    "build/uap10.0/win10-arm/": "build/uap10.0/win10-arm/**",
-    "build/uap10.0/win10-x64/": "build/uap10.0/win10-x64/**",
-    "build/uap10.0/win10-x86/": "build/uap10.0/win10-x86/**",
+    "build/netcore50/Microsoft.Data.Sqlite.targets": "build/netcore50/Microsoft.Data.Sqlite.targets",
+    "build/netcore50/win10-arm/": "build/netcore50/win10-arm/**",
+    "build/netcore50/win10-x64/": "build/netcore50/win10-x64/**",
+    "build/netcore50/win10-x86/": "build/netcore50/win10-x86/**",
     "runtimes/": "runtimes/**"
   }
 }

src/Microsoft.Data.Sqlite/project.json

@@ -112,7 +112,7 @@
     </AppxManifest>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="$(MSBuildProjectDirectory)\..\..\src\Microsoft.Data.Sqlite\runtimes\win10-$(Platform)\native\sqlite3.dll">
+    <Content Include="$(MSBuildProjectDirectory)\..\..\src\Microsoft.Data.Sqlite\build\netcore50\win10-$(Platform)\native\sqlite3.dll">
       <Visible>False</Visible>
     </Content>
     <Content Include="Assets\logo.png" />
@@ -124,8 +124,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Data.Sqlite, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Microsoft.Data.Sqlite">
       <HintPath>..\..\artifacts\bin\Microsoft.Data.Sqlite\$(Configuration)\netcore50\Microsoft.Data.Sqlite.dll</HintPath>
     </Reference>
   </ItemGroup>
@@ -137,6 +136,6 @@
     <BuildDependsOn>CheckPackageReferences;$(BuildDependsOn)</BuildDependsOn>
   </PropertyGroup>
   <Target Name="CheckPackageReferences">
-    <Error Text="sqlite3.dll not found. Run 'build initialize' to install." Condition="!Exists('$(MSBuildProjectDirectory)\..\..\src\Microsoft.Data.Sqlite\runtimes\win10-$(Platform)\native\sqlite3.dll')" />
+    <Error Text="sqlite3.dll not found. Run 'build initialize' to install." Condition="!Exists('$(MSBuildProjectDirectory)\..\..\src\Microsoft.Data.Sqlite\build\netcore50\win10-$(Platform)\native\sqlite3.dll')" />
   </Target>
 </Project>

test/Microsoft.Data.Sqlite.FunctionalTests.UWP/Microsoft.Data.Sqlite.FunctionalTests.UWP.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
-    <NuGetPackageRoot>C:\Users\namc\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
     <Import Project="$(NuGetPackageRoot)\xunit.core\2.1.0\build\win81\xunit.core.props" Condition="Exists('$(NuGetPackageRoot)\xunit.core\2.1.0\build\win81\xunit.core.props')" />

test/Microsoft.Data.Sqlite.FunctionalTests.UWP/Microsoft.Data.Sqlite.FunctionalTests.UWP.nuget.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
-    <NuGetPackageRoot>C:\Users\namc\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
     <Import Project="$(NuGetPackageRoot)\xunit.runner.visualstudio\2.1.0\build\uap10.0\xunit.runner.visualstudio.targets" Condition="Exists('$(NuGetPackageRoot)\xunit.runner.visualstudio\2.1.0\build\uap10.0\xunit.runner.visualstudio.targets')" />