Merge remote-tracking branch 'refs/remotes/origin/dev'

aspnetboilerplate · Apr 20, 2017 · 9a675fd · 9a675fd
2 parents 14699d6 + 6dd1886
commit 9a675fd
Show file tree

Hide file tree

Showing 208 changed files with 7,349 additions and 2,208 deletions.
diff --git a/Abp.Zero.sln b/Abp.Zero.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{364398C2-9B6A-40B3-9845-23ABFB8D12AB}"
 EndProject
@@ -41,6 +41,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abp.Zero.Owin", "src\Abp.Ze
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abp.Zero.AspNetCore", "src\Abp.Zero.AspNetCore\Abp.Zero.AspNetCore.csproj", "{8EE2ACFF-CB44-4A7E-8FE7-5709AD245F44}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Abp.ZeroCore", "src\Abp.ZeroCore\Abp.ZeroCore.csproj", "{C5F4218F-2637-4629-B43B-7728D28CB19E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Abp.Zero.Common", "src\Abp.Zero.Common\Abp.Zero.Common.csproj", "{EABE7BBB-A837-4607-9B0D-BE41E4A0F81F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Abp.ZeroCore.EntityFrameworkCore", "src\Abp.ZeroCore.EntityFrameworkCore\Abp.ZeroCore.EntityFrameworkCore.csproj", "{39A3807E-4309-43D7-98C1-246547108006}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ZeroCore", "ZeroCore", "{A6CB86B2-8C58-42D7-917A-F1DEB29C121A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Zero", "Zero", "{22551F30-C7C5-40D5-AE24-3D675ABC9B46}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Zero", "Zero", "{4A2AFB7B-F4F7-4E47-A8A3-F1F848C9F1B9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{12068527-E860-4AC1-88C3-62B435E4BBE5}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -103,24 +117,43 @@ Global
  {8EE2ACFF-CB44-4A7E-8FE7-5709AD245F44}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {8EE2ACFF-CB44-4A7E-8FE7-5709AD245F44}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {8EE2ACFF-CB44-4A7E-8FE7-5709AD245F44}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C5F4218F-2637-4629-B43B-7728D28CB19E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C5F4218F-2637-4629-B43B-7728D28CB19E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C5F4218F-2637-4629-B43B-7728D28CB19E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C5F4218F-2637-4629-B43B-7728D28CB19E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EABE7BBB-A837-4607-9B0D-BE41E4A0F81F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EABE7BBB-A837-4607-9B0D-BE41E4A0F81F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EABE7BBB-A837-4607-9B0D-BE41E4A0F81F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EABE7BBB-A837-4607-9B0D-BE41E4A0F81F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {39A3807E-4309-43D7-98C1-246547108006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {39A3807E-4309-43D7-98C1-246547108006}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {39A3807E-4309-43D7-98C1-246547108006}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {39A3807E-4309-43D7-98C1-246547108006}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE
  EndGlobalSection
  GlobalSection(NestedProjects) = preSolution
- {E06353A0-8403-44A0-8D57-200D55E2F2C5} = {364398C2-9B6A-40B3-9845-23ABFB8D12AB}
- {C28F608B-F34E-411C-8D88-C5D566141735} = {364398C2-9B6A-40B3-9845-23ABFB8D12AB}
- {A57787C3-AD9A-40A8-B955-EDA596397429} = {364398C2-9B6A-40B3-9845-23ABFB8D12AB}
- {C64C24CD-74CE-47A2-A03C-06F4F78413F1} = {364398C2-9B6A-40B3-9845-23ABFB8D12AB}
- {667801A0-99A5-414A-8685-A035408BF413} = {E1AD01DD-1A0D-40DF-AFBE-F2AA3B4160AB}
- {97670397-EDF9-4968-9A25-0EB71C68D5F8} = {E1AD01DD-1A0D-40DF-AFBE-F2AA3B4160AB}
- {FA3E87C5-7273-461C-AE9F-67B416E07949} = {E1AD01DD-1A0D-40DF-AFBE-F2AA3B4160AB}
- {41F88D4F-FAB9-4D0A-85E5-C71F8B63B973} = {E1AD01DD-1A0D-40DF-AFBE-F2AA3B4160AB}
- {83108E5E-FD31-4762-8854-D795A8FB482F} = {364398C2-9B6A-40B3-9845-23ABFB8D12AB}
- {76E2CCE7-A61F-4700-9054-9923645E41CC} = {E1AD01DD-1A0D-40DF-AFBE-F2AA3B4160AB}
- {9223F076-ECE7-4381-9BBF-F3E33073B91A} = {E1AD01DD-1A0D-40DF-AFBE-F2AA3B4160AB}
- {25F73233-3922-4BC0-AC1C-2042613DEC5E} = {E1AD01DD-1A0D-40DF-AFBE-F2AA3B4160AB}
- {81D2351F-6CA1-4976-86EB-63946EBD0A36} = {364398C2-9B6A-40B3-9845-23ABFB8D12AB}
- {8EE2ACFF-CB44-4A7E-8FE7-5709AD245F44} = {364398C2-9B6A-40B3-9845-23ABFB8D12AB}
+ {E06353A0-8403-44A0-8D57-200D55E2F2C5} = {22551F30-C7C5-40D5-AE24-3D675ABC9B46}
+ {C28F608B-F34E-411C-8D88-C5D566141735} = {12068527-E860-4AC1-88C3-62B435E4BBE5}
+ {A57787C3-AD9A-40A8-B955-EDA596397429} = {22551F30-C7C5-40D5-AE24-3D675ABC9B46}
+ {C64C24CD-74CE-47A2-A03C-06F4F78413F1} = {22551F30-C7C5-40D5-AE24-3D675ABC9B46}
+ {667801A0-99A5-414A-8685-A035408BF413} = {4A2AFB7B-F4F7-4E47-A8A3-F1F848C9F1B9}
+ {97670397-EDF9-4968-9A25-0EB71C68D5F8} = {4A2AFB7B-F4F7-4E47-A8A3-F1F848C9F1B9}
+ {FA3E87C5-7273-461C-AE9F-67B416E07949} = {4A2AFB7B-F4F7-4E47-A8A3-F1F848C9F1B9}
+ {41F88D4F-FAB9-4D0A-85E5-C71F8B63B973} = {4A2AFB7B-F4F7-4E47-A8A3-F1F848C9F1B9}
+ {83108E5E-FD31-4762-8854-D795A8FB482F} = {22551F30-C7C5-40D5-AE24-3D675ABC9B46}
+ {76E2CCE7-A61F-4700-9054-9923645E41CC} = {4A2AFB7B-F4F7-4E47-A8A3-F1F848C9F1B9}
+ {9223F076-ECE7-4381-9BBF-F3E33073B91A} = {4A2AFB7B-F4F7-4E47-A8A3-F1F848C9F1B9}
+ {25F73233-3922-4BC0-AC1C-2042613DEC5E} = {4A2AFB7B-F4F7-4E47-A8A3-F1F848C9F1B9}
+ {81D2351F-6CA1-4976-86EB-63946EBD0A36} = {22551F30-C7C5-40D5-AE24-3D675ABC9B46}
+ {8EE2ACFF-CB44-4A7E-8FE7-5709AD245F44} = {22551F30-C7C5-40D5-AE24-3D675ABC9B46}
+ {C5F4218F-2637-4629-B43B-7728D28CB19E} = {A6CB86B2-8C58-42D7-917A-F1DEB29C121A}
+ {EABE7BBB-A837-4607-9B0D-BE41E4A0F81F} = {12068527-E860-4AC1-88C3-62B435E4BBE5}
+ {39A3807E-4309-43D7-98C1-246547108006} = {A6CB86B2-8C58-42D7-917A-F1DEB29C121A}
+ {A6CB86B2-8C58-42D7-917A-F1DEB29C121A} = {364398C2-9B6A-40B3-9845-23ABFB8D12AB}
+ {22551F30-C7C5-40D5-AE24-3D675ABC9B46} = {364398C2-9B6A-40B3-9845-23ABFB8D12AB}
+ {4A2AFB7B-F4F7-4E47-A8A3-F1F848C9F1B9} = {E1AD01DD-1A0D-40DF-AFBE-F2AA3B4160AB}
+ {12068527-E860-4AC1-88C3-62B435E4BBE5} = {364398C2-9B6A-40B3-9845-23ABFB8D12AB}
  EndGlobalSection
 EndGlobal
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 configuration: Release
-version: 1.5.1-beta{build}
-image: Visual Studio 2017 RC
+version: 2.0.0-beta{build}
+image: Visual Studio 2017
 
 nuget:
  disable_publish_on_pr: true
@@ -28,7 +28,7 @@ pull_requests:
 test:
  assemblies:
  - test\Abp.Zero.SampleApp.Tests\bin\Release\net452\Abp.Zero.SampleApp.Tests.dll
- - test\Abp.Zero.SampleApp.EntityFrameworkCore.Tests\bin\Release\net461\Abp.Zero.SampleApp.EntityFrameworkCore.Tests.dll
+ # - test\Abp.Zero.SampleApp.EntityFrameworkCore.Tests\bin\Release\net461\Abp.Zero.SampleApp.EntityFrameworkCore.Tests.dll
  # - test\Abp.Zero.SampleApp.NHibernateTests\bin\Release\net452\Abp.Zero.SampleApp.NHibernateTests.dll
 
 artifacts:

diff --git a/common.props b/common.props
@@ -1,11 +1,15 @@
 <Project>
  <PropertyGroup>
- <VersionPrefix>1.5.1</VersionPrefix>
+ <Version>2.0.0</Version>
  <NoWarn>$(NoWarn);CS1591</NoWarn>
  <PackageIconUrl>http://www.aspnetboilerplate.com/images/abp_nupkg.png</PackageIconUrl>
  <PackageProjectUrl>http://www.aspnetboilerplate.com/</PackageProjectUrl>
  <PackageLicenseUrl>https://github.com/aspnetboilerplate/aspnetboilerplate/blob/master/LICENSE</PackageLicenseUrl>
  <RepositoryType>git</RepositoryType>
  <RepositoryUrl>https://github.com/aspnetboilerplate/aspnetboilerplate</RepositoryUrl>
  </PropertyGroup>
+
+ <PropertyGroup Condition="'$(TargetFramework)'=='net452'">
+ <DefineConstants>NET452</DefineConstants>
+ </PropertyGroup>
 </Project>
diff --git a/nupkg/pack.bat b/nupkg/pack.bat
diff --git a/nupkg/pack.ps1 b/nupkg/pack.ps1
@@ -5,17 +5,21 @@ $srcPath = Join-Path $slnPath "src"
 
 # List of projects
 $projects = (
+ "Abp.Zero.Common",
+ "Abp.Zero.Ldap",
  "Abp.Zero",
  "Abp.Zero.Owin",
  "Abp.Zero.AspNetCore",
- "Abp.Zero.Ldap",
  "Abp.Zero.EntityFramework",
  "Abp.Zero.EntityFrameworkCore",
- "Abp.Zero.NHibernate"
+ "Abp.Zero.NHibernate",
+ "Abp.ZeroCore",
+ "Abp.ZeroCore.EntityFrameworkCore"
 )
 
 # Rebuild solution
 Set-Location $slnPath
+& dotnet restore
 & dotnet msbuild /t:Rebuild /p:Configuration=Release
 
 # Copy all nuget packages to the pack folder

diff --git a/src/Abp.Zero.AspNetCore/Abp.Zero.AspNetCore.1.5.0.nupkg b/src/Abp.Zero.AspNetCore/Abp.Zero.AspNetCore.1.5.0.nupkg
diff --git a/src/Abp.Zero.AspNetCore/Abp.Zero.AspNetCore.csproj b/src/Abp.Zero.AspNetCore/Abp.Zero.AspNetCore.csproj
@@ -3,7 +3,7 @@
  <Import Project="..\..\common.props" />
 
  <PropertyGroup>
- <TargetFramework>net461</TargetFramework>
+ <TargetFramework>net46</TargetFramework>
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
  <AssemblyName>Abp.Zero.AspNetCore</AssemblyName>
  <PackageId>Abp.Zero.AspNetCore</PackageId>
@@ -14,21 +14,18 @@
  </PropertyGroup>
 
  <ItemGroup>
- <None Update="bin\Release\net461\Abp.Zero.AspNetCore.pdb">
- <PackagePath>lib/net461/</PackagePath>
+ <None Update="bin\Release\net46\Abp.Zero.AspNetCore.pdb">
+ <PackagePath>lib/net46/</PackagePath>
  <Pack>true</Pack>
  </None>
  </ItemGroup>
 
  <ItemGroup>
  <ProjectReference Include="..\Abp.Zero\Abp.Zero.csproj" />
- </ItemGroup>
-
- <ItemGroup>
  <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
  </ItemGroup>
 
- <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
  <Reference Include="System" />
  <Reference Include="Microsoft.CSharp" />
  </ItemGroup>

diff --git a/src/Abp.Zero.Common/Abp.Zero.Common.csproj b/src/Abp.Zero.Common/Abp.Zero.Common.csproj
@@ -0,0 +1,50 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <Import Project="..\..\common.props" />
+
+ <PropertyGroup>
+ <TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
+ <GenerateDocumentationFile>true</GenerateDocumentationFile>
+ <AssemblyName>Abp.Zero.Common</AssemblyName>
+ <PackageId>Abp.Zero.Common</PackageId>
+ <PackageTags>asp.net;asp.net mvc;boilerplate;application framework;web framework;framework;domain driven design;multitenancy;user management;role management;identity;aspnet core</PackageTags>
+ <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+ <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+ <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+ <RootNamespace>Abp</RootNamespace>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <EmbeddedResource Include="Zero\Localization\Source\AbpZero-de.xml" />
+ <EmbeddedResource Include="Zero\Localization\Source\AbpZero-fa.xml" />
+ <EmbeddedResource Include="Zero\Localization\Source\AbpZero-fr.xml" />
+ <EmbeddedResource Include="Zero\Localization\Source\AbpZero-it.xml" />
+ <EmbeddedResource Include="Zero\Localization\Source\AbpZero-lt.xml" />
+ <EmbeddedResource Include="Zero\Localization\Source\AbpZero-lv.xml" />
+ <EmbeddedResource Include="Zero\Localization\Source\AbpZero-pt-BR.xml" />
+ <EmbeddedResource Include="Zero\Localization\Source\AbpZero-ru.xml" />
+ <EmbeddedResource Include="Zero\Localization\Source\AbpZero-tr.xml" />
+ <EmbeddedResource Include="Zero\Localization\Source\AbpZero-zh-CN.xml" />
+ <EmbeddedResource Include="Zero\Localization\Source\AbpZero.xml" />
+ </ItemGroup>
+
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+ <Reference Include="System.ComponentModel.DataAnnotations" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <None Update="bin\Release\net46\Abp.Zero.Common.pdb">
+ <PackagePath>lib/net46/</PackagePath>
+ <Pack>true</Pack>
+ </None>
+ <None Update="bin\Release\netstandard1.6\Abp.Zero.Common.pdb">
+ <PackagePath>lib/netstandard1.6/</PackagePath>
+ <Pack>true</Pack>
+ </None>
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Abp" Version="2.0.0" />
+ </ItemGroup>
+
+</Project>