Merge branch 'dev'

.gitignore

@@ -1,3 +1,6 @@
+# Build output
+output/
+
 # Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
 [Bb]in/
 [Oo]bj/
@@ -76,7 +79,7 @@ _ReSharper*
 *.ncrunch*
 .*crunch*.local.xml
 
-# Installshield output folder 
+# Installshield output folder
 [Ee]xpress
 
 # DocProject is a documentation generator add-in

.nuke

@@ -0,0 +1 @@
+Abp.sln

Abp.sln

@@ -109,9 +109,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution-items", "solution-
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
-		appveyor.yml = appveyor.yml
-		build.cake = build.cake
-		build.ps1 = build.ps1
 		common.props = common.props
 		LICENSE = LICENSE
 		README.md = README.md
@@ -171,20 +168,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abp.AspNetCore.OData", "src
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnet-mvc-demo", "aspnet-mvc-demo", "{8109EC69-284F-4376-AF0B-D6D5D14F88B2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbpAspNetMvcDemo", "test\aspnet-mvc-demo\AbpAspNetMvcDemo\AbpAspNetMvcDemo.csproj", "{8ABE0603-10CB-4214-AA74-06A3F342F2A9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abp.FluentValidation", "src\Abp.FluentValidation\Abp.FluentValidation.csproj", "{8C6595EA-C3CD-47E6-AE98-9E8ADFD92E67}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpAspNetCoreDemo.IntegrationTests", "test\aspnet-core-demo\AbpAspNetCoreDemo.Tests\AbpAspNetCoreDemo.IntegrationTests.csproj", "{CC0B4F62-6774-4AFD-9244-16116767A760}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abp.EntityFrameworkCore.EFPlus", "src\Abp.EntityFrameworkCore.EFPlus\Abp.EntityFrameworkCore.EFPlus.csproj", "{15C9B221-9469-47AC-9D96-117EB00E2CE1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{C7AD768F-DA07-49CA-B78E-12B9C6FF4340}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C7AD768F-DA07-49CA-B78E-12B9C6FF4340}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7AD768F-DA07-49CA-B78E-12B9C6FF4340}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{486C8629-0E65-47E9-9BA4-8180E682C1F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{486C8629-0E65-47E9-9BA4-8180E682C1F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{486C8629-0E65-47E9-9BA4-8180E682C1F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -481,10 +480,6 @@ Global
 		{E5A2A9D4-E03E-45EB-BD88-DFFFCE087869}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E5A2A9D4-E03E-45EB-BD88-DFFFCE087869}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5A2A9D4-E03E-45EB-BD88-DFFFCE087869}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8ABE0603-10CB-4214-AA74-06A3F342F2A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8ABE0603-10CB-4214-AA74-06A3F342F2A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8ABE0603-10CB-4214-AA74-06A3F342F2A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8ABE0603-10CB-4214-AA74-06A3F342F2A9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8C6595EA-C3CD-47E6-AE98-9E8ADFD92E67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8C6595EA-C3CD-47E6-AE98-9E8ADFD92E67}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8C6595EA-C3CD-47E6-AE98-9E8ADFD92E67}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -578,7 +573,6 @@ Global
 		{4530442B-8E27-4285-A491-7FAAFAC3D4F2} = {DFF0464B-5402-4DD6-86F5-2AEC1163B232}
 		{E5A2A9D4-E03E-45EB-BD88-DFFFCE087869} = {DFF0464B-5402-4DD6-86F5-2AEC1163B232}
 		{8109EC69-284F-4376-AF0B-D6D5D14F88B2} = {1E6B9E8D-D5C1-4AD7-89F9-7179FEFD7C01}
-		{8ABE0603-10CB-4214-AA74-06A3F342F2A9} = {8109EC69-284F-4376-AF0B-D6D5D14F88B2}
 		{8C6595EA-C3CD-47E6-AE98-9E8ADFD92E67} = {DFF0464B-5402-4DD6-86F5-2AEC1163B232}
 		{CC0B4F62-6774-4AFD-9244-16116767A760} = {1C5D3B56-8C59-4ABC-8E66-CBE971633FA7}
 		{15C9B221-9469-47AC-9D96-117EB00E2CE1} = {DFF0464B-5402-4DD6-86F5-2AEC1163B232}

Directory.Build.props

@@ -0,0 +1,7 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
+    </ItemGroup>
+
+</Project>

appveyor.yml

@@ -1,10 +1,11 @@
 version: 1.0.{build}
-configuration: Release
-image: Visual Studio 2017
+
+image:
+  - Visual Studio 2019
+
 pull_requests:
   do_not_increment_build_number: true
-  
+
 build_script:
-- ps: .\build.ps1
+  - ps: .\build.ps1 Test
 
-test: off

azure-pipelines.yml

@@ -0,0 +1,32 @@
+# ------------------------------------------------------------------------------
+# <auto-generated>
+#
+#     This code was generated.
+#
+#     - To turn off auto-generation set:
+#
+#         [AzurePipelines (AutoGenerate = false)]
+#
+#     - To trigger manual generation invoke:
+#
+#         nuke --configure-build-server --host AzurePipelines
+#
+# </auto-generated>
+# ------------------------------------------------------------------------------
+
+stages:
+  - stage: windows_latest
+    displayName: 'windows-latest'
+    dependsOn: [  ]
+    pool:
+      vmImage: 'windows-latest'
+    jobs:
+      - job: Test
+        displayName: 'Test'
+        dependsOn: [  ]
+        strategy:
+          parallel: 4
+        steps:
+          - task: CmdLine@2
+            inputs:
+              script: './build.cmd Restore Compile Test --skip --test-partition $(System.JobPositionInPhase)'

build.cmd

@@ -0,0 +1,6 @@
+:; set -eo pipefail
+:; ./build.sh "$@"
+:; exit $?
+
+@ECHO OFF
+powershell -ExecutionPolicy ByPass -NoProfile %0\..\build.ps1 %*