Skip to content

Commit 5182835

Browse files
DixinDixin
committed
Remove NuProj, add NuSpec.
1 parent fe6c3df commit 5182835

23 files changed

Lines changed: 123 additions & 1837 deletions

‎EntityFramework.Functions.Net47/EntityFramework.Functions.Net47.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>EntityFramework.Functions</RootNamespace>
1111
<AssemblyName>EntityFramework.Functions</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>

‎EntityFramework.Functions.Net48/EntityFramework.Functions.Net48.csproj‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<ProjectGuid>{67C1EDBE-21D0-4AB7-83F9-A51F7128ACFF}</ProjectGuid>
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>EntityFramework.Functions.Net48</RootNamespace>
11-
<AssemblyName>EntityFramework.Functions.Net48</AssemblyName>
10+
<RootNamespace>EntityFramework.Functions</RootNamespace>
11+
<AssemblyName>EntityFramework.Functions</AssemblyName>
1212
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
@@ -31,59 +31,59 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<PropertyGroup>
34-
<SignAssembly>true</SignAssembly>
34+
<SignAssembly>true</SignAssembly>
3535
</PropertyGroup>
3636
<PropertyGroup>
37-
<AssemblyOriginatorKeyFile>..\Tools\Key.snk</AssemblyOriginatorKeyFile>
37+
<AssemblyOriginatorKeyFile>..\Tools\Key.snk</AssemblyOriginatorKeyFile>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
41-
<HintPath>..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.dll</HintPath>
42-
<Private>True</Private>
43-
</Reference>
44-
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
45-
<HintPath>..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
46-
<Private>True</Private>
47-
</Reference>
48-
<Reference Include="System" />
49-
<Reference Include="System.ComponentModel.DataAnnotations" />
50-
<Reference Include="System.Core" />
51-
<Reference Include="System.Data" />
40+
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
41+
<HintPath>..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.dll</HintPath>
42+
<Private>True</Private>
43+
</Reference>
44+
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
45+
<HintPath>..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
46+
<Private>True</Private>
47+
</Reference>
48+
<Reference Include="System" />
49+
<Reference Include="System.ComponentModel.DataAnnotations" />
50+
<Reference Include="System.Core" />
51+
<Reference Include="System.Data" />
5252
</ItemGroup>
5353
<ItemGroup>
54-
<Compile Include="..\EntityFramework.Functions\AssemblyInfo.cs">
55-
<Link>AssemblyInfo.cs</Link>
56-
</Compile>
57-
<Compile Include="..\EntityFramework.Functions\DbContextExtensions.cs">
58-
<Link>DbContextExtensions.cs</Link>
59-
</Compile>
60-
<Compile Include="..\EntityFramework.Functions\Function.cs">
61-
<Link>Function.cs</Link>
62-
</Compile>
63-
<Compile Include="..\EntityFramework.Functions\Function.DbModel.cs">
64-
<Link>Function.DbModel.cs</Link>
65-
</Compile>
66-
<Compile Include="..\EntityFramework.Functions\Function.DbModelBuilder.cs">
67-
<Link>Function.DbModelBuilder.cs</Link>
68-
</Compile>
69-
<Compile Include="..\EntityFramework.Functions\Function.MethodInfo.cs">
70-
<Link>Function.MethodInfo.cs</Link>
71-
</Compile>
72-
<Compile Include="..\EntityFramework.Functions\FunctionAttribute.cs">
73-
<Link>FunctionAttribute.cs</Link>
74-
</Compile>
75-
<Compile Include="..\EntityFramework.Functions\FunctionConvention.cs">
76-
<Link>FunctionConvention.cs</Link>
77-
</Compile>
78-
<Compile Include="..\EntityFramework.Functions\Utilities.cs">
79-
<Link>Utilities.cs</Link>
80-
</Compile>
81-
<Compile Include="..\Tools\CommonAssemblyInfo.cs">
82-
<Link>CommonAssemblyInfo.cs</Link>
83-
</Compile>
54+
<Compile Include="..\EntityFramework.Functions\AssemblyInfo.cs">
55+
<Link>AssemblyInfo.cs</Link>
56+
</Compile>
57+
<Compile Include="..\EntityFramework.Functions\DbContextExtensions.cs">
58+
<Link>DbContextExtensions.cs</Link>
59+
</Compile>
60+
<Compile Include="..\EntityFramework.Functions\Function.cs">
61+
<Link>Function.cs</Link>
62+
</Compile>
63+
<Compile Include="..\EntityFramework.Functions\Function.DbModel.cs">
64+
<Link>Function.DbModel.cs</Link>
65+
</Compile>
66+
<Compile Include="..\EntityFramework.Functions\Function.DbModelBuilder.cs">
67+
<Link>Function.DbModelBuilder.cs</Link>
68+
</Compile>
69+
<Compile Include="..\EntityFramework.Functions\Function.MethodInfo.cs">
70+
<Link>Function.MethodInfo.cs</Link>
71+
</Compile>
72+
<Compile Include="..\EntityFramework.Functions\FunctionAttribute.cs">
73+
<Link>FunctionAttribute.cs</Link>
74+
</Compile>
75+
<Compile Include="..\EntityFramework.Functions\FunctionConvention.cs">
76+
<Link>FunctionConvention.cs</Link>
77+
</Compile>
78+
<Compile Include="..\EntityFramework.Functions\Utilities.cs">
79+
<Link>Utilities.cs</Link>
80+
</Compile>
81+
<Compile Include="..\Tools\CommonAssemblyInfo.cs">
82+
<Link>CommonAssemblyInfo.cs</Link>
83+
</Compile>
8484
</ItemGroup>
8585
<ItemGroup>
86-
<Folder Include="Properties\" />
86+
<Folder Include="Properties\" />
8787
</ItemGroup>
8888
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8989
</Project>

‎EntityFramework.Functions.NetStandard/EntityFramework.Functions.NetStandard.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,20 @@
44
<TargetFramework>netstandard2.1</TargetFramework>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\Tools\Key.snk</AssemblyOriginatorKeyFile>
7-
<Version>1.4.0</Version>
7+
<Version>1.5.0</Version>
88
<Authors>Dixin Yan</Authors>
99
<Company>Dixin Yan</Company>
1010
<PackageId>EntityFramework.Functions</PackageId>
1111
<Product>EntityFramework.Functions</Product>
1212
<Description>EntityFramework.Functions library implements Entity Framework code first support for stored procedures, table-valued functions, scalar-valued functions (composable or non-composable), aggregate functions, built-in functions, and niladic function.</Description>
1313
<AssemblyName>EntityFramework.Functions</AssemblyName>
1414
<RootNamespace>EntityFramework.Functions</RootNamespace>
15+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
16+
<PackageProjectUrl>https://github.com/Dixin/EntityFramework.Functions</PackageProjectUrl>
17+
<Copyright>Dixin Yan https://weblogs.asp.net/dixin</Copyright>
18+
<PackageTags>EF Database Data O/RM ADO.NET EntityFramework Entity Framework CodeFirst Code First Functions StoredProcedures Stored Procedures table-valued tablevalued scalar-valued scalarvalued composable non-composable noncomposable aggregate built-in niladic</PackageTags>
19+
<AssemblyVersion>1.5.0.0</AssemblyVersion>
20+
<FileVersion>1.5.0.0</FileVersion>
1521
</PropertyGroup>
1622

1723
<ItemGroup>

‎EntityFramework.Functions.Nuget/EntityFramework.Functions.Nuget.nuproj‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎EntityFramework.Functions.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{2DF3286B
2121
ProjectSection(SolutionItems) = preProject
2222
Tools\CodeAnalysisDictionary.xml = Tools\CodeAnalysisDictionary.xml
2323
Tools\CommonAssemblyInfo.cs = Tools\CommonAssemblyInfo.cs
24+
Tools\EntityFramework.Functions.nuspec = Tools\EntityFramework.Functions.nuspec
2425
Tools\Key.snk = Tools\Key.snk
2526
Tools\TargetFrameworkVersion.prop = Tools\TargetFrameworkVersion.prop
2627
EndProjectSection

‎Tools/CommonAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
[assembly: AssemblyProduct("EntityFramework.Functions")]
77
[assembly: AssemblyCopyright("Dixin Yan https://weblogs.asp.net/dixin")]
88
[assembly: ComVisible(false)]
9-
[assembly: AssemblyVersion("1.4.0.0")]
10-
[assembly: AssemblyFileVersion("1.4.0.0")]
9+
[assembly: AssemblyVersion("1.5.0.0")]
10+
[assembly: AssemblyFileVersion("1.5.0.0")]

‎Tools/EntityFramework.Functions.nuspec‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
3+
<metadata>
4+
<id>EntityFramework.Functions</id>
5+
<version>1.5.0</version>
6+
<title>EntityFramework Code First Functions</title>
7+
<authors>Dixin Yan</authors>
8+
<owners>Dixin Yan</owners>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<projectUrl>https://github.com/Dixin/EntityFramework.Functions</projectUrl>
11+
<description>EntityFramework.Functions library implements Entity Framework code first support for
12+
- Stored procedures (with single result type, multiple result types, output parameter),
13+
- Table-valued functions (returning entity type, complex type),
14+
- Scalar-valued functions (composable, non-composable),
15+
- Aggregate functions,
16+
- Built-in functions,
17+
- Niladic functions,
18+
- Model defined functions.
19+
20+
EntityFramework.Functions library works on .NET Standard with Entity Framework 6.4.0. It also works on .NET 4.0, .NET 4.5, .NET 4.6, .NET 4.7, .NET 4.8 with Entity Framework 6.1.0 and later.
21+
22+
It can be installed through Nuget:
23+
- dotnet add package EntityFramework.Functions
24+
Or:
25+
- Install-Package EntityFramework.Functions -DependencyVersion Highest
26+
27+
For more information, see:
28+
- Document (APIs and examples): https://weblogs.asp.net/Dixin/EntityFramework.Functions
29+
- Source code: https://github.com/Dixin/EntityFramework.Functions
30+
- Nuget package: https://www.nuget.org/packages/EntityFramework.Functions</description>
31+
<summary>EntityFramework.Functions library implements Entity Framework code first support for stored procedures, table-valued functions, scalar-valued functions (composable or non-composable), aggregate functions, built-in functions, and niladic function.</summary>
32+
<copyright>Dixin Yan https://weblogs.asp.net/dixin</copyright>
33+
<tags>EF Database Data O/RM ADO.NET EntityFramework Entity Framework CodeFirst Code First Functions StoredProcedures Stored Procedures table-valued tablevalued scalar-valued scalarvalued composable non-composable noncomposable aggregate built-in niladic</tags>
34+
<dependencies>
35+
<group targetFramework=".NETStandard2.1">
36+
<dependency id="EntityFramework" version="6.4.0" exclude="Build,Analyzers" />
37+
</group>
38+
<group targetFramework=".NETFramework4.0">
39+
<dependency id="EntityFramework" version="6.1.0" />
40+
</group>
41+
<group targetFramework=".NETFramework4.5">
42+
<dependency id="EntityFramework" version="6.1.0" />
43+
</group>
44+
<group targetFramework=".NETFramework4.6">
45+
<dependency id="EntityFramework" version="6.1.0" />
46+
</group>
47+
<group targetFramework=".NETFramework4.7">
48+
<dependency id="EntityFramework" version="6.1.0" />
49+
</group>
50+
<group targetFramework=".NETFramework4.8">
51+
<dependency id="EntityFramework" version="6.1.0" />
52+
</group>
53+
</dependencies>
54+
</metadata>
55+
<files>
56+
<file src="..\EntityFramework.Functions.Net48\bin\Release\EntityFramework.Functions.dll" target="lib\net40\EntityFramework.Functions.dll" />
57+
<file src="..\EntityFramework.Functions.Net48\bin\Release\EntityFramework.Functions.dll" target="lib\net45\EntityFramework.Functions.dll" />
58+
<file src="..\EntityFramework.Functions.Net48\bin\Release\EntityFramework.Functions.dll" target="lib\net46\EntityFramework.Functions.dll" />
59+
<file src="..\EntityFramework.Functions.Net48\bin\Release\EntityFramework.Functions.dll" target="lib\net47\EntityFramework.Functions.dll" />
60+
<file src="..\EntityFramework.Functions.Net48\bin\Release\EntityFramework.Functions.dll" target="lib\net48\EntityFramework.Functions.dll" />
61+
<file src="..\EntityFramework.Functions.NetStandard\bin\Release\netstandard2.1\EntityFramework.Functions.dll" target="lib\netstandard2.1\EntityFramework.Functions.dll" />
62+
</files>
63+
</package>

‎Tools/NuProj/Microsoft.Web.XmlTransform.dll‎

-79.7 KB
Binary file not shown.

‎Tools/NuProj/NuGet.Core.dll‎

-520 KB
Binary file not shown.

‎Tools/NuProj/NuGet.exe‎

-1.61 MB
Binary file not shown.

0 commit comments

Comments
 (0)