uap10.0

zzzprojects · Jul 31, 2018 · 6149045 · 6149045
1 parent f1cfbe2
commit 6149045
Show file tree

Hide file tree

Showing 27 changed files with 656 additions and 84 deletions.
diff --git a/README.md b/README.md
@@ -43,12 +43,9 @@ There are several documentation resources:
 
 ## Frameworks
 The following frameworks are supported:
-- net35
-- net40
-- net45 and up
-- netstandard1.3
-- netstandard2.0
-- uap10.0
+- net35, net40, net45, net46 and up
+- netstandard1.3 & netstandard2.0
+- uap10.0 (UAP 10.0.14393.0)
 
 ## Fork details
 This fork takes the basic library to a new level. Contains XML Documentation and examples on how to use it. Also adds unit testing to help ensure that it works properly.

diff --git a/System.Linq.Dynamic.Core.sln b/System.Linq.Dynamic.Core.sln
@@ -21,11 +21,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.DynamicLinq.Tests.net452", "test\EntityFramework.DynamicLinq.Tests.net452\EntityFramework.DynamicLinq.Tests.net452.csproj", "{6B45E89C-0788-4942-924F-EF6397114BD1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Dynamic.Core", "src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj", "{B70CD050-3B9C-406C-85FD-1A26394EC7C8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Dynamic.Core", "src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj", "{D3804228-91F4-4502-9595-39584E510002}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.DynamicLinq", "src\EntityFramework.DynamicLinq\EntityFramework.DynamicLinq.csproj", "{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.DynamicLinq", "src\EntityFramework.DynamicLinq\EntityFramework.DynamicLinq.csproj", "{D3804228-91F4-4502-9595-39584E510000}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.EntityFrameworkCore.DynamicLinq", "src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj", "{81056B5E-5BA9-483F-9836-AA3274DDCF96}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.EntityFrameworkCore.DynamicLinq", "src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj", "{D3804228-91F4-4502-9595-39584E510001}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Dynamic.Core.Tests", "test\System.Linq.Dynamic.Core.Tests\System.Linq.Dynamic.Core.Tests.csproj", "{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80}"
 EndProject
@@ -57,6 +57,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_netcore2.1_EF2.1
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_netcore2.1_EF2.1.1", "src-console\ConsoleAppEF2.1.1\ConsoleApp_netcore2.1_EF2.1.1.csproj", "{F1880F07-238F-4A3A-9E58-141350665E1F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsUniversalTestApp14393", "test-uap\WindowsUniversalTestApp14393\WindowsUniversalTestApp14393.csproj", "{926D446C-8358-465A-AFAC-2F9078C22262}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D3804228-91F4-4502-9595-39584E510002} = {D3804228-91F4-4502-9595-39584E510002}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,54 +88,54 @@ Global
 		{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|x64.Build.0 = Release|Any CPU
 		{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|x86.ActiveCfg = Release|Any CPU
 		{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|x86.Build.0 = Release|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|ARM.Build.0 = Debug|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|x64.Build.0 = Debug|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|x86.Build.0 = Debug|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|ARM.ActiveCfg = Release|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|ARM.Build.0 = Release|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|x64.ActiveCfg = Release|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|x64.Build.0 = Release|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|x86.ActiveCfg = Release|Any CPU
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|x86.Build.0 = Release|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|ARM.Build.0 = Debug|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|x64.Build.0 = Debug|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|x86.Build.0 = Debug|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|ARM.ActiveCfg = Release|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|ARM.Build.0 = Release|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|x64.ActiveCfg = Release|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|x64.Build.0 = Release|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|x86.ActiveCfg = Release|Any CPU
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|x86.Build.0 = Release|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|ARM.Build.0 = Debug|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|x64.Build.0 = Debug|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|x86.Build.0 = Debug|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|ARM.ActiveCfg = Release|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|ARM.Build.0 = Release|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|x64.ActiveCfg = Release|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|x64.Build.0 = Release|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|x86.ActiveCfg = Release|Any CPU
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|x86.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Debug|x64.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Debug|x86.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Release|ARM.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Release|x64.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Release|x64.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Release|x86.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510002}.Release|x86.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Debug|x64.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Debug|x86.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Release|ARM.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Release|x64.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Release|x64.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Release|x86.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510000}.Release|x86.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Debug|x64.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Debug|x86.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Release|ARM.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Release|x64.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Release|x64.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Release|x86.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E510001}.Release|x86.Build.0 = Release|Any CPU
 		{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -323,15 +328,35 @@ Global
 		{F1880F07-238F-4A3A-9E58-141350665E1F}.Release|x64.Build.0 = Release|Any CPU
 		{F1880F07-238F-4A3A-9E58-141350665E1F}.Release|x86.ActiveCfg = Release|Any CPU
 		{F1880F07-238F-4A3A-9E58-141350665E1F}.Release|x86.Build.0 = Release|Any CPU
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|ARM.ActiveCfg = Debug|ARM
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|ARM.Build.0 = Debug|ARM
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|ARM.Deploy.0 = Debug|ARM
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x64.ActiveCfg = Debug|x64
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x64.Build.0 = Debug|x64
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x64.Deploy.0 = Debug|x64
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x86.ActiveCfg = Debug|x86
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x86.Build.0 = Debug|x86
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x86.Deploy.0 = Debug|x86
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Release|Any CPU.ActiveCfg = Release|x86
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Release|ARM.ActiveCfg = Release|ARM
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Release|ARM.Build.0 = Release|ARM
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Release|ARM.Deploy.0 = Release|ARM
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x64.ActiveCfg = Release|x64
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x64.Build.0 = Release|x64
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x64.Deploy.0 = Release|x64
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x86.ActiveCfg = Release|x86
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x86.Build.0 = Release|x86
+		{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{6B45E89C-0788-4942-924F-EF6397114BD1} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
-		{B70CD050-3B9C-406C-85FD-1A26394EC7C8} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
-		{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
-		{81056B5E-5BA9-483F-9836-AA3274DDCF96} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
+		{D3804228-91F4-4502-9595-39584E510002} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
+		{D3804228-91F4-4502-9595-39584E510000} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
+		{D3804228-91F4-4502-9595-39584E510001} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
 		{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
 		{BF97CB1B-5043-4256-8F42-CF3A4F3863BE} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
 		{27E54CD4-1D80-4797-88DC-1C535C1E9B4A} = {1384C18E-DCF3-4A5B-9560-2BF5DD8C51CE}
@@ -344,6 +369,7 @@ Global
 		{AD4F83E5-4240-485D-BB5C-F43974F716E4} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
 		{E4286D1D-A98C-4516-9E47-CBF9739448DA} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
 		{F1880F07-238F-4A3A-9E58-141350665E1F} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
+		{926D446C-8358-465A-AFAC-2F9078C22262} = {ECA5702B-5D32-4888-A34E-9461FC533F23}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {94C56722-194E-4B8B-BC23-B3F754E89A20}

diff --git a/appveyor.yml b/appveyor.yml
@@ -26,8 +26,8 @@ environment:
 
 before_build:
 # Remove UAP10 and netstandard20 from csproj
-#- cmd: copy /Y src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.AppVeyor.csproj src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj
-#- cmd: copy /Y src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.AppVeyor.csproj src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj
+- cmd: copy /Y src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.AppVeyor.csproj src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj
+- cmd: copy /Y src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.AppVeyor.csproj src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj
 
 # Restore all
 - dotnet restore src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj

diff --git a/...EntityFrameworkCore.DynamicLinq/Microsoft.EntityFrameworkCore.DynamicLinq.AppVeyor.csproj b/...EntityFrameworkCore.DynamicLinq/Microsoft.EntityFrameworkCore.DynamicLinq.AppVeyor.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <Description>Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support</Description>
         <AssemblyTitle>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyTitle>
-        <VersionPrefix>1.0.4.8</VersionPrefix>
+        <VersionPrefix>1.0.8.12</VersionPrefix>
         <Authors>Stef Heyenrath</Authors>
         <TargetFrameworks>net451;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
         <DefineConstants>$(DefineConstants);EFCORE</DefineConstants>
@@ -26,13 +26,18 @@
         <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
         <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
         <DefaultLanguage>en-us</DefaultLanguage>
+        <ProjectGuid>{D3804228-91F4-4502-9595-39584E510001}</ProjectGuid>
         <DebugType>full</DebugType>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <IncludeSource>True</IncludeSource>
         <IncludeSymbols>True</IncludeSymbols>
+        <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>
 
-    <!--<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+    <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
         <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
         <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
         <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
@@ -42,7 +47,7 @@
         <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
         <DefineConstants>$(DefineConstants);WINDOWS_UWP;UAP10_0</DefineConstants>
         <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
-    </PropertyGroup>-->
+    </PropertyGroup>
 
     <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
         <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
@@ -101,8 +106,8 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
     </ItemGroup>
 
-    <!--<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-        <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.1" />
+    <ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
+        <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.10" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.0" />
-    </ItemGroup>-->
+    </ItemGroup>
 </Project>
diff --git a/...icrosoft.EntityFrameworkCore.DynamicLinq/Microsoft.EntityFrameworkCore.DynamicLinq.csproj b/...icrosoft.EntityFrameworkCore.DynamicLinq/Microsoft.EntityFrameworkCore.DynamicLinq.csproj
@@ -4,7 +4,7 @@
     <AssemblyTitle>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyTitle>
     <VersionPrefix>1.0.8.12</VersionPrefix>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net451;net46;netstandard1.3;netstandard2.0;uap10.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);EFCORE</DefineConstants>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyName>
@@ -107,7 +107,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.1" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.0" />
   </ItemGroup>
 </Project>