Skip to content

Commit 9d1dc88

Browse files
StefHStefH
authored
Use PackageIcon + upgrade JetBrains.Annotations (#627)
1 parent eaee215 commit 9d1dc88

17 files changed

Lines changed: 84 additions & 189 deletions

File tree

‎System.Linq.Dynamic.Core.sln‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8463ED7E-69FB-49AE-85CF-0791AFD98E38}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DBD7D9B6-FCC7-4650-91AF-E6457573A68F}"
9+
ProjectSection(SolutionItems) = preProject
10+
src\Directory.Build.props = src\Directory.Build.props
11+
EndProjectSection
912
EndProject
1013
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{25E69107-C89E-4807-AA31-C49423F0F1E3}"
1114
ProjectSection(SolutionItems) = preProject
@@ -19,7 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1922
NuGet.txt = NuGet.txt
2023
README.md = README.md
2124
report\run-coverlet-local.cmd = report\run-coverlet-local.cmd
22-
version.xml = version.xml
2325
EndProjectSection
2426
EndProject
2527
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}"

‎resources/logo.ico‎

35.4 KB
Binary file not shown.

‎resources/logo.png‎

6.39 KB
Loading

‎src-blazor/BlazorWASMExample/BlazorWASMExample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="JetBrains.Annotations" Version="2020.3.0" PrivateAssets="All" />
21+
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
2222
</ItemGroup>
2323

2424
</Project>

‎src-console/System.Linq.Dynamic.Core.ConsoleTestApp.net40/ConsoleApp_net40_sqlite_original.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
48-
<Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
48+
<Reference Include="JetBrains.Annotations, Version=4242.42.42.42, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\JetBrains.Annotations.2022.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
5050
</Reference>
5151
<Reference Include="SQLite.CodeFirst, Version=1.3.0.17, Culture=neutral, PublicKeyToken=eb96ba0a78d831a7, processorArchitecture=MSIL">
5252
<HintPath>..\..\packages\SQLite.CodeFirst.1.3.0.17\lib\net40\SQLite.CodeFirst.dll</HintPath>

‎src-console/System.Linq.Dynamic.Core.ConsoleTestApp.net40/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="EntityFramework" version="6.1.3" targetFramework="net40" />
4-
<package id="JetBrains.Annotations" version="10.4.0" targetFramework="net40" />
4+
<package id="JetBrains.Annotations" version="2022.1.0" targetFramework="net40" />
55
<package id="SQLite.CodeFirst" version="1.3.0.17" targetFramework="net40" />
66
<package id="System.Data.SQLite" version="1.0.105.0" targetFramework="net40" />
77
<package id="System.Data.SQLite.Core" version="1.0.105.0" targetFramework="net40" />

‎src/Directory.Build.props‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<Project>
2+
<PropertyGroup>
3+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
4+
<ApplicationIcon>../../resources/logo.ico</ApplicationIcon>
5+
<Authors>ZZZ Projects;Stef Heyenrath</Authors>
6+
<Company>ZZZ Projects</Company>
7+
<Copyright>Copyright © ZZZ Projects</Copyright>
8+
<DefaultLanguage>en-us</DefaultLanguage>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<LangVersion>latest</LangVersion>
11+
<Nullable>enable</Nullable>
12+
<PackageIcon>logo.png</PackageIcon>
13+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
14+
<PackageProjectUrl>https://dynamic-linq.net/</PackageProjectUrl>
15+
<PackageReleaseNotes>Bugfixes and new Features. For details see CHANGELOG.md</PackageReleaseNotes>
16+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
17+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
18+
<RepositoryType>git</RepositoryType>
19+
<RepositoryUrl>https://github.com/zzzprojects/System.Linq.Dynamic.Core</RepositoryUrl>
20+
<SignAssembly>true</SignAssembly>
21+
</PropertyGroup>
22+
23+
<ItemGroup>
24+
<None Include="../../resources/logo.png" Pack="true" PackagePath="" />
25+
</ItemGroup>
26+
</Project>

‎src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj‎

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,22 @@
22
<Import Project="../../version.xml" />
33

44
<PropertyGroup>
5-
<Version>1.2.$(PatchVersion)</Version>
6-
<Description>Dynamic Linq extensions for EntityFramework which adds Async support</Description>
7-
<AssemblyTitle>EntityFramework.DynamicLinq</AssemblyTitle>
8-
<Authors>ZZZ Projects;Stef Heyenrath</Authors>
9-
<TargetFrameworks>net45;net452;net46;netstandard2.1</TargetFrameworks>
10-
<DefineConstants>EF;EFDYNAMICFUNCTIONS</DefineConstants>
11-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
125
<AssemblyName>EntityFramework.DynamicLinq</AssemblyName>
136
<AssemblyOriginatorKeyFile>EntityFramework.DynamicLinq.snk</AssemblyOriginatorKeyFile>
14-
<SignAssembly>true</SignAssembly>
15-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
7+
<AssemblyTitle>EntityFramework.DynamicLinq</AssemblyTitle>
8+
<DefineConstants>EF;EFDYNAMICFUNCTIONS</DefineConstants>
9+
<Description>Dynamic Linq extensions for EntityFramework which adds Async support</Description>
1610
<PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
17-
<PackageReleaseNotes>Bugfixes and new Features. For details see CHANGELOG.md</PackageReleaseNotes>
18-
<PackageProjectUrl>https://dynamic-linq.net/</PackageProjectUrl>
19-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
20-
<PackageIconUrl>https://zzzprojects.github.io/images/logo/logo-64.png</PackageIconUrl>
21-
<RepositoryType>git</RepositoryType>
22-
<RepositoryUrl>https://github.com/zzzprojects/System.Linq.Dynamic.Core</RepositoryUrl>
23-
<DefaultLanguage>en-us</DefaultLanguage>
2411
<ProjectGuid>{D3804228-91F4-4502-9595-39584E510000}</ProjectGuid>
25-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
26-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
27-
<Company>ZZZ Projects</Company>
28-
<Copyright>Copyright © ZZZ Projects</Copyright>
29-
<LangVersion>10</LangVersion>
30-
<Nullable>enable</Nullable>
12+
<TargetFrameworks>net45;net452;net46;netstandard2.1</TargetFrameworks>
13+
<Version>1.2.$(PatchVersion)</Version>
3114
</PropertyGroup>
3215

3316
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
3417
<DebugType>full</DebugType>
3518
</PropertyGroup>
3619

3720
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
38-
<!--<IncludeSource>True</IncludeSource>
39-
<IncludeSymbols>True</IncludeSymbols>
40-
<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
4121
<DebugType>portable</DebugType>
4222
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
4323
</PropertyGroup>
@@ -55,7 +35,10 @@
5535
</ItemGroup>
5636

5737
<ItemGroup>
58-
<PackageReference Include="JetBrains.Annotations" Version="2020.3.0" PrivateAssets="All" />
38+
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
39+
</ItemGroup>
40+
41+
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.1'">
5942
<PackageReference Include="EntityFramework" Version="6.1.3" />
6043
</ItemGroup>
6144

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

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,22 @@
22
<Import Project="../../version.xml" />
33

