Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move entity classes to EF-Independent project #17

Merged
merged 3 commits into from
Mar 14, 2018
Merged

Move entity classes to EF-Independent project #17

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1306f6
Move entity classes to EF-Independent project
ckalan Mar 14, 2018
edab84a
Modified project file to use version.props file
ckalan Mar 14, 2018
a26bc00
Fixed code style issues in build.cake file
ckalan Mar 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion MR.AspNet.Identity.EntityFramework6.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.3
VisualStudioVersion = 15.0.27130.2036
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0670E6AF-F20A-41C5-A0D6-B882911A6B57}"
EndProject
Expand Down Expand Up @@ -42,6 +42,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MR.AspNet.Identity.EntityFr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Key.Int", "samples\Key.Int\Key.Int.csproj", "{1DD7BD7F-AD83-40B0-94EB-1358E30F1C5C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MR.AspNet.Identity.EntityFramework6.Model", "src\MR.AspNet.Identity.EntityFramework6.Model\MR.AspNet.Identity.EntityFramework6.Model.csproj", "{F2D0ACFC-8E54-4D8D-99F9-9F9EA5AAA762}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -76,6 +78,10 @@ Global
{1DD7BD7F-AD83-40B0-94EB-1358E30F1C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1DD7BD7F-AD83-40B0-94EB-1358E30F1C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1DD7BD7F-AD83-40B0-94EB-1358E30F1C5C}.Release|Any CPU.Build.0 = Release|Any CPU
{F2D0ACFC-8E54-4D8D-99F9-9F9EA5AAA762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F2D0ACFC-8E54-4D8D-99F9-9F9EA5AAA762}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F2D0ACFC-8E54-4D8D-99F9-9F9EA5AAA762}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F2D0ACFC-8E54-4D8D-99F9-9F9EA5AAA762}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -88,6 +94,7 @@ Global
{F3B96F9E-6CF3-41E1-9351-F03897390A1C} = {0670E6AF-F20A-41C5-A0D6-B882911A6B57}
{CD7BED02-2DD8-4793-A8BE-B0ACB16AA712} = {0670E6AF-F20A-41C5-A0D6-B882911A6B57}
{1DD7BD7F-AD83-40B0-94EB-1358E30F1C5C} = {C5F42168-4469-4F0A-9E0E-E86A5D220857}
{F2D0ACFC-8E54-4D8D-99F9-9F9EA5AAA762} = {0670E6AF-F20A-41C5-A0D6-B882911A6B57}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {996A6497-B28F-4390-912A-60FD6B74671C}
Expand Down
6 changes: 5 additions & 1 deletion build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ Task("Clean")
{
if (DirectoryExists("./artifacts"))
{
DeleteDirectory("./artifacts", true);
DeleteDirectory("./artifacts", new DeleteDirectorySettings {
Recursive = true,
Force = true
});
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some indentation on the last 3 lines here please. And remove the line trailing line after this.


}
});

Expand Down
1 change: 1 addition & 0 deletions ...pNet.Identity.EntityFramework6.Key.Int/MR.AspNet.Identity.EntityFramework6.Key.Int.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\MR.AspNet.Identity.EntityFramework6.Model\MR.AspNet.Identity.EntityFramework6.Model.csproj" />
<ProjectReference Include="..\MR.AspNet.Identity.EntityFramework6\MR.AspNet.Identity.EntityFramework6.csproj" />
<ProjectReference Include="..\MR.AspNet.Identity.EntityFramework6.InMemory\MR.AspNet.Identity.EntityFramework6.InMemory.csproj" />
</ItemGroup>
Expand Down
0 ...Identity.EntityFramework6/IdentityRole.cs → ...ty.EntityFramework6.Model/IdentityRole.cs
View file
Open in desktop
File renamed without changes.
0 ...ity.EntityFramework6/IdentityRoleClaim.cs → ...tityFramework6.Model/IdentityRoleClaim.cs
View file
Open in desktop
File renamed without changes.
0 ...ramework6.Key.Int/IdentityRoleClaimInt.cs → ...yFramework6.Model/IdentityRoleClaimInt.cs
View file
Open in desktop
File renamed without changes.
0 ...tityFramework6.Key.Int/IdentityRoleInt.cs → ...EntityFramework6.Model/IdentityRoleInt.cs
View file
Open in desktop
File renamed without changes.
0 ...Identity.EntityFramework6/IdentityUser.cs → ...ty.EntityFramework6.Model/IdentityUser.cs
View file
Open in desktop
File renamed without changes.
0 ...ity.EntityFramework6/IdentityUserClaim.cs → ...tityFramework6.Model/IdentityUserClaim.cs
View file
Open in desktop
File renamed without changes.
0 ...ramework6.Key.Int/IdentityUserClaimInt.cs → ...yFramework6.Model/IdentityUserClaimInt.cs
View file
Open in desktop
File renamed without changes.
0 ...tityFramework6.Key.Int/IdentityUserInt.cs → ...EntityFramework6.Model/IdentityUserInt.cs
View file
Open in desktop
File renamed without changes.
0 ...ity.EntityFramework6/IdentityUserLogin.cs → ...tityFramework6.Model/IdentityUserLogin.cs
View file
Open in desktop
File renamed without changes.
0 ...ramework6.Key.Int/IdentityUserLoginInt.cs → ...yFramework6.Model/IdentityUserLoginInt.cs
View file
Open in desktop
File renamed without changes.
0 ...tity.EntityFramework6/IdentityUserRole.cs → ...ntityFramework6.Model/IdentityUserRole.cs
View file
Open in desktop
File renamed without changes.
0 ...Framework6.Key.Int/IdentityUserRoleInt.cs → ...tyFramework6.Model/IdentityUserRoleInt.cs
View file
Open in desktop
File renamed without changes.
0 ...ity.EntityFramework6/IdentityUserToken.cs → ...tityFramework6.Model/IdentityUserToken.cs
View file
Open in desktop
File renamed without changes.
0 ...ramework6.Key.Int/IdentityUserTokenInt.cs → ...yFramework6.Model/IdentityUserTokenInt.cs
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions ...R.AspNet.Identity.EntityFramework6.Model/MR.AspNet.Identity.EntityFramework6.Model.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<Version>3.0.4</Version>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a common.props file that I import in all csprojs that let me share lots of those values, and also reference a single version. So please check the other csprojs on how to edit this one to take advantage of common.props. You'll still need to add the TargetFramework element above to override that.

<Authors>Mohammad Rahhal @mrahhal</Authors>
<Company>Mohammad Rahhal @mrahhal</Company>
<Product>MR.AspNet.Identity.EntityFramework6.Model</Product>
<Description>Entities for MR.AspNet.Identity.EntityFramework6</Description>
<PackageLicenseUrl>https://github.com/mrahhal/MR.AspNet.Identity.EntityFramework6/blob/master/LICENSE.txt</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/mrahhal/MR.AspNet.Identity.EntityFramework6</PackageProjectUrl>
<PackageTags>aspnetcore;aspnet;identity;inmemory;testing</PackageTags>
</PropertyGroup>

</Project>
4 changes: 4 additions & 0 deletions src/MR.AspNet.Identity.EntityFramework6/MR.AspNet.Identity.EntityFramework6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@
<Reference Include="System.Data" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\MR.AspNet.Identity.EntityFramework6.Model\MR.AspNet.Identity.EntityFramework6.Model.csproj" />
</ItemGroup>

</Project>