From 7caef9688f0c4030fd3aaafd2419a7d19ac9ca75 Mon Sep 17 00:00:00 2001 From: "Stephen M. Redd" Date: Tue, 18 Jun 2019 13:34:59 -0700 Subject: [PATCH] Update CI again --- appveyor.yml | 11 +---- build.ps1 | 44 +++---------------- .../NullDesk.Extensions.Mailer.Core.csproj | 3 +- ...r.History.EntityFramework.SqlServer.csproj | 3 +- ...ions.Mailer.History.EntityFramework.csproj | 3 +- .../NullDesk.Extensions.Mailer.MailKit.csproj | 3 +- ...NullDesk.Extensions.Mailer.SendGrid.csproj | 3 +- 7 files changed, 18 insertions(+), 52 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index de356f8..bd0bac5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,24 +15,17 @@ build: publish_nuget: true publish_nuget_symbols: true use_snupkg_format: true -test: off +test: on artifacts: - path: '**\*.nupkg' name: NuGet Packages - path: '**\*.snupkg' name: NuGet Symbols Packages deploy: -- provider: NuGet - server: https://www.myget.org/F/nulldesk-ci/api/v2/package - api_key: - secure: uBiyeuaz9rRv16bZe/X6HID91rZK//umRAHXo0gRh8l57p8MElDVETuqSwFXZVme - symbol_server: https://www.myget.org/F/nulldesk-ci/symbols/api/v2/package - on: - branch: master - provider: NuGet name: production api_key: - secure: QAxZSIPDkPX/ziDi/D7MZ4nF3bimBfEQ35RiKwO0Lug7HE3lvqGC/zAs1HrWfrDY + secure: g51pGgMjLDtttxJLWt+Fbz2XserKjK4wdalDS7OnhzTmiV+a5yC+IXD0U/1LGZuN on: branch: master appveyor_repo_tag: true diff --git a/build.ps1 b/build.ps1 index 4fc1a09..becd660 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,10 +1,6 @@ -<# -.SYNOPSIS - You can add this to you build script to ensure that psbuild is available before calling - Invoke-MSBuild. If psbuild is not available locally it will be downloaded automatically. -#> + function EnsurePsbuildInstalled{ [cmdletbinding()] param( @@ -26,17 +22,9 @@ function EnsurePsbuildInstalled{ } } -# Taken from psake https://github.com/psake/psake - -<# -.SYNOPSIS - This is a helper function that runs a scriptblock and checks the PS variable $lastexitcode - to see if an error occcured. If an error is detected then an exception is thrown. - This function allows you to run command-line programs without having to - explicitly check the $lastexitcode variable. -.EXAMPLE - exec { svn info $repository_trunk } "Error executing SVN. Please verify SVN command-line client is installed" -#> + + + function Exec { [CmdletBinding()] param( @@ -86,30 +74,10 @@ if(!$config){ # loop through projects and collect src and test project paths foreach ($folder in $srcDir) { $p = Join-Path -Path $folder.FullName -ChildPath '*.csproj'; - # only src project folders -> folders with a csproj file - if (Test-Path $p -PathType Leaf) { - $projectFolders += $folder.FullName - # find the test project, if one exists, and run each - $testFolderPath = ".\test\" + $folder.Name + ".Tests" - if (Test-Path $testFolderPath -PathType Container){ - $x = Join-Path -Path $testFolderPath -ChildPath 'xunit.runner.json'; - if (Test-Path $x -PathType Leaf) { - $testFolders += $testFolderPath - } - } - } } -# run tests first -foreach($testFolder in $testFolders){ - Write-Output "" - Write-Output "--------" - Write-Output "testing : $testFolder" - Write-Output "--------" - Set-Location $testFolder - exec { & dotnet test --configuration $config --filter "TestType=Unit" } - Set-Location $rootDir -} +exec { & dotnet test --configuration $config --filter "TestType=Unit" } + # package src projects foreach($srcFolder in $projectFolders){ diff --git a/src/NullDesk.Extensions.Mailer.Core/NullDesk.Extensions.Mailer.Core.csproj b/src/NullDesk.Extensions.Mailer.Core/NullDesk.Extensions.Mailer.Core.csproj index 048c2b0..848f109 100644 --- a/src/NullDesk.Extensions.Mailer.Core/NullDesk.Extensions.Mailer.Core.csproj +++ b/src/NullDesk.Extensions.Mailer.Core/NullDesk.Extensions.Mailer.Core.csproj @@ -1,7 +1,7 @@  NullDesk Mailer Extensions base classes and abstractions for email messaging services - 5.1.3 + 5.1.4 Stephen M. Redd netstandard2.0 true @@ -20,6 +20,7 @@ false Stephen M. Redd 2017 true + snupkg diff --git a/src/NullDesk.Extensions.Mailer.History.EntityFramework.SqlServer/NullDesk.Extensions.Mailer.History.EntityFramework.SqlServer.csproj b/src/NullDesk.Extensions.Mailer.History.EntityFramework.SqlServer/NullDesk.Extensions.Mailer.History.EntityFramework.SqlServer.csproj index 0ebe55e..6df9f58 100644 --- a/src/NullDesk.Extensions.Mailer.History.EntityFramework.SqlServer/NullDesk.Extensions.Mailer.History.EntityFramework.SqlServer.csproj +++ b/src/NullDesk.Extensions.Mailer.History.EntityFramework.SqlServer/NullDesk.Extensions.Mailer.History.EntityFramework.SqlServer.csproj @@ -1,7 +1,7 @@  NullDesk Mailer Extension for SQL Server email messsage and delivery history storage using EntityFramework Core - 5.1.3 + 5.1.4 Stephen M. Redd netstandard2.0 true @@ -20,6 +20,7 @@ false Stephen M. Redd 2017 true + snupkg diff --git a/src/NullDesk.Extensions.Mailer.History.EntityFramework/NullDesk.Extensions.Mailer.History.EntityFramework.csproj b/src/NullDesk.Extensions.Mailer.History.EntityFramework/NullDesk.Extensions.Mailer.History.EntityFramework.csproj index e18a507..0b25ad8 100644 --- a/src/NullDesk.Extensions.Mailer.History.EntityFramework/NullDesk.Extensions.Mailer.History.EntityFramework.csproj +++ b/src/NullDesk.Extensions.Mailer.History.EntityFramework/NullDesk.Extensions.Mailer.History.EntityFramework.csproj @@ -1,7 +1,7 @@  NullDesk Mailer Extensions base implementation of messsage and delivery history storage with EntityFramework Core. - 5.1.3 + 5.1.4 Stephen M. Redd netstandard2.0 true @@ -20,6 +20,7 @@ false Stephen M. Redd 2017 true + snupkg diff --git a/src/NullDesk.Extensions.Mailer.MailKit/NullDesk.Extensions.Mailer.MailKit.csproj b/src/NullDesk.Extensions.Mailer.MailKit/NullDesk.Extensions.Mailer.MailKit.csproj index 3765e5d..b5177db 100644 --- a/src/NullDesk.Extensions.Mailer.MailKit/NullDesk.Extensions.Mailer.MailKit.csproj +++ b/src/NullDesk.Extensions.Mailer.MailKit/NullDesk.Extensions.Mailer.MailKit.csproj @@ -1,7 +1,7 @@  NullDesk Mailer Extensions for SMTP Email messaging using MailKit - 5.1.3 + 5.1.4 Stephen M. Redd netstandard2.0 true @@ -20,6 +20,7 @@ false Stephen M. Redd 2017 true + snupkg diff --git a/src/NullDesk.Extensions.Mailer.SendGrid/NullDesk.Extensions.Mailer.SendGrid.csproj b/src/NullDesk.Extensions.Mailer.SendGrid/NullDesk.Extensions.Mailer.SendGrid.csproj index a531065..c9051f9 100644 --- a/src/NullDesk.Extensions.Mailer.SendGrid/NullDesk.Extensions.Mailer.SendGrid.csproj +++ b/src/NullDesk.Extensions.Mailer.SendGrid/NullDesk.Extensions.Mailer.SendGrid.csproj @@ -1,7 +1,7 @@  NullDesk Mailer Extensions for Email messaging using SendGrid API services - 5.1.3 + 5.1.4 Stephen M. Redd netstandard2.0 true @@ -20,6 +20,7 @@ false Stephen M. Redd 2017 true + snupkg