Skip to content

Commit

Permalink
Merge pull request #5171 from matkoch/dev
Browse files Browse the repository at this point in the history
Build using NUKE
  • Loading branch information
ismcagdas committed Feb 18, 2020
2 parents 1eae8f7 + 43c7282 commit 5f9fab5
Show file tree
Hide file tree
Showing 21 changed files with 409 additions and 322 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -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/
Expand Down Expand Up @@ -76,7 +79,7 @@ _ReSharper*
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
# Installshield output folder
[Ee]xpress

# DocProject is a documentation generator add-in
Expand Down
1 change: 1 addition & 0 deletions .nuke
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Abp.sln
7 changes: 4 additions & 3 deletions Abp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -177,12 +174,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpAspNetCoreDemo.Integrati
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
Expand Down
7 changes: 7 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -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>
11 changes: 6 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
version: 1.0.{build}
configuration: Release
image: Visual Studio 2019

image:
- Visual Studio 2019

pull_requests:
do_not_increment_build_number: true

build_script:
- ps: .\build.ps1
- ps: .\build.ps1 Test

test: off
32 changes: 32 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -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)'
109 changes: 0 additions & 109 deletions build.cake

This file was deleted.

6 changes: 6 additions & 0 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
:; set -eo pipefail
:; ./build.sh "$@"
:; exit $?

@ECHO OFF
powershell -ExecutionPolicy ByPass -NoProfile %0\..\build.ps1 %*

0 comments on commit 5f9fab5

Please sign in to comment.