44
<PropertyGroup>
5-
<Version>2.2.$(PatchVersion)</Version>
6-
<Description>Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support</Description>
7-
<AssemblyTitle>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyTitle>
8-
<Authors>ZZZ Projects;Stef Heyenrath</Authors>
9-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
10-
<DefineConstants>$(DefineConstants);EFCORE;EFCORE_2X;EFDYNAMICFUNCTIONS</DefineConstants>
11-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
125
<AssemblyName>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyName>
136
<AssemblyOriginatorKeyFile>Microsoft.EntityFrameworkCore.DynamicLinq.snk</AssemblyOriginatorKeyFile>
14-
<SignAssembly>true</SignAssembly>
15-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
7+
<AssemblyTitle>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyTitle>
8+
<DefineConstants>$(DefineConstants);EFCORE;EFCORE_2X;EFDYNAMICFUNCTIONS</DefineConstants>
9+
<Description>Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support</Description>
1610
<PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
17-
<PackageReleaseNotes>Bugfixes and new Features. For details see CHANGELOG.md</PackageReleaseNotes>
18-
<PackageProjectUrl>https://dynamic-linq.net/</PackageProjectUrl>
19-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
20-
<PackageIconUrl>https://zzzprojects.github.io/images/logo/logo-64.png</PackageIconUrl>
21-
<RepositoryType>git</RepositoryType>
22-
<RepositoryUrl>https://github.com/zzzprojects/System.Linq.Dynamic.Core</RepositoryUrl>
23-
<DefaultLanguage>en-us</DefaultLanguage>
2411
<ProjectGuid>{D3804228-91F4-4502-9595-39584E510001}</ProjectGuid>
25-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
26-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
27-
<Company>ZZZ Projects</Company>
28-
<Copyright>Copyright © ZZZ Projects</Copyright>
29-
<LangVersion>10</LangVersion>
30-
<Nullable>enable</Nullable>
12+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
13+
<Version>2.2.$(PatchVersion)</Version>
3114
</PropertyGroup>
3215

3316
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
3417
<DebugType>full</DebugType>
3518
</PropertyGroup>
3619

3720
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
38-
<!--<IncludeSource>True</IncludeSource>
39-
<IncludeSymbols>True</IncludeSymbols>
40-
<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
4121
<DebugType>portable</DebugType>
4222
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
4323
</PropertyGroup>
@@ -59,7 +39,7 @@
5939
</ItemGroup>
6040

6141
<ItemGroup>
62-
<PackageReference Include="JetBrains.Annotations" Version="2020.3.0" PrivateAssets="All" />
42+
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
6343
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
6444
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
6545
</ItemGroup>

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

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,15 @@
22
<Import Project="../../version.xml" />
33

44
<PropertyGroup>
5-
<Version>3.2.$(PatchVersion)</Version>
6-
<Description>Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support</Description>
7-
<AssemblyTitle>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyTitle>
8-
<Authors>ZZZ Projects;Stef Heyenrath</Authors>
9-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
10-
<DefineConstants>$(DefineConstants);EFCORE;EFCORE_3X;EFDYNAMICFUNCTIONS;ASYNCENUMERABLE</DefineConstants>
11-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
125
<AssemblyName>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyName>
136
<AssemblyOriginatorKeyFile>../Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.snk</AssemblyOriginatorKeyFile>
14-
<SignAssembly>true</SignAssembly>
15-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
7+
<AssemblyTitle>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyTitle>
8+
<DefineConstants>$(DefineConstants);EFCORE;EFCORE_3X;EFDYNAMICFUNCTIONS;ASYNCENUMERABLE</DefineConstants>
9+
<Description>Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support</Description>
1610
<PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
17-
<PackageReleaseNotes>Bugfixes and new Features. For details see CHANGELOG.md</PackageReleaseNotes>
18-
<PackageProjectUrl>https://dynamic-linq.net/</PackageProjectUrl>
19-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
20-
<PackageIconUrl>https://zzzprojects.github.io/images/logo/logo-64.png</PackageIconUrl>
21-
<RepositoryType>git</RepositoryType>
22-
<RepositoryUrl>https://github.com/zzzprojects/System.Linq.Dynamic.Core</RepositoryUrl>
23-
<DefaultLanguage>en-us</DefaultLanguage>
2411
<ProjectGuid>{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}</ProjectGuid>
25-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
26-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
27-
<Company>ZZZ Projects</Company>
28-
<Copyright>Copyright © ZZZ Projects</Copyright>
29-
<LangVersion>10</LangVersion>
30-
<Nullable>enable</Nullable>
12+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
13+
<Version>3.2.$(PatchVersion)</Version>
3114
</PropertyGroup>
3215

3316
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -58,7 +41,7 @@
5841
</ItemGroup>
5942

6043
<ItemGroup>
61-
<PackageReference Include="JetBrains.Annotations" Version="2020.3.0" PrivateAssets="All" />
44+
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
6245
</ItemGroup>
6346

6447
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">

0 commit comments

Comments
 (0)