From 6fe0664a5897cc8905526a952f9382501012eed6 Mon Sep 17 00:00:00 2001 From: Ross Knudsen Date: Sat, 27 Apr 2019 15:45:05 +1200 Subject: [PATCH 01/11] Set up CI with Azure Pipelines [skip ci] --- azure-pipelines.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..d6f40c5 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,17 @@ +# ASP.NET Core +# Build and test ASP.NET Core projects targeting .NET Core. +# Add steps that run tests, create a NuGet package, deploy, and more: +# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core + +trigger: +- master + +pool: + vmImage: 'Ubuntu-16.04' + +variables: + buildConfiguration: 'Release' + +steps: +- script: dotnet build --configuration $(buildConfiguration) + displayName: 'dotnet build $(buildConfiguration)' From 6728809dda924dafa42954ad17dc2d06fc89fd13 Mon Sep 17 00:00:00 2001 From: Ross Knudsen Date: Sat, 27 Apr 2019 15:51:53 +1200 Subject: [PATCH 02/11] Updated build agent --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d6f40c5..5e03eb9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ trigger: - master pool: - vmImage: 'Ubuntu-16.04' + vmImage: 'vs2017-win2016' variables: buildConfiguration: 'Release' From aa61e1729b1b822890c78f3b13ae55a7182c1bd0 Mon Sep 17 00:00:00 2001 From: Ross Knudsen Date: Sat, 27 Apr 2019 16:06:33 +1200 Subject: [PATCH 03/11] Added unit tests to Azure Pipelines --- azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5e03eb9..6f7748d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,3 +15,8 @@ variables: steps: - script: dotnet build --configuration $(buildConfiguration) displayName: 'dotnet build $(buildConfiguration)' + +- task: VSTest@2 + inputs: + testSelector: testAssemblies + testAssemblyVer2: '**\bin\$(BuildConfiguration)\**\*test.dll' From 5c5e96af3cf59e73d4e7ae8aa1b7ad9a5119882a Mon Sep 17 00:00:00 2001 From: Ross Knudsen Date: Sat, 27 Apr 2019 16:11:00 +1200 Subject: [PATCH 04/11] Tweaked unit tests for Azure Pipelines --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6f7748d..250c2a9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,4 +19,5 @@ steps: - task: VSTest@2 inputs: testSelector: testAssemblies - testAssemblyVer2: '**\bin\$(BuildConfiguration)\**\*test.dll' + testAssemblyVer2: '**\bin\$(BuildConfiguration)\**\*Test.dll' + codeCoverageEnabled: true From 8546429983000e8bf28e38e1a05cf204c6bc78a4 Mon Sep 17 00:00:00 2001 From: Ross Knudsen Date: Sat, 27 Apr 2019 16:21:29 +1200 Subject: [PATCH 05/11] Tweaked unit tests for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 250c2a9..26c019c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,5 +19,5 @@ steps: - task: VSTest@2 inputs: testSelector: testAssemblies - testAssemblyVer2: '**\bin\$(BuildConfiguration)\**\*Test.dll' + testAssemblyVer2: '**\*Test.dll' codeCoverageEnabled: true From dd987b8be84e52be9816a9e942f96dfa1a8d1754 Mon Sep 17 00:00:00 2001 From: Ross Knudsen Date: Sat, 27 Apr 2019 16:30:38 +1200 Subject: [PATCH 06/11] Tweaked unit tests for Azure Pipelines --- azure-pipelines.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 26c019c..11a97bd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,5 +19,9 @@ steps: - task: VSTest@2 inputs: testSelector: testAssemblies - testAssemblyVer2: '**\*Test.dll' + testAssemblyVer2: | + **\*Test*.dll + !**\*Microsoft.VisualStudio.TestPlatform* + !**\obj\** codeCoverageEnabled: true + otherConsoleOptions: '/platform:x64 /Framework:.NETCoreApp,Version=v2.2 /logger:console;verbosity="normal" ' From 800f412177c60d57378aa5362d3c9493cfbb4ac0 Mon Sep 17 00:00:00 2001 From: Ross Knudsen Date: Sun, 28 Apr 2019 20:11:31 +1200 Subject: [PATCH 07/11] Fixed licensing warning Updated version details --- .../Kavod.Vba.Compression.csproj | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Kavod.Vba.Compression/Kavod.Vba.Compression.csproj b/src/Kavod.Vba.Compression/Kavod.Vba.Compression.csproj index d9795a8..97bf7d7 100644 --- a/src/Kavod.Vba.Compression/Kavod.Vba.Compression.csproj +++ b/src/Kavod.Vba.Compression/Kavod.Vba.Compression.csproj @@ -2,18 +2,20 @@ net45;netstandard2.0 - Copyright © 2016 + Copyright © 2016 true True Ross Knudsen - VBA uses a compression algorithm when packaging code into a VBA Project within a Microsoft Office file. The specification can be found here: https://msdn.microsoft.com/en-us/library/dd923471(v=office.12).aspx + + VBA uses a compression algorithm when packaging code into a VBA Project within a Microsoft Office file. + The specification can be found here: https://msdn.microsoft.com/en-us/library/dd923471(v=office.12).aspx + https://github.com/rossknudsen/Kavod.Vba.Compression - 0.0.2.0 - 0.0.2.0 https://github.com/rossknudsen/Kavod.Vba.Compression - https://raw.githubusercontent.com/rossknudsen/Kavod.Vba.Compression/master/LICENSE - 0.0.2-alpha + MIT + 0.0.2 + alpha From fb81f4160de6807905fceb30e2bf1fbff5423d29 Mon Sep 17 00:00:00 2001 From: Ross Knudsen Date: Sun, 28 Apr 2019 20:18:44 +1200 Subject: [PATCH 08/11] Added task to take build output as artifacts --- azure-pipelines.yml | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 11a97bd..34b0e02 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,12 +16,21 @@ steps: - script: dotnet build --configuration $(buildConfiguration) displayName: 'dotnet build $(buildConfiguration)' -- task: VSTest@2 +# - task: VSTest@2 +# inputs: +# testSelector: testAssemblies +# testAssemblyVer2: | +# **\*Test*.dll +# !**\*Microsoft.VisualStudio.TestPlatform* +# !**\obj\** +# codeCoverageEnabled: true +# otherConsoleOptions: '/platform:x64 /Framework:.NETCoreApp,Version=v2.2 /logger:console;verbosity="normal" ' + +- task: PublishBuildArtifacts@1 inputs: - testSelector: testAssemblies - testAssemblyVer2: | - **\*Test*.dll - !**\*Microsoft.VisualStudio.TestPlatform* - !**\obj\** - codeCoverageEnabled: true - otherConsoleOptions: '/platform:x64 /Framework:.NETCoreApp,Version=v2.2 /logger:console;verbosity="normal" ' + pathtoPublish: '$(Build.ArtifactStagingDirectory)' + artifactName: 'nuget package' + #publishLocation: 'Container' # Options: container, filePath + #targetPath: # Required when publishLocation == FilePath + #parallel: false # Optional + #parallelCount: # Optional From 507c01e1c683bfd2aa2afefa58e9146c35d89cf9 Mon Sep 17 00:00:00 2001 From: Ross Knudsen Date: Sun, 28 Apr 2019 20:32:05 +1200 Subject: [PATCH 09/11] Added task to take build output as artifacts --- azure-pipelines.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 34b0e02..af75ab4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -26,10 +26,18 @@ steps: # codeCoverageEnabled: true # otherConsoleOptions: '/platform:x64 /Framework:.NETCoreApp,Version=v2.2 /logger:console;verbosity="normal" ' +- task: CopyFiles@2 + displayName: '' + inputs: + SourceFolder: '$(Build.SourcesDirectory)' + Contents: | + **/*.nupkg + TargetFolder: '$(Build.ArtifactStagingDirectory)' + - task: PublishBuildArtifacts@1 inputs: pathtoPublish: '$(Build.ArtifactStagingDirectory)' - artifactName: 'nuget package' + artifactName: 'nupkg' #publishLocation: 'Container' # Options: container, filePath #targetPath: # Required when publishLocation == FilePath #parallel: false # Optional From 2ab392bc4ff50dc8345a58aa53eda5f25423b3f8 Mon Sep 17 00:00:00 2001 From: Ross Knudsen Date: Mon, 29 Apr 2019 22:02:12 +1200 Subject: [PATCH 10/11] More tweaks --- azure-pipelines.yml | 4 +++- src/Kavod.Vba.Compression/Kavod.Vba.Compression.csproj | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index af75ab4..02c04bb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,9 @@ variables: buildConfiguration: 'Release' steps: -- script: dotnet build --configuration $(buildConfiguration) +- script: | + dotnet build --configuration $(buildConfiguration) + dotnet pack --include-symbols displayName: 'dotnet build $(buildConfiguration)' # - task: VSTest@2 diff --git a/src/Kavod.Vba.Compression/Kavod.Vba.Compression.csproj b/src/Kavod.Vba.Compression/Kavod.Vba.Compression.csproj index 97bf7d7..98683a4 100644 --- a/src/Kavod.Vba.Compression/Kavod.Vba.Compression.csproj +++ b/src/Kavod.Vba.Compression/Kavod.Vba.Compression.csproj @@ -3,7 +3,6 @@ net45;netstandard2.0 Copyright © 2016 - true True Ross Knudsen From d8258453fb73777251172e396fb280d6016a7d4c Mon Sep 17 00:00:00 2001 From: Ross Knudsen Date: Mon, 29 Apr 2019 22:23:14 +1200 Subject: [PATCH 11/11] Tidy up the CI config and re-enable unit tests. --- azure-pipelines.yml | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 02c04bb..f5f99ab 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,8 +1,3 @@ -# ASP.NET Core -# Build and test ASP.NET Core projects targeting .NET Core. -# Add steps that run tests, create a NuGet package, deploy, and more: -# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core - trigger: - master @@ -18,18 +13,19 @@ steps: dotnet pack --include-symbols displayName: 'dotnet build $(buildConfiguration)' -# - task: VSTest@2 -# inputs: -# testSelector: testAssemblies -# testAssemblyVer2: | -# **\*Test*.dll -# !**\*Microsoft.VisualStudio.TestPlatform* -# !**\obj\** -# codeCoverageEnabled: true -# otherConsoleOptions: '/platform:x64 /Framework:.NETCoreApp,Version=v2.2 /logger:console;verbosity="normal" ' +- task: VSTest@2 + displayName: 'dotnet test' + inputs: + testSelector: testAssemblies + testAssemblyVer2: | + **\*Test*.dll + !**\*Microsoft.VisualStudio.TestPlatform* + !**\obj\** + codeCoverageEnabled: true + otherConsoleOptions: '/platform:x64 /Framework:.NETCoreApp,Version=v2.2 /logger:console;verbosity="normal" ' - task: CopyFiles@2 - displayName: '' + displayName: 'copy nuget packages' inputs: SourceFolder: '$(Build.SourcesDirectory)' Contents: | @@ -37,10 +33,7 @@ steps: TargetFolder: '$(Build.ArtifactStagingDirectory)' - task: PublishBuildArtifacts@1 + displayName: 'publish artifacts' inputs: pathtoPublish: '$(Build.ArtifactStagingDirectory)' - artifactName: 'nupkg' - #publishLocation: 'Container' # Options: container, filePath - #targetPath: # Required when publishLocation == FilePath - #parallel: false # Optional - #parallelCount: # Optional + artifactName: 'nupkg'