From 91892249e53ef42b15ee92265d6563f191847efa Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Fri, 29 Mar 2019 16:29:25 -0300 Subject: [PATCH 1/6] use containers in Azure Pipelines --- appveyor.yml | 8 -------- azure-pipelines.yml | 45 +++++++++++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index e989f74..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,8 +0,0 @@ -image: Visual Studio 2017 -build_script: - - ps: | - .\build.ps1 - if ($lastexitcode -ne 0){ exit $lastexitcode } -test: off -artifacts: - - path: bin\*.nupkg \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cc3bf69..f31d9d0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,16 +1,29 @@ -pool: - vmImage: Ubuntu-16.04 -steps: -- script: | - set -e - ./build.sh - ./build-checksum.sh -- task: CopyFiles@2 - inputs: - contents: bin/*.nupkg - flattenFolders: true - targetFolder: $(Build.ArtifactStagingDirectory) -- task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory) - artifactName: nuget \ No newline at end of file +jobs: + +- job: Windows + pool: + vmImage: win1803 + container: mcr.microsoft.com/dotnet/core/sdk:2.2.105 + steps: + - script: | + dotnet --info + +- job: Linux + pool: + vmImage: Ubuntu-16.04 + container: mcr.microsoft.com/dotnet/core/sdk:2.2.105 + steps: + - script: | + set -e + dotnet --info + ./build.sh + ./build-checksum.sh + - task: CopyFiles@2 + inputs: + contents: bin/*.nupkg + flattenFolders: true + targetFolder: $(Build.ArtifactStagingDirectory) + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: $(Build.ArtifactStagingDirectory) + artifactName: nuget \ No newline at end of file From 0d19051bd233f8711c64b599e1e879096cf33529 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Fri, 29 Mar 2019 16:38:30 -0300 Subject: [PATCH 2/6] -nanoserver-1803 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f31d9d0..87e0e9f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,7 +3,7 @@ jobs: - job: Windows pool: vmImage: win1803 - container: mcr.microsoft.com/dotnet/core/sdk:2.2.105 + container: 'mcr.microsoft.com/dotnet/core/sdk:2.2.105-nanoserver-1803' steps: - script: | dotnet --info From e3d2d87eeb5f4996d0bd02669ad3904a8f5091a9 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Fri, 29 Mar 2019 17:02:37 -0300 Subject: [PATCH 3/6] which dotnet on win1803? --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 87e0e9f..3e576c3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,7 +3,7 @@ jobs: - job: Windows pool: vmImage: win1803 - container: 'mcr.microsoft.com/dotnet/core/sdk:2.2.105-nanoserver-1803' + # container: 'mcr.microsoft.com/dotnet/core/sdk:2.2.105-nanoserver-1803' steps: - script: | dotnet --info From e89cbfbe3634bd8d3eba626a41074568ac9281a2 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Fri, 29 Mar 2019 17:24:30 -0300 Subject: [PATCH 4/6] build on Windows --- azure-pipelines.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3e576c3..54171c1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,7 +6,9 @@ jobs: # container: 'mcr.microsoft.com/dotnet/core/sdk:2.2.105-nanoserver-1803' steps: - script: | - dotnet --info + dotnet --version + .\build.ps1 + if ($lastexitcode -ne 0){ exit $lastexitcode } - job: Linux pool: @@ -15,7 +17,6 @@ jobs: steps: - script: | set -e - dotnet --info ./build.sh ./build-checksum.sh - task: CopyFiles@2 From 6d894b7f274c00e1915d54bde434c6a71980819c Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Fri, 29 Mar 2019 17:33:15 -0300 Subject: [PATCH 5/6] powershell --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 54171c1..7638643 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,7 +5,7 @@ jobs: vmImage: win1803 # container: 'mcr.microsoft.com/dotnet/core/sdk:2.2.105-nanoserver-1803' steps: - - script: | + - powershell: | dotnet --version .\build.ps1 if ($lastexitcode -ne 0){ exit $lastexitcode } From 4531f1ae22f8adea5b5f57abe5ad78c219b79801 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Fri, 29 Mar 2019 17:46:15 -0300 Subject: [PATCH 6/6] add NuGet.Config --- NuGet.Config | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 NuGet.Config diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 0000000..6582799 --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file