From da826d6d7e1cf79eb79798f634f12a43580ec69e Mon Sep 17 00:00:00 2001 From: Jeavon Date: Tue, 21 Nov 2017 18:17:38 +0000 Subject: [PATCH 1/6] Bump --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5a79d0a..e39a30d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.1.{build} +version: 1.0.2.{build} os: Visual Studio 2017 From bfd7658df3018ac6f26edbd61c6709185b251287 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Tue, 21 Nov 2017 18:26:40 +0000 Subject: [PATCH 2/6] Add deployment for GitHub and NuGet for tagged builds on master branch --- appveyor.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e39a30d..a3e2b2f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -48,4 +48,25 @@ deploy: secure: SASQGWG/4zNns7bwSSsJ5RPvKcKfJsBeEPuw69wsVPA3PO739QmzVtc5VwQwgvbr artifact: /.*\.nupkg/ on: - branch: develop \ No newline at end of file + branch: develop + + # GitHub Deployment for releases + - provider: GitHub + auth_token: + secure: c0LwOGqoFZIieyy8CHrUtYQOD0HL0rG5tV2DS+8FHv34BKs/LSGGtmWWep5O7GbV + artifact: /.*\.zip/ # upload all Zip packages to release assets + draft: false + prerelease: false + on: + branch: master + appveyor_repo_tag: true # deploy on tag push only + + # NuGet Deployment for releases + - provider: NuGet + server: + api_key: + secure: adk3pI9HCByZg2VRxplX9UR6qHf97bA3as6dusxLswCKI8BQQE8DO5a0frLrI+EO + artifact: /.*\.nupkg/ + on: + branch: master + appveyor_repo_tag: true \ No newline at end of file From ab46dabab3e282b8a878a56dd22bc3b28a1f37f4 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Wed, 21 Feb 2018 16:02:50 +0000 Subject: [PATCH 3/6] Seems i need this now? --- .gitignore | 2 +- build-appveyor.cmd | 3 ++- build.cmd | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fe4fa4d..fd8ea3f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ #VS 2015 hidden folder .vs/* -build/tools/vswhere.2.0.2 +build/tools/vswhere.2.3.2 build/tools/vswhere.exe # User-specific files diff --git a/build-appveyor.cmd b/build-appveyor.cmd index a054517..61428bc 100644 --- a/build-appveyor.cmd +++ b/build-appveyor.cmd @@ -2,6 +2,7 @@ ECHO APPVEYOR_REPO_BRANCH: %APPVEYOR_REPO_BRANCH% ECHO APPVEYOR_REPO_TAG: %APPVEYOR_REPO_TAG% ECHO APPVEYOR_BUILD_NUMBER : %APPVEYOR_BUILD_NUMBER% ECHO APPVEYOR_BUILD_VERSION : %APPVEYOR_BUILD_VERSION% +ECHO CONFIGURATION : %BCONFIGURATION% CALL NuGet restore Our.Umbraco.HCSlackNM.sln @@ -14,7 +15,7 @@ IF NOT EXIST "%toolsFolder%" ( IF NOT EXIST "%toolsFolder%vswhere.exe" ( ECHO vswhere not found - fetching now - nuget install vswhere -Version 2.2.11 -Source nuget.org -OutputDirectory tools + nuget install vswhere -Version 2.3.2 -Source nuget.org -OutputDirectory tools ) FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A\" diff --git a/build.cmd b/build.cmd index cdcffa9..c543828 100644 --- a/build.cmd +++ b/build.cmd @@ -15,6 +15,8 @@ if "%PACKAGE_VERISON%" == "" ( SET APPVEYOR_BUILD_VERSION=%PACKAGE_VERISON%.%APPVEYOR_BUILD_NUMBER% +SET CONFIGURATION=Debug + build-appveyor.cmd @IF %ERRORLEVEL% NEQ 0 GOTO err From aae93eccbef8c4584a257e994261314678353aca Mon Sep 17 00:00:00 2001 From: Jeavon Date: Wed, 21 Feb 2018 16:21:53 +0000 Subject: [PATCH 4/6] Fix local build --- build-appveyor.cmd | 2 +- build.cmd | 2 +- build/HCSlackNM.proj | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-appveyor.cmd b/build-appveyor.cmd index 61428bc..5e89002 100644 --- a/build-appveyor.cmd +++ b/build-appveyor.cmd @@ -2,7 +2,7 @@ ECHO APPVEYOR_REPO_BRANCH: %APPVEYOR_REPO_BRANCH% ECHO APPVEYOR_REPO_TAG: %APPVEYOR_REPO_TAG% ECHO APPVEYOR_BUILD_NUMBER : %APPVEYOR_BUILD_NUMBER% ECHO APPVEYOR_BUILD_VERSION : %APPVEYOR_BUILD_VERSION% -ECHO CONFIGURATION : %BCONFIGURATION% +ECHO CONFIGURATION : %CONFIGURATION% CALL NuGet restore Our.Umbraco.HCSlackNM.sln diff --git a/build.cmd b/build.cmd index c543828..03b787e 100644 --- a/build.cmd +++ b/build.cmd @@ -13,7 +13,7 @@ if "%PACKAGE_VERISON%" == "" ( SET PACKAGE_VERISON=0.1.0 ) -SET APPVEYOR_BUILD_VERSION=%PACKAGE_VERISON%.%APPVEYOR_BUILD_NUMBER% +SET mssemver=%PACKAGE_VERISON%.%APPVEYOR_BUILD_NUMBER% SET CONFIGURATION=Debug diff --git a/build/HCSlackNM.proj b/build/HCSlackNM.proj index d2cbde0..fe6b606 100644 --- a/build/HCSlackNM.proj +++ b/build/HCSlackNM.proj @@ -38,7 +38,7 @@ - $(APPVEYOR_BUILD_VERSION) + $(mssemver) @@ -122,7 +122,7 @@ WorkingDirectory="$(BuildUmbDir)" MinimumRequiredUmbracoVersion="$(MinUmbracoVersion)" PackageName="$(PackageName)" - PackageVersion="$(mssemver)" + PackageVersion="$(FileVersion)" AuthorName="$(AuthorName)" AuthorUrl="$(AuthorUrl)" Readme="$(Readme)" @@ -144,7 +144,7 @@ Title="$(PackageName)" Description="$(Description)" Summary="$(Readme)" - Version="$(mssemver)" + Version="$(FileVersion)" MinimumRequiredUmbracoVersion ="$(MinUmbracoVersion)" Authors="$(AuthorName)" Owners="$(Owners)" @@ -173,7 +173,7 @@ From d5015bac6beb59dbfb1dea6f750a8775a6ed6c68 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Tue, 3 Apr 2018 17:17:05 +0100 Subject: [PATCH 5/6] Updating to Slack WebHooks RTM --- appveyor.yml | 2 +- build/HCSlackNM.proj | 2 +- build/package.nuspec | 2 +- .../Our.Umbraco.HCSlackNM.csproj | 12 +++--------- src/Our.Umbraco.HCSlackNM/packages.config | 6 ++---- src/TestSite/TestSite.csproj | 12 +++--------- src/TestSite/packages.config | 6 ++---- 7 files changed, 13 insertions(+), 29 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a3e2b2f..32fed8e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.2.{build} +version: 1.1.0.{build} os: Visual Studio 2017 diff --git a/build/HCSlackNM.proj b/build/HCSlackNM.proj index fe6b606..a002787 100644 --- a/build/HCSlackNM.proj +++ b/build/HCSlackNM.proj @@ -83,7 +83,7 @@ - + diff --git a/build/package.nuspec b/build/package.nuspec index 937bccc..56cb752 100644 --- a/build/package.nuspec +++ b/build/package.nuspec @@ -17,7 +17,7 @@ - + \ No newline at end of file diff --git a/src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj b/src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj index 283201c..41979ec 100644 --- a/src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj +++ b/src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj @@ -125,22 +125,16 @@ ..\..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll - ..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll ..\..\packages\Owin.1.0\lib\net40\Owin.dll - - ..\..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll - ..\..\packages\semver.1.1.2\lib\net45\Semver.dll - - ..\..\packages\ServiceStack.Text.3.9.71\lib\net35\ServiceStack.Text.dll - - - ..\..\packages\Slack.Webhooks.0.1.8\lib\net40\Slack.Webhooks.dll + + ..\..\packages\Slack.Webhooks.1.0.3\lib\net45\Slack.Webhooks.dll ..\..\packages\UmbracoCms.Core.7.7.0\lib\net45\SQLCE4Umbraco.dll diff --git a/src/Our.Umbraco.HCSlackNM/packages.config b/src/Our.Umbraco.HCSlackNM/packages.config index ab04e4c..26fd4ac 100644 --- a/src/Our.Umbraco.HCSlackNM/packages.config +++ b/src/Our.Umbraco.HCSlackNM/packages.config @@ -30,13 +30,11 @@ - + - - - + diff --git a/src/TestSite/TestSite.csproj b/src/TestSite/TestSite.csproj index ab9fb1c..4eb327a 100644 --- a/src/TestSite/TestSite.csproj +++ b/src/TestSite/TestSite.csproj @@ -150,22 +150,16 @@ ..\..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll - ..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll ..\..\packages\Owin.1.0\lib\net40\Owin.dll - - ..\..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll - ..\..\packages\semver.1.1.2\lib\net45\Semver.dll - - ..\..\packages\ServiceStack.Text.3.9.71\lib\net35\ServiceStack.Text.dll - - - ..\..\packages\Slack.Webhooks.0.1.8\lib\net40\Slack.Webhooks.dll + + ..\..\packages\Slack.Webhooks.1.0.3\lib\net45\Slack.Webhooks.dll ..\..\packages\UmbracoCms.Core.7.7.0\lib\net45\SQLCE4Umbraco.dll diff --git a/src/TestSite/packages.config b/src/TestSite/packages.config index 177cfcd..0a06c85 100644 --- a/src/TestSite/packages.config +++ b/src/TestSite/packages.config @@ -36,13 +36,11 @@ - + - - - + From f15ee98bc0c517ac24865f9616e8c26f229f37a8 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Tue, 3 Apr 2018 17:19:54 +0100 Subject: [PATCH 6/6] Need to include Newtonsoft.Json in Umbraco package now as v10.0.3 is required by Slack Webhooks --- build/HCSlackNM.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/HCSlackNM.proj b/build/HCSlackNM.proj index a002787..650040d 100644 --- a/build/HCSlackNM.proj +++ b/build/HCSlackNM.proj @@ -83,7 +83,7 @@ - +