From 6cb4779bbd19dac7b86f23bb69f0cb2d9c46776e Mon Sep 17 00:00:00 2001 From: Jeavon Date: Fri, 6 Oct 2017 09:16:12 +0100 Subject: [PATCH 01/12] Add link to Slack Incoming Webhook in readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b40ea76..da64937 100644 --- a/README.md +++ b/README.md @@ -19,5 +19,7 @@ Both NuGet and Umbraco packages are available. Once installed you will need to **add your settings into the HealthChecks.config** file found in the config folder +You will need to create a [Slack Incoming Webhook](https://my.slack.com/services/new/incoming-webhook/) and copy the Webhook URL to the config file. + ![Exmaple](docs/example.png) From a741e9c1ec13355c9247b899d05f9107220b33b5 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 20 Nov 2017 10:22:11 +0000 Subject: [PATCH 02/12] Update Slack.Webhooks to v0.1.8 --- src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj | 4 ++-- src/Our.Umbraco.HCSlackNM/packages.config | 2 +- src/TestSite/TestSite.csproj | 4 ++-- src/TestSite/packages.config | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj b/src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj index ea2f83c..3341475 100644 --- a/src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj +++ b/src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj @@ -139,8 +139,8 @@ ..\..\packages\ServiceStack.Text.3.9.71\lib\net35\ServiceStack.Text.dll - - ..\..\packages\Slack.Webhooks.0.1.7\lib\net40\Slack.Webhooks.dll + + ..\..\packages\Slack.Webhooks.0.1.8\lib\net40\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 8c3828d..ab04e4c 100644 --- a/src/Our.Umbraco.HCSlackNM/packages.config +++ b/src/Our.Umbraco.HCSlackNM/packages.config @@ -36,7 +36,7 @@ - + diff --git a/src/TestSite/TestSite.csproj b/src/TestSite/TestSite.csproj index 2f82ec5..ab9fb1c 100644 --- a/src/TestSite/TestSite.csproj +++ b/src/TestSite/TestSite.csproj @@ -164,8 +164,8 @@ ..\..\packages\ServiceStack.Text.3.9.71\lib\net35\ServiceStack.Text.dll - - ..\..\packages\Slack.Webhooks.0.1.7\lib\net40\Slack.Webhooks.dll + + ..\..\packages\Slack.Webhooks.0.1.8\lib\net40\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 4e381d9..177cfcd 100644 --- a/src/TestSite/packages.config +++ b/src/TestSite/packages.config @@ -42,7 +42,7 @@ - + From 7f65b23c4c486bdf5f6d67a9d0effec7c2e32295 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 20 Nov 2017 10:35:58 +0000 Subject: [PATCH 03/12] Pushing pre-release to MyGet --- appveyor.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index be83d57..adc2825 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,4 +24,15 @@ build_script: artifacts: - path: artifacts\*.nupkg - - path: artifacts\*.zip \ No newline at end of file + - path: artifacts\*.zip + + deploy: + # Umbraco MyGet community feed + - provider: NuGet + server: https://www.myget.org/F/umbraco-packages/api/v2/package + symbol_server: https://www.myget.org/F/umbraco-packages/symbols/api/v2/package + api_key: + secure: SASQGWG/4zNns7bwSSsJ5RPvKcKfJsBeEPuw69wsVPA3PO739QmzVtc5VwQwgvbr + artifact: /.*\.nupkg/ + on: + branch: develop \ No newline at end of file From 098d23aa98e3a3b819ec66d592c41383bbd153ea Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 20 Nov 2017 10:36:54 +0000 Subject: [PATCH 04/12] Update nuspec --- build/package.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package.nuspec b/build/package.nuspec index 3aed622..937bccc 100644 --- a/build/package.nuspec +++ b/build/package.nuspec @@ -17,7 +17,7 @@ - + \ No newline at end of file From e01eb630ba199b02235abcd125c2443a7522999a Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 20 Nov 2017 10:37:48 +0000 Subject: [PATCH 05/12] Fix yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index adc2825..d84ae23 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,8 +26,8 @@ artifacts: - path: artifacts\*.nupkg - path: artifacts\*.zip - deploy: - # Umbraco MyGet community feed +deploy: + # Umbraco MyGet community feed - provider: NuGet server: https://www.myget.org/F/umbraco-packages/api/v2/package symbol_server: https://www.myget.org/F/umbraco-packages/symbols/api/v2/package From 90f3b350dba1cbd2e4438dbd8458692ae45bd295 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 20 Nov 2017 10:43:36 +0000 Subject: [PATCH 06/12] Bump --- README.md | 1 + appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index da64937..4c43bf1 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ Both NuGet and Umbraco packages are available. |NuGet Packages |Version | |:-----------------|:-----------------| |**Release**|[![NuGet download](http://img.shields.io/nuget/v/Our.Umbraco.HealthCheckSlackNotificationMethod.svg)](https://www.nuget.org/packages/Our.Umbraco.HealthCheckSlackNotificationMethod/) +|**Pre-release**|[![NuGet download](https://img.shields.io/myget/umbraco-packages/vpre/Our.Umbraco.HealthCheckSlackNotificationMethod.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/Our.Umbraco.HealthCheckSlackNotificationMethod/) |Umbraco Packages | | |:-----------------|:-----------------| diff --git a/appveyor.yml b/appveyor.yml index d84ae23..bb48683 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ os: Visual Studio 2017 # Version format -version: 1.0.0.{build} +version: 1.0.1.{build} cache: - packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified From b5dac35995202c1d270c38b81465305841c3bc0d Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 20 Nov 2017 11:10:06 +0000 Subject: [PATCH 07/12] Beginning to rework the AppVeyor build process --- Our.Umbraco.HCSlackNM.sln | 7 +++- appveyor.yml | 18 ++++++++-- build.cmd | 2 +- build/HCSlackNM.proj | 30 ++--------------- build/appveyor-semver.ps1 | 24 ++++++++++++++ build/check-release-version.ps1 | 58 +++++++++++++++++++++++++++++++++ 6 files changed, 108 insertions(+), 31 deletions(-) create mode 100644 build/appveyor-semver.ps1 create mode 100644 build/check-release-version.ps1 diff --git a/Our.Umbraco.HCSlackNM.sln b/Our.Umbraco.HCSlackNM.sln index 1ba4f39..505c2f6 100644 --- a/Our.Umbraco.HCSlackNM.sln +++ b/Our.Umbraco.HCSlackNM.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.16 +VisualStudioVersion = 15.0.27004.2008 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Our.Umbraco.HCSlackNM", "src\Our.Umbraco.HCSlackNM\Our.Umbraco.HCSlackNM.csproj", "{020C131C-CB5F-4DAB-85B9-A387F2427421}" EndProject @@ -9,9 +9,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSite", "src\TestSite\Te EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{470FA32D-9976-47CA-AD4F-EC414A18043F}" ProjectSection(SolutionItems) = preProject + build\appveyor-semver.ps1 = build\appveyor-semver.ps1 appveyor.yml = appveyor.yml build-appveyor.cmd = build-appveyor.cmd build.cmd = build.cmd + build\check-release-version.ps1 = build\check-release-version.ps1 build\HCSlackNM.proj = build\HCSlackNM.proj build\package.nuspec = build\package.nuspec build\package.proj = build\package.proj @@ -52,4 +54,7 @@ Global GlobalSection(NestedProjects) = preSolution {E26FE0B6-B4B4-4EF1-BABC-8F6B83587D9C} = {470FA32D-9976-47CA-AD4F-EC414A18043F} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2DACFE0A-F699-4F73-BDBA-9FC86ADB358A} + EndGlobalSection EndGlobal diff --git a/appveyor.yml b/appveyor.yml index bb48683..dbea183 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,11 +10,25 @@ branches: only: - develop - master + - feature/buildRework # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta -init: - - set UMBRACO_PACKAGE_PRERELEASE_SUFFIX= +environment: + # Version Suffix + version_suffix: alpha + +install: + - ps: .\build\appveyor-semver.ps1 + - ps: .\build\check-release-version.ps1 + - ps: Update-AppveyorBuild -Version $Env:appveyor_version + +assembly_info: + patch: true + file: 'src\Our.Umbraco.HCSlackNM**\AssemblyInfo.*' + assembly_version: '$(appveyor_file_version)' + assembly_file_version: '$(appveyor_file_version)' + assembly_informational_version: '$(mssemver)' build_script: - cmd: >- diff --git a/build.cmd b/build.cmd index 46c4c5d..cdcffa9 100644 --- a/build.cmd +++ b/build.cmd @@ -2,7 +2,7 @@ ECHO off SET /P APPVEYOR_BUILD_NUMBER=Please enter a build number (e.g. 134): SET /P PACKAGE_VERISON=Please enter your package version (e.g. 1.0.5): -SET /P UMBRACO_PACKAGE_PRERELEASE_SUFFIX=Please enter your package release suffix or leave empty (e.g. beta): +SET /P version_suffix=Please enter your package release suffix or leave empty (e.g. beta): SET /P APPVEYOR_REPO_TAG=If you want to simulate a GitHub tag for a release (e.g. true): diff --git a/build/HCSlackNM.proj b/build/HCSlackNM.proj index f77dcfb..de995a9 100644 --- a/build/HCSlackNM.proj +++ b/build/HCSlackNM.proj @@ -6,13 +6,11 @@ $(MSBuildProjectDirectory)\tools\MSBuildCommunityTasks $(MSBuildProjectDirectory)\tools\MSBuildUmbracoTasks $(MSBuildProjectDirectory)\tools\MSBuildNugetTasks - $(MSBuildProjectDirectory)\tools\AppVeyorUmbraco - @@ -42,21 +40,9 @@ $(APPVEYOR_BUILD_VERSION) - - - - false - - - - - true - - - - + true @@ -83,10 +69,7 @@ - - - - + @@ -99,15 +82,8 @@ - - - - - - - - + diff --git a/build/appveyor-semver.ps1 b/build/appveyor-semver.ps1 new file mode 100644 index 0000000..c742d63 --- /dev/null +++ b/build/appveyor-semver.ps1 @@ -0,0 +1,24 @@ +$version=[Version]$Env:APPVEYOR_BUILD_VERSION +$version_suffix=$Env:version_suffix + +$basever=$version.Major.ToString() + "." + $version.Minor.ToString() + "." + $version.Build.ToString() + +$paddedRevision = $version.Revision.ToString().PadLeft(6,"0") + +$semver = $basever + "-" + $version_suffix + "." + $version.Revision.ToString() +$mssemver = $basever + "-" + $version_suffix + "-" + $paddedRevision +$appveyor_version = $mssemver + +$Env:semver = $semver +$Env:mssemver = $mssemver +$Env:appveyor_version = $appveyor_version + +$Env:appveyor_file_version = $Env:APPVEYOR_BUILD_VERSION + +$Env:ms_file_version = $version.ToString() +$Env:padded_build_revision = $paddedRevision + +"Envrionment variable 'semver' set:" + $Env:semver +"Envrionment variable 'mssemver' set:" + $Env:mssemver +"Envrionment variable 'appveyor_version' set:" + $Env:appveyor_version +"Envrionment variable 'padded_build_revision' set:" + $Env:padded_build_revision \ No newline at end of file diff --git a/build/check-release-version.ps1 b/build/check-release-version.ps1 new file mode 100644 index 0000000..4cffc73 --- /dev/null +++ b/build/check-release-version.ps1 @@ -0,0 +1,58 @@ +$tagged=$Env:APPVEYOR_REPO_TAG +$tag_name=$Env:APPVEYOR_REPO_TAG_NAME +$version=[Version]$Env:APPVEYOR_BUILD_VERSION + +$Env:tagged_release_build = "false" + +#$tagged="true" +#$tag_name="v2.1.2-beta" +#$version=[Version]"2.1.2.12" + +$has_suffix = "false" +$suffix = "" + +"APPVEYOR_REPO_TAG:" + $tagged +"APPVEYOR_REPO_TAG_NAME:" + $tag_name + +If ($tagged -eq "true" -and $tag_name.StartsWith("v")){ + + # This is to cut out the beta etc + if ($tag_name.Contains("-")){ + $has_suffix = "true" + $index = $tag_name.indexof("-"); + $suffix = $tag_name.Substring($index + 1, $tag_name.Length - ($index + 1)) + $tag_name = $tag_name.Substring(0, $index) + } + + $tagged_version=[Version]$tag_name.Substring(1) + + if ($tagged_version.Major -eq $version.Major -and $tagged_version.Minor -eq $version.Minor -and $tagged_version.Build -eq $version.Build){ + "** THIS IS A TAGGED RELEASE BUILD:" + $tagged_version.ToString() + " **" + + $Env:tagged_release_build = "true" + + $basever=$tagged_version.Major.ToString() + "." + $tagged_version.Minor.ToString() + "." + $tagged_version.Build.ToString() + + if ($has_suffix -eq "true"){ + $Env:version_suffix = $suffix + + $Env:mssemver = $basever + "-" + $suffix + $Env:appveyor_version = $basever + "-" + $suffix + $Env:semver = $basever + "-" + $suffix + } Else { + $Env:mssemver = $basever + $Env:appveyor_version = $basever + $Env:semver = $basever + } + + "Envrionment variable 'semver' set:" + $Env:semver + "Envrionment variable 'mssemver' set:" + $Env:mssemver + "Envrionment variable 'appveyor_version' set:" + $Env:appveyor_version + + $Env:artifact_name = $Env:artifact_name_prefix + '.' + $Env:mssemver + '.zip' + + }Else{ + "** Naughty, naughty, very naughty, tagged version: " + $tagged_version.ToString() + " doesn't match build version:" + $version.ToString() + " **" + $host.SetShouldExit(1) + } +} \ No newline at end of file From cfa4526d6cb7f62f4fb3497eff59c6ea51022cf8 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 20 Nov 2017 11:14:28 +0000 Subject: [PATCH 08/12] Fix ProductVersion --- build/HCSlackNM.proj | 6 +++--- .../Properties/AssemblyInfo.cs | 5 +++-- .../Our.Umbraco.HCSlackNM.csproj | 1 - .../Properties/AssemblyInfo.cs | 3 +++ src/Our.Umbraco.HCSlackNM/Properties/VersionInfo.cs | 13 ------------- 5 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 src/Our.Umbraco.HCSlackNM/Properties/VersionInfo.cs diff --git a/build/HCSlackNM.proj b/build/HCSlackNM.proj index de995a9..89d2fe6 100644 --- a/build/HCSlackNM.proj +++ b/build/HCSlackNM.proj @@ -140,7 +140,7 @@ WorkingDirectory="$(BuildUmbDir)" MinimumRequiredUmbracoVersion="$(MinUmbracoVersion)" PackageName="$(PackageName)" - PackageVersion="$(ProductVersion)" + PackageVersion="$(mssemver)" AuthorName="$(AuthorName)" AuthorUrl="$(AuthorUrl)" Readme="$(Readme)" @@ -162,7 +162,7 @@ Title="$(PackageName)" Description="$(Description)" Summary="$(Readme)" - Version="$(ProductVersion)" + Version="$(mssemver)" MinimumRequiredUmbracoVersion ="$(MinUmbracoVersion)" Authors="$(AuthorName)" Owners="$(Owners)" @@ -191,7 +191,7 @@ diff --git a/src/Our.Umbraco.HCSlackNM.Installer/Properties/AssemblyInfo.cs b/src/Our.Umbraco.HCSlackNM.Installer/Properties/AssemblyInfo.cs index 4302931..f3a0bba 100644 --- a/src/Our.Umbraco.HCSlackNM.Installer/Properties/AssemblyInfo.cs +++ b/src/Our.Umbraco.HCSlackNM.Installer/Properties/AssemblyInfo.cs @@ -32,5 +32,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("0.0.1.1")] +[assembly: AssemblyFileVersion("0.0.1.1")] +[assembly: AssemblyInformationalVersion("0.0.1.1-alpha-000001")] \ 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 3341475..283201c 100644 --- a/src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj +++ b/src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj @@ -219,7 +219,6 @@ - diff --git a/src/Our.Umbraco.HCSlackNM/Properties/AssemblyInfo.cs b/src/Our.Umbraco.HCSlackNM/Properties/AssemblyInfo.cs index b806ede..a0a56ba 100644 --- a/src/Our.Umbraco.HCSlackNM/Properties/AssemblyInfo.cs +++ b/src/Our.Umbraco.HCSlackNM/Properties/AssemblyInfo.cs @@ -32,3 +32,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("0.0.1.1")] +[assembly: AssemblyFileVersion("0.0.1.1")] +[assembly: AssemblyInformationalVersion("0.0.1.1-alpha-000001")] \ No newline at end of file diff --git a/src/Our.Umbraco.HCSlackNM/Properties/VersionInfo.cs b/src/Our.Umbraco.HCSlackNM/Properties/VersionInfo.cs deleted file mode 100644 index 8524f81..0000000 --- a/src/Our.Umbraco.HCSlackNM/Properties/VersionInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Reflection; - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// - -[assembly: AssemblyVersion("2.0.0.123")] -[assembly: AssemblyFileVersion("2.0.0.123")] -[assembly: AssemblyInformationalVersion("2.0.0-alpha-000123")] \ No newline at end of file From ea4a8ee8e7f91ca489ade03094c131e6ff47c4c3 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 20 Nov 2017 11:27:56 +0000 Subject: [PATCH 09/12] Do away with the rtm tag --- appveyor.yml | 2 -- build/HCSlackNM.proj | 21 +-------------------- build/check-release-version.ps1 | 4 +++- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index dbea183..e998e9b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,8 +12,6 @@ branches: - master - feature/buildRework -# UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha -# example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta environment: # Version Suffix version_suffix: alpha diff --git a/build/HCSlackNM.proj b/build/HCSlackNM.proj index 89d2fe6..a1a2b26 100644 --- a/build/HCSlackNM.proj +++ b/build/HCSlackNM.proj @@ -41,19 +41,6 @@ $(APPVEYOR_BUILD_VERSION) - - - - true - - - - - false - - - - Release @@ -64,16 +51,10 @@ $(RootDir)\artifacts $(RootDir)\src\Our.Umbraco.HCSlackNM $(RootDir)\src\Our.Umbraco.HCSlackNM.Installer - - - - - - - + diff --git a/build/check-release-version.ps1 b/build/check-release-version.ps1 index 4cffc73..511411d 100644 --- a/build/check-release-version.ps1 +++ b/build/check-release-version.ps1 @@ -1,6 +1,7 @@ $tagged=$Env:APPVEYOR_REPO_TAG $tag_name=$Env:APPVEYOR_REPO_TAG_NAME $version=[Version]$Env:APPVEYOR_BUILD_VERSION +$branch=$Env:APPVEYOR_REPO_BRANCH $Env:tagged_release_build = "false" @@ -14,7 +15,7 @@ $suffix = "" "APPVEYOR_REPO_TAG:" + $tagged "APPVEYOR_REPO_TAG_NAME:" + $tag_name -If ($tagged -eq "true" -and $tag_name.StartsWith("v")){ +If ($tagged -eq "true" -and $tag_name.StartsWith("v") -and $branch -eq "master"){ # This is to cut out the beta etc if ($tag_name.Contains("-")){ @@ -53,6 +54,7 @@ If ($tagged -eq "true" -and $tag_name.StartsWith("v")){ }Else{ "** Naughty, naughty, very naughty, tagged version: " + $tagged_version.ToString() + " doesn't match build version:" + $version.ToString() + " **" + "** If this was intentional you should manually bump the version in appveyor.yml **" $host.SetShouldExit(1) } } \ No newline at end of file From 167f1130e6a86ecb703d38ab77587e808ce1be7b Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 20 Nov 2017 11:29:26 +0000 Subject: [PATCH 10/12] Update VsWhere version --- build-appveyor.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-appveyor.cmd b/build-appveyor.cmd index 1933ac9..a054517 100644 --- a/build-appveyor.cmd +++ b/build-appveyor.cmd @@ -14,14 +14,14 @@ IF NOT EXIST "%toolsFolder%" ( IF NOT EXIST "%toolsFolder%vswhere.exe" ( ECHO vswhere not found - fetching now - nuget install vswhere -Version 2.0.2 -Source nuget.org -OutputDirectory tools + nuget install vswhere -Version 2.2.11 -Source nuget.org -OutputDirectory tools ) FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A\" MOVE "%vswhereExePath%tools\vswhere.exe" "%toolsFolder%vswhere.exe" for /f "usebackq tokens=1* delims=: " %%i in (`"%CD%\tools\vswhere.exe" -latest -requires Microsoft.Component.MSBuild`) do ( - if /i "%%i"=="installationPath" set InstallDir=%%j + if /i "%%i"=="installationPath" set InstallDir=%%j ) SET VSWherePath="%InstallDir%\MSBuild" From 9a634380388458867eb47a681246d813fc6bf1da Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 20 Nov 2017 11:35:06 +0000 Subject: [PATCH 11/12] Moving Build config to AppVeyor --- appveyor.yml | 9 ++-- build/HCSlackNM.proj | 3 +- .../AppVeyorUmbraco/AppVeyorUmbraco.Targets | 49 ------------------- 3 files changed, 7 insertions(+), 54 deletions(-) delete mode 100644 build/tools/AppVeyorUmbraco/AppVeyorUmbraco.Targets diff --git a/appveyor.yml b/appveyor.yml index e998e9b..5a79d0a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,11 @@ -os: Visual Studio 2017 - -# Version format version: 1.0.1.{build} +os: Visual Studio 2017 + cache: - - packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified + - packages -> src\**\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified + +configuration: Release branches: only: diff --git a/build/HCSlackNM.proj b/build/HCSlackNM.proj index a1a2b26..d2cbde0 100644 --- a/build/HCSlackNM.proj +++ b/build/HCSlackNM.proj @@ -43,7 +43,7 @@ - Release + $(CONFIGURATION) $(MSBuildProjectDirectory)\.. $(MSBuildProjectDirectory)\_temp $(BuildDir)\_umbraco @@ -51,6 +51,7 @@ $(RootDir)\artifacts $(RootDir)\src\Our.Umbraco.HCSlackNM $(RootDir)\src\Our.Umbraco.HCSlackNM.Installer + diff --git a/build/tools/AppVeyorUmbraco/AppVeyorUmbraco.Targets b/build/tools/AppVeyorUmbraco/AppVeyorUmbraco.Targets deleted file mode 100644 index 67be406..0000000 --- a/build/tools/AppVeyorUmbraco/AppVeyorUmbraco.Targets +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file From 582a8d13df4533e54168246ed73548e11e09e4a5 Mon Sep 17 00:00:00 2001 From: Jeavon Date: Mon, 20 Nov 2017 11:39:42 +0000 Subject: [PATCH 12/12] Remove artifact name --- build/check-release-version.ps1 | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/check-release-version.ps1 b/build/check-release-version.ps1 index 511411d..f510e13 100644 --- a/build/check-release-version.ps1 +++ b/build/check-release-version.ps1 @@ -49,9 +49,6 @@ If ($tagged -eq "true" -and $tag_name.StartsWith("v") -and $branch -eq "master") "Envrionment variable 'semver' set:" + $Env:semver "Envrionment variable 'mssemver' set:" + $Env:mssemver "Envrionment variable 'appveyor_version' set:" + $Env:appveyor_version - - $Env:artifact_name = $Env:artifact_name_prefix + '.' + $Env:mssemver + '.zip' - }Else{ "** Naughty, naughty, very naughty, tagged version: " + $tagged_version.ToString() + " doesn't match build version:" + $version.ToString() + " **" "** If this was intentional you should manually bump the version in appveyor.yml **"