Skip to content

Commit

Permalink
Remove NuProj, add NuSpec.
Browse files Browse the repository at this point in the history
  • Loading branch information
Dixin committed Mar 11, 2020
1 parent fe6c3df commit 5182835
Show file tree
Hide file tree
Showing 23 changed files with 123 additions and 1,837 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>EntityFramework.Functions</RootNamespace>
<AssemblyName>EntityFramework.Functions</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ProjectGuid>{67C1EDBE-21D0-4AB7-83F9-A51F7128ACFF}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>EntityFramework.Functions.Net48</RootNamespace>
<AssemblyName>EntityFramework.Functions.Net48</AssemblyName>
<RootNamespace>EntityFramework.Functions</RootNamespace>
<AssemblyName>EntityFramework.Functions</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
Expand All @@ -31,59 +31,59 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\Tools\Key.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\Tools\Key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\EntityFramework.Functions\AssemblyInfo.cs">
<Link>AssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\DbContextExtensions.cs">
<Link>DbContextExtensions.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\Function.cs">
<Link>Function.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\Function.DbModel.cs">
<Link>Function.DbModel.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\Function.DbModelBuilder.cs">
<Link>Function.DbModelBuilder.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\Function.MethodInfo.cs">
<Link>Function.MethodInfo.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\FunctionAttribute.cs">
<Link>FunctionAttribute.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\FunctionConvention.cs">
<Link>FunctionConvention.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\Utilities.cs">
<Link>Utilities.cs</Link>
</Compile>
<Compile Include="..\Tools\CommonAssemblyInfo.cs">
<Link>CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\AssemblyInfo.cs">
<Link>AssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\DbContextExtensions.cs">
<Link>DbContextExtensions.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\Function.cs">
<Link>Function.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\Function.DbModel.cs">
<Link>Function.DbModel.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\Function.DbModelBuilder.cs">
<Link>Function.DbModelBuilder.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\Function.MethodInfo.cs">
<Link>Function.MethodInfo.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\FunctionAttribute.cs">
<Link>FunctionAttribute.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\FunctionConvention.cs">
<Link>FunctionConvention.cs</Link>
</Compile>
<Compile Include="..\EntityFramework.Functions\Utilities.cs">
<Link>Utilities.cs</Link>
</Compile>
<Compile Include="..\Tools\CommonAssemblyInfo.cs">
<Link>CommonAssemblyInfo.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,20 @@
<TargetFramework>netstandard2.1</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Tools\Key.snk</AssemblyOriginatorKeyFile>
<Version>1.4.0</Version>
<Version>1.5.0</Version>
<Authors>Dixin Yan</Authors>
<Company>Dixin Yan</Company>
<PackageId>EntityFramework.Functions</PackageId>
<Product>EntityFramework.Functions</Product>
<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>
<AssemblyName>EntityFramework.Functions</AssemblyName>
<RootNamespace>EntityFramework.Functions</RootNamespace>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageProjectUrl>https://github.com/Dixin/EntityFramework.Functions</PackageProjectUrl>
<Copyright>Dixin Yan https://weblogs.asp.net/dixin</Copyright>
<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>
<AssemblyVersion>1.5.0.0</AssemblyVersion>
<FileVersion>1.5.0.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down

This file was deleted.

1 change: 1 addition & 0 deletions EntityFramework.Functions.sln
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{2DF3286B
ProjectSection(SolutionItems) = preProject
Tools\CodeAnalysisDictionary.xml = Tools\CodeAnalysisDictionary.xml
Tools\CommonAssemblyInfo.cs = Tools\CommonAssemblyInfo.cs
Tools\EntityFramework.Functions.nuspec = Tools\EntityFramework.Functions.nuspec
Tools\Key.snk = Tools\Key.snk
Tools\TargetFrameworkVersion.prop = Tools\TargetFrameworkVersion.prop
EndProjectSection
Expand Down
4 changes: 2 additions & 2 deletions Tools/CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
[assembly: AssemblyProduct("EntityFramework.Functions")]
[assembly: AssemblyCopyright("Dixin Yan https://weblogs.asp.net/dixin")]
[assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.4.0.0")]
[assembly: AssemblyFileVersion("1.4.0.0")]
[assembly: AssemblyVersion("1.5.0.0")]
[assembly: AssemblyFileVersion("1.5.0.0")]
63 changes: 63 additions & 0 deletions Tools/EntityFramework.Functions.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>EntityFramework.Functions</id>
<version>1.5.0</version>
<title>EntityFramework Code First Functions</title>
<authors>Dixin Yan</authors>
<owners>Dixin Yan</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<projectUrl>https://github.com/Dixin/EntityFramework.Functions</projectUrl>
<description>EntityFramework.Functions library implements Entity Framework code first support for
- Stored procedures (with single result type, multiple result types, output parameter),
- Table-valued functions (returning entity type, complex type),
- Scalar-valued functions (composable, non-composable),
- Aggregate functions,
- Built-in functions,
- Niladic functions,
- Model defined functions.

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.

It can be installed through Nuget:
- dotnet add package EntityFramework.Functions
Or:
- Install-Package EntityFramework.Functions -DependencyVersion Highest

For more information, see:
- Document (APIs and examples): https://weblogs.asp.net/Dixin/EntityFramework.Functions
- Source code: https://github.com/Dixin/EntityFramework.Functions
- Nuget package: https://www.nuget.org/packages/EntityFramework.Functions</description>
<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>
<copyright>Dixin Yan https://weblogs.asp.net/dixin</copyright>
<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>
<dependencies>
<group targetFramework=".NETStandard2.1">
<dependency id="EntityFramework" version="6.4.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETFramework4.0">
<dependency id="EntityFramework" version="6.1.0" />
</group>
<group targetFramework=".NETFramework4.5">
<dependency id="EntityFramework" version="6.1.0" />
</group>
<group targetFramework=".NETFramework4.6">
<dependency id="EntityFramework" version="6.1.0" />
</group>
<group targetFramework=".NETFramework4.7">
<dependency id="EntityFramework" version="6.1.0" />
</group>
<group targetFramework=".NETFramework4.8">
<dependency id="EntityFramework" version="6.1.0" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\EntityFramework.Functions.Net48\bin\Release\EntityFramework.Functions.dll" target="lib\net40\EntityFramework.Functions.dll" />
<file src="..\EntityFramework.Functions.Net48\bin\Release\EntityFramework.Functions.dll" target="lib\net45\EntityFramework.Functions.dll" />
<file src="..\EntityFramework.Functions.Net48\bin\Release\EntityFramework.Functions.dll" target="lib\net46\EntityFramework.Functions.dll" />
<file src="..\EntityFramework.Functions.Net48\bin\Release\EntityFramework.Functions.dll" target="lib\net47\EntityFramework.Functions.dll" />
<file src="..\EntityFramework.Functions.Net48\bin\Release\EntityFramework.Functions.dll" target="lib\net48\EntityFramework.Functions.dll" />
<file src="..\EntityFramework.Functions.NetStandard\bin\Release\netstandard2.1\EntityFramework.Functions.dll" target="lib\netstandard2.1\EntityFramework.Functions.dll" />
</files>
</package>
Binary file removed Tools/NuProj/Microsoft.Web.XmlTransform.dll
Binary file not shown.
Binary file removed Tools/NuProj/NuGet.Core.dll
Binary file not shown.
Binary file removed Tools/NuProj/NuGet.exe
Binary file not shown.
Binary file removed Tools/NuProj/NuProj.Tasks.dll
Binary file not shown.
25 changes: 0 additions & 25 deletions Tools/NuProj/NuProj.props

This file was deleted.

Loading

0 comments on commit 5182835

Please sign in to comment.