Skip to content

Commit 4bfd7a5

Browse files
StefHStefH
committed
Re-enable support for uap10.0 Issue #72 
1 parent 2368b1a commit 4bfd7a5

File tree

2 files changed

+24
-66
lines changed

2 files changed

+24
-66
lines changed

‎src/Microsoft.EntityFrameworkCore.DynamicLinq/Microsoft.EntityFrameworkCore.DynamicLinq.csproj

+9-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
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.4</VersionPrefix>
5+
<VersionPrefix>1.0.4.5</VersionPrefix>
66
<Authors>Stef Heyenrath</Authors>
7-
<TargetFrameworks>net451;net46;netstandard1.3</TargetFrameworks>
7+
<TargetFrameworks>net451;net46;netstandard1.3;uap10.0</TargetFrameworks>
88
<DefineConstants>$(DefineConstants);EFCORE</DefineConstants>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AssemblyName>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyName>
@@ -28,15 +28,16 @@
2828
<DefaultLanguage>en-us</DefaultLanguage>
2929
<DebugType>full</DebugType>
3030
</PropertyGroup>
31-
31+
3232
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
33+
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
3334
<NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
3435
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
3536
<TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
3637
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
3738
<TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
3839
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
39-
<DefineConstants>$(DefineConstants);UAP10_0</DefineConstants>
40+
<DefineConstants>$(DefineConstants);WINDOWS_UWP;UAP10_0</DefineConstants>
4041
<LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
4142
</PropertyGroup>
4243

@@ -90,4 +91,8 @@
9091
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
9192
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
9293
</PropertyGroup>
94+
95+
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
96+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.3.3" />
97+
</ItemGroup>
9398
</Project>

‎src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj

+15-62
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<PropertyGroup>
33
<Description>This is a .NETStandard/ .NET Core port of the the Microsoft assembly for the .Net 4.0 Dynamic language functionality.</Description>
44
<AssemblyTitle>System.Linq.Dynamic.Core</AssemblyTitle>
5-
<VersionPrefix>1.0.7.4</VersionPrefix>
5+
<VersionPrefix>1.0.7.5</VersionPrefix>
66
<Authors>Microsoft;Scott Guthrie;King Wilder;Nathan Arnott;Stef Heyenrath</Authors>
7-
<TargetFrameworks>net35;net40;net45;net46;netstandard1.3</TargetFrameworks>
7+
<TargetFrameworks>net35;net40;net45;net46;netstandard1.3;uap10.0</TargetFrameworks>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<AssemblyName>System.Linq.Dynamic.Core</AssemblyName>
1010
<AssemblyOriginatorKeyFile>System.Linq.Dynamic.Core.snk</AssemblyOriginatorKeyFile>
@@ -36,16 +36,16 @@
3636
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
3737
<DefineConstants>NETSTANDARD</DefineConstants>
3838
</PropertyGroup>
39-
39+
4040
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
4141
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
4242
<NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
4343
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
4444
<TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
45-
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
45+
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
4646
<TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
4747
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
48-
<DefineConstants>WINDOWS_UWP;UAP10_0</DefineConstants>
48+
<DefineConstants>$(DefineConstants);WINDOWS_UWP;UAP10_0</DefineConstants>
4949
<LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
5050
</PropertyGroup>
5151

@@ -62,9 +62,7 @@
6262
</ItemGroup>
6363

6464
<ItemGroup Condition=" '$(TargetFramework)' == 'net20' ">
65-
<PackageReference Include="NetLegacySupport.ConcurrentDictionary">
66-
<Version>1.1.1</Version>
67-
</PackageReference>
65+
<PackageReference Include="NetLegacySupport.ConcurrentDictionary" Version="1.1.1" />
6866
<Reference Include="System" />
6967
</ItemGroup>
7068

@@ -96,24 +94,12 @@
9694
</ItemGroup>
9795

9896
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
99-
<PackageReference Include="System.ComponentModel.TypeConverter">
100-
<Version>4.3.0</Version>
101-
</PackageReference>
102-
<PackageReference Include="System.Dynamic.Runtime">
103-
<Version>4.3.0</Version>
104-
</PackageReference>
105-
<PackageReference Include="System.Reflection.Emit">
106-
<Version>4.3.0</Version>
107-
</PackageReference>
108-
<PackageReference Include="System.Linq.Queryable">
109-
<Version>4.3.0</Version>
110-
</PackageReference>
111-
<PackageReference Include="System.Reflection.TypeExtensions">
112-
<Version>4.3.0</Version>
113-
</PackageReference>
114-
<PackageReference Include="System.Diagnostics.TraceSource">
115-
<Version>4.3.0</Version>
116-
</PackageReference>
97+
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
98+
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
99+
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
100+
<PackageReference Include="System.Linq.Queryable" Version="4.3.0" />
101+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
102+
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
117103
</ItemGroup>
118104

119105
<ItemGroup Condition=" '$(TargetFramework)' == 'sl5' ">
@@ -128,41 +114,8 @@
128114
</ItemGroup>
129115

130116
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
131-
<PackageReference Include="System.Collections">
132-
<Version>4.3.0</Version>
133-
</PackageReference>
134-
<PackageReference Include="System.Collections.Concurrent">
135-
<Version>4.3.0</Version>
136-
</PackageReference>
137-
<PackageReference Include="System.ComponentModel.TypeConverter">
138-
<Version>4.3.0</Version>
139-
</PackageReference>
140-
<PackageReference Include="System.Diagnostics.Debug">
141-
<Version>4.3.0</Version>
142-
</PackageReference>
143-
<PackageReference Include="System.Diagnostics.TraceSource">
144-
<Version>4.3.0</Version>
145-
</PackageReference>
146-
<PackageReference Include="System.Dynamic.Runtime">
147-
<Version>4.3.0</Version>
148-
</PackageReference>
149-
<PackageReference Include="System.Linq.Expressions">
150-
<Version>4.3.0</Version>
151-
</PackageReference>
152-
<PackageReference Include="System.Linq.Queryable">
153-
<Version>4.3.0</Version>
154-
</PackageReference>
155-
<PackageReference Include="System.Reflection.TypeExtensions">
156-
<Version>4.3.0</Version>
157-
</PackageReference>
158-
<PackageReference Include="System.Resources.ResourceManager">
159-
<Version>4.3.0</Version>
160-
</PackageReference>
161-
<PackageReference Include="System.Runtime.Extensions">
162-
<Version>4.3.0</Version>
163-
</PackageReference>
164-
<PackageReference Include="System.Threading">
165-
<Version>4.3.0</Version>
166-
</PackageReference>
117+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.3.3" />
118+
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
119+
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
167120
</ItemGroup>
168121
</Project>

0 commit comments

Comments
 (0)