Skip to content

Commit eac1fdc

Browse files
authored
re-enable UAP10 support (#198)
* uap10.0 * .
1 parent 3308da3 commit eac1fdc

27 files changed

+775
-204
lines changed

README.md

+3-6
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,9 @@ There are several documentation resources:
4343

4444
## Frameworks
4545
The following frameworks are supported:
46-
- net35
47-
- net40
48-
- net45 and up
49-
- netstandard1.3
50-
- netstandard2.0
51-
- uap10.0 (TODO...)s
46+
- net35, net40, net45, net46 and up
47+
- netstandard1.3 & netstandard2.0
48+
- uap10.0 (UAP 10.0.14393.0)
5249

5350
## Fork details
5451
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.

System.Linq.Dynamic.Core.sln

+80-54
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2121
EndProject
2222
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}"
2323
EndProject
24-
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}"
24+
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}"
2525
EndProject
26-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.DynamicLinq", "src\EntityFramework.DynamicLinq\EntityFramework.DynamicLinq.csproj", "{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.DynamicLinq", "src\EntityFramework.DynamicLinq\EntityFramework.DynamicLinq.csproj", "{D3804228-91F4-4502-9595-39584E510000}"
2727
EndProject
28-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.EntityFrameworkCore.DynamicLinq", "src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj", "{81056B5E-5BA9-483F-9836-AA3274DDCF96}"
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.EntityFrameworkCore.DynamicLinq", "src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj", "{D3804228-91F4-4502-9595-39584E510001}"
2929
EndProject
3030
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}"
3131
EndProject
@@ -59,6 +59,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_netcore2.1_EF2.1
5959
EndProject
6060
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}"
6161
EndProject
62+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsUniversalTestApp14393", "test-uap\WindowsUniversalTestApp14393\WindowsUniversalTestApp14393.csproj", "{926D446C-8358-465A-AFAC-2F9078C22262}"
63+
ProjectSection(ProjectDependencies) = postProject
64+
{D3804228-91F4-4502-9595-39584E510002} = {D3804228-91F4-4502-9595-39584E510002}
65+
EndProjectSection
66+
EndProject
6267
Global
6368
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6469
Debug|Any CPU = Debug|Any CPU
@@ -85,54 +90,54 @@ Global
8590
{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|x64.Build.0 = Release|Any CPU
8691
{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|x86.ActiveCfg = Release|Any CPU
8792
{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|x86.Build.0 = Release|Any CPU
88-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
89-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
90-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|ARM.ActiveCfg = Debug|Any CPU
91-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|ARM.Build.0 = Debug|Any CPU
92-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|x64.ActiveCfg = Debug|Any CPU
93-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|x64.Build.0 = Debug|Any CPU
94-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|x86.ActiveCfg = Debug|Any CPU
95-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Debug|x86.Build.0 = Debug|Any CPU
96-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
97-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|Any CPU.Build.0 = Release|Any CPU
98-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|ARM.ActiveCfg = Release|Any CPU
99-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|ARM.Build.0 = Release|Any CPU
100-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|x64.ActiveCfg = Release|Any CPU
101-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|x64.Build.0 = Release|Any CPU
102-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|x86.ActiveCfg = Release|Any CPU
103-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8}.Release|x86.Build.0 = Release|Any CPU
104-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
105-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
106-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|ARM.ActiveCfg = Debug|Any CPU
107-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|ARM.Build.0 = Debug|Any CPU
108-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|x64.ActiveCfg = Debug|Any CPU
109-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|x64.Build.0 = Debug|Any CPU
110-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|x86.ActiveCfg = Debug|Any CPU
111-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Debug|x86.Build.0 = Debug|Any CPU
112-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
113-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|Any CPU.Build.0 = Release|Any CPU
114-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|ARM.ActiveCfg = Release|Any CPU
115-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|ARM.Build.0 = Release|Any CPU
116-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|x64.ActiveCfg = Release|Any CPU
117-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|x64.Build.0 = Release|Any CPU
118-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|x86.ActiveCfg = Release|Any CPU
119-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE}.Release|x86.Build.0 = Release|Any CPU
120-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|Any CPU.Build.0 = Debug|Any CPU
122-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|ARM.ActiveCfg = Debug|Any CPU
123-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|ARM.Build.0 = Debug|Any CPU
124-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|x64.ActiveCfg = Debug|Any CPU
125-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|x64.Build.0 = Debug|Any CPU
126-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|x86.ActiveCfg = Debug|Any CPU
127-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Debug|x86.Build.0 = Debug|Any CPU
128-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|Any CPU.ActiveCfg = Release|Any CPU
129-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|Any CPU.Build.0 = Release|Any CPU
130-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|ARM.ActiveCfg = Release|Any CPU
131-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|ARM.Build.0 = Release|Any CPU
132-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|x64.ActiveCfg = Release|Any CPU
133-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|x64.Build.0 = Release|Any CPU
134-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|x86.ActiveCfg = Release|Any CPU
135-
{81056B5E-5BA9-483F-9836-AA3274DDCF96}.Release|x86.Build.0 = Release|Any CPU
93+
{D3804228-91F4-4502-9595-39584E510002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
94+
{D3804228-91F4-4502-9595-39584E510002}.Debug|Any CPU.Build.0 = Debug|Any CPU
95+
{D3804228-91F4-4502-9595-39584E510002}.Debug|ARM.ActiveCfg = Debug|Any CPU
96+
{D3804228-91F4-4502-9595-39584E510002}.Debug|ARM.Build.0 = Debug|Any CPU
97+
{D3804228-91F4-4502-9595-39584E510002}.Debug|x64.ActiveCfg = Debug|Any CPU
98+
{D3804228-91F4-4502-9595-39584E510002}.Debug|x64.Build.0 = Debug|Any CPU
99+
{D3804228-91F4-4502-9595-39584E510002}.Debug|x86.ActiveCfg = Debug|Any CPU
100+
{D3804228-91F4-4502-9595-39584E510002}.Debug|x86.Build.0 = Debug|Any CPU
101+
{D3804228-91F4-4502-9595-39584E510002}.Release|Any CPU.ActiveCfg = Release|Any CPU
102+
{D3804228-91F4-4502-9595-39584E510002}.Release|Any CPU.Build.0 = Release|Any CPU
103+
{D3804228-91F4-4502-9595-39584E510002}.Release|ARM.ActiveCfg = Release|Any CPU
104+
{D3804228-91F4-4502-9595-39584E510002}.Release|ARM.Build.0 = Release|Any CPU
105+
{D3804228-91F4-4502-9595-39584E510002}.Release|x64.ActiveCfg = Release|Any CPU
106+
{D3804228-91F4-4502-9595-39584E510002}.Release|x64.Build.0 = Release|Any CPU
107+
{D3804228-91F4-4502-9595-39584E510002}.Release|x86.ActiveCfg = Release|Any CPU
108+
{D3804228-91F4-4502-9595-39584E510002}.Release|x86.Build.0 = Release|Any CPU
109+
{D3804228-91F4-4502-9595-39584E510000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
110+
{D3804228-91F4-4502-9595-39584E510000}.Debug|Any CPU.Build.0 = Debug|Any CPU
111+
{D3804228-91F4-4502-9595-39584E510000}.Debug|ARM.ActiveCfg = Debug|Any CPU
112+
{D3804228-91F4-4502-9595-39584E510000}.Debug|ARM.Build.0 = Debug|Any CPU
113+
{D3804228-91F4-4502-9595-39584E510000}.Debug|x64.ActiveCfg = Debug|Any CPU
114+
{D3804228-91F4-4502-9595-39584E510000}.Debug|x64.Build.0 = Debug|Any CPU
115+
{D3804228-91F4-4502-9595-39584E510000}.Debug|x86.ActiveCfg = Debug|Any CPU
116+
{D3804228-91F4-4502-9595-39584E510000}.Debug|x86.Build.0 = Debug|Any CPU
117+
{D3804228-91F4-4502-9595-39584E510000}.Release|Any CPU.ActiveCfg = Release|Any CPU
118+
{D3804228-91F4-4502-9595-39584E510000}.Release|Any CPU.Build.0 = Release|Any CPU
119+
{D3804228-91F4-4502-9595-39584E510000}.Release|ARM.ActiveCfg = Release|Any CPU
120+
{D3804228-91F4-4502-9595-39584E510000}.Release|ARM.Build.0 = Release|Any CPU
121+
{D3804228-91F4-4502-9595-39584E510000}.Release|x64.ActiveCfg = Release|Any CPU
122+
{D3804228-91F4-4502-9595-39584E510000}.Release|x64.Build.0 = Release|Any CPU
123+
{D3804228-91F4-4502-9595-39584E510000}.Release|x86.ActiveCfg = Release|Any CPU
124+
{D3804228-91F4-4502-9595-39584E510000}.Release|x86.Build.0 = Release|Any CPU
125+
{D3804228-91F4-4502-9595-39584E510001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
126+
{D3804228-91F4-4502-9595-39584E510001}.Debug|Any CPU.Build.0 = Debug|Any CPU
127+
{D3804228-91F4-4502-9595-39584E510001}.Debug|ARM.ActiveCfg = Debug|Any CPU
128+
{D3804228-91F4-4502-9595-39584E510001}.Debug|ARM.Build.0 = Debug|Any CPU
129+
{D3804228-91F4-4502-9595-39584E510001}.Debug|x64.ActiveCfg = Debug|Any CPU
130+
{D3804228-91F4-4502-9595-39584E510001}.Debug|x64.Build.0 = Debug|Any CPU
131+
{D3804228-91F4-4502-9595-39584E510001}.Debug|x86.ActiveCfg = Debug|Any CPU
132+
{D3804228-91F4-4502-9595-39584E510001}.Debug|x86.Build.0 = Debug|Any CPU
133+
{D3804228-91F4-4502-9595-39584E510001}.Release|Any CPU.ActiveCfg = Release|Any CPU
134+
{D3804228-91F4-4502-9595-39584E510001}.Release|Any CPU.Build.0 = Release|Any CPU
135+
{D3804228-91F4-4502-9595-39584E510001}.Release|ARM.ActiveCfg = Release|Any CPU
136+
{D3804228-91F4-4502-9595-39584E510001}.Release|ARM.Build.0 = Release|Any CPU
137+
{D3804228-91F4-4502-9595-39584E510001}.Release|x64.ActiveCfg = Release|Any CPU
138+
{D3804228-91F4-4502-9595-39584E510001}.Release|x64.Build.0 = Release|Any CPU
139+
{D3804228-91F4-4502-9595-39584E510001}.Release|x86.ActiveCfg = Release|Any CPU
140+
{D3804228-91F4-4502-9595-39584E510001}.Release|x86.Build.0 = Release|Any CPU
136141
{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
137142
{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80}.Debug|Any CPU.Build.0 = Debug|Any CPU
138143
{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -341,15 +346,35 @@ Global
341346
{F1880F07-238F-4A3A-9E58-141350665E1F}.Release|x64.Build.0 = Release|Any CPU
342347
{F1880F07-238F-4A3A-9E58-141350665E1F}.Release|x86.ActiveCfg = Release|Any CPU
343348
{F1880F07-238F-4A3A-9E58-141350665E1F}.Release|x86.Build.0 = Release|Any CPU
349+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|Any CPU.ActiveCfg = Debug|x86
350+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|ARM.ActiveCfg = Debug|ARM
351+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|ARM.Build.0 = Debug|ARM
352+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|ARM.Deploy.0 = Debug|ARM
353+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x64.ActiveCfg = Debug|x64
354+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x64.Build.0 = Debug|x64
355+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x64.Deploy.0 = Debug|x64
356+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x86.ActiveCfg = Debug|x86
357+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x86.Build.0 = Debug|x86
358+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x86.Deploy.0 = Debug|x86
359+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|Any CPU.ActiveCfg = Release|x86
360+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|ARM.ActiveCfg = Release|ARM
361+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|ARM.Build.0 = Release|ARM
362+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|ARM.Deploy.0 = Release|ARM
363+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x64.ActiveCfg = Release|x64
364+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x64.Build.0 = Release|x64
365+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x64.Deploy.0 = Release|x64
366+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x86.ActiveCfg = Release|x86
367+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x86.Build.0 = Release|x86
368+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x86.Deploy.0 = Release|x86
344369
EndGlobalSection
345370
GlobalSection(SolutionProperties) = preSolution
346371
HideSolutionNode = FALSE
347372
EndGlobalSection
348373
GlobalSection(NestedProjects) = preSolution
349374
{6B45E89C-0788-4942-924F-EF6397114BD1} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
350-
{B70CD050-3B9C-406C-85FD-1A26394EC7C8} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
351-
{8B9CEAFA-ED50-4682-8531-A082CFD3FDAE} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
352-
{81056B5E-5BA9-483F-9836-AA3274DDCF96} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
375+
{D3804228-91F4-4502-9595-39584E510002} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
376+
{D3804228-91F4-4502-9595-39584E510000} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
377+
{D3804228-91F4-4502-9595-39584E510001} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
353378
{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
354379
{BF97CB1B-5043-4256-8F42-CF3A4F3863BE} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
355380
{27E54CD4-1D80-4797-88DC-1C535C1E9B4A} = {1384C18E-DCF3-4A5B-9560-2BF5DD8C51CE}
@@ -363,6 +388,7 @@ Global
363388
{EDF434F6-70C0-4005-B63E-0C365B3DA42A} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
364389
{E4286D1D-A98C-4516-9E47-CBF9739448DA} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
365390
{F1880F07-238F-4A3A-9E58-141350665E1F} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
391+
{926D446C-8358-465A-AFAC-2F9078C22262} = {ECA5702B-5D32-4888-A34E-9461FC533F23}
366392
EndGlobalSection
367393
GlobalSection(ExtensibilityGlobals) = postSolution
368394
SolutionGuid = {94C56722-194E-4B8B-BC23-B3F754E89A20}

appveyor.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ install:
1717
- ps: $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = "true"
1818
- dotnet tool install --global dotnet-sonarscanner
1919

20-
# https://www.appveyor.com/docs/build-configuration/#secure-variables
21-
# However, secure variables are not decoded during Pull Request builds which prevents someone from submitting PR with malicious build script displaying those variables. In more controlled environment through with a trusted team and private GitHub repositories there is an option on General tab of project settings to allow secure variables for PRs.
2220
environment:
2321
PATH: $(PATH);$(PROGRAMFILES)\dotnet\
2422

2523
# https://www.appveyor.com/docs/build-configuration/#secure-variables
2624
# However, secure variables are not decoded during Pull Request builds which prevents someone from submitting PR with malicious build script displaying those variables. In more controlled environment through with a trusted team and private GitHub repositories there is an option on General tab of project settings to allow secure variables for PRs.
25+
# See also https://medium.com/@stef.heyenrath/how-to-fix-sonarcloud-issue-in-a-github-pr-when-using-appveyor-integration-8909b49406b4
2726
COVERALLS_REPO_TOKEN:
2827
secure: tsTABRbCmdWFLT194XNIrpurerOfjN6cEoxt2RaSUfLmUIgra/+CwuqVkv0sPRop
2928
SONAR_TOKEN:
@@ -32,8 +31,8 @@ environment:
3231

3332
before_build:
3433
# Remove UAP10 and netstandard20 from csproj
35-
#- cmd: copy /Y src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.AppVeyor.csproj src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj
36-
#- cmd: copy /Y src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.AppVeyor.csproj src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj
34+
- cmd: copy /Y src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.AppVeyor.csproj src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj
35+
- cmd: copy /Y src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.AppVeyor.csproj src\Microsoft.EntityFrameworkCore.DynamicLinq\Microsoft.EntityFrameworkCore.DynamicLinq.csproj
3736

3837
# Restore all
3938
- dotnet restore src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj

src/Microsoft.EntityFrameworkCore.DynamicLinq/Microsoft.EntityFrameworkCore.DynamicLinq.AppVeyor.csproj

+11-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<Description>Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support</Description>
44
<AssemblyTitle>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyTitle>
5-
<VersionPrefix>1.0.4.8</VersionPrefix>
5+
<VersionPrefix>1.0.8.12</VersionPrefix>
66
<Authors>Stef Heyenrath</Authors>
77
<TargetFrameworks>net451;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
88
<DefineConstants>$(DefineConstants);EFCORE</DefineConstants>
@@ -26,13 +26,18 @@
2626
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
2727
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
2828
<DefaultLanguage>en-us</DefaultLanguage>
29+
<ProjectGuid>{D3804228-91F4-4502-9595-39584E510001}</ProjectGuid>
2930
<DebugType>full</DebugType>
31+
</PropertyGroup>
32+
33+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
3034
<IncludeSource>True</IncludeSource>
3135
<IncludeSymbols>True</IncludeSymbols>
36+
<PathMap>$(MSBuildProjectDirectory)=/</PathMap>
3237
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
3338
</PropertyGroup>
3439

35-
<!--<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
40+
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
3641
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
3742
<NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
3843
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
@@ -42,7 +47,7 @@
4247
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
4348
<DefineConstants>$(DefineConstants);WINDOWS_UWP;UAP10_0</DefineConstants>
4449
<LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
45-
</PropertyGroup>-->
50+
</PropertyGroup>
4651

4752
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
4853
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
@@ -101,8 +106,8 @@
101106
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
102107
</ItemGroup>
103108

104-
<!--<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
105-
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.1" />
109+
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
110+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.10" />
106111
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.0" />
107-
</ItemGroup>-->
112+
</ItemGroup>
108113
</Project>

0 commit comments

Comments
 (0)