Merge branch 'develop'

CrumpledDog · Apr 10, 2018 · 9d8d7fd · 9d8d7fd
2 parents 35f5cf6 + f15ee98
commit 9d8d7fd
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 37 deletions.
diff --git 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/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.0.1.{build}
+version: 1.1.0.{build}
 
 os: Visual Studio 2017
 
@@ -48,4 +48,25 @@ deploy:
       secure: SASQGWG/4zNns7bwSSsJ5RPvKcKfJsBeEPuw69wsVPA3PO739QmzVtc5VwQwgvbr
     artifact: /.*\.nupkg/
     on:
-      branch: develop
+      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
diff --git 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 : %CONFIGURATION%
 
 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
@@ -13,7 +13,9 @@ 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
 
 build-appveyor.cmd
 

diff --git a/build/HCSlackNM.proj b/build/HCSlackNM.proj
@@ -38,7 +38,7 @@
 
   <!-- APPVEYOR PROPERTIES -->
   <PropertyGroup>
-    <FileVersion>$(APPVEYOR_BUILD_VERSION)</FileVersion>
+    <FileVersion>$(mssemver)</FileVersion>
   </PropertyGroup>
 
   <!-- PATHS -->
@@ -83,7 +83,7 @@
 
       <!-- Umbraco specific -->
       <PackageFile Include="$(MSBuildProjectDirectory)\package.xml" />
-      <UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Our.Umbraco.HealthCheckSlackNotificationMethod.Installer.dll;$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Slack.Webhooks.dll;$(CoreProjectDir)\bin\$(BuildConfig)\RestSharp.dll;$(CoreProjectDir)\bin\$(BuildConfig)\ServiceStack.Text.dll" />
+      <UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Our.Umbraco.HealthCheckSlackNotificationMethod.Installer.dll;$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Slack.Webhooks.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Newtonsoft.Json.dll" />
       <UmbracoInstallerFiles Include="$(InstallerProjectDir)\Configurator\**\*.*"/>
       <UmbracoInstallerLogo Include="$(MSBuildProjectDirectory)\assets\icon\slack-health-check-notification-32.png"/>
 
@@ -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 @@
     <MSBuild.NuGet.Tasks.Pack NuGetExePath="NuGet.exe"
       ManifestFile="$(BuildNuGetDir)\package.nuspec"
       BasePath="$(BuildNuGetDir)"
-      Version="$(mssemver)"
+      Version="$(FileVersion)"
       OutputDirectory="$(ArtifactsDir)"
       Symbols="true" />
 

diff --git a/build/package.nuspec b/build/package.nuspec
@@ -17,7 +17,7 @@
     <tags></tags>
     <dependencies>
       <dependency id="UmbracoCms.Core" version="0.0.0" />
-      <dependency id="Slack.Webhooks" version="0.1.8" />
+      <dependency id="Slack.Webhooks" version="1.0.3" />
   </dependencies>
   </metadata>
 </package>
diff --git a/src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj b/src/Our.Umbraco.HCSlackNM/Our.Umbraco.HCSlackNM.csproj
@@ -125,22 +125,16 @@
       <HintPath>..\..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
-    <Reference Include="RestSharp, Version=104.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll</HintPath>
-    </Reference>
     <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\semver.1.1.2\lib\net45\Semver.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Text, Version=3.9.71.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\ServiceStack.Text.3.9.71\lib\net35\ServiceStack.Text.dll</HintPath>
-    </Reference>
-    <Reference Include="Slack.Webhooks, Version=0.1.8.1091, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Slack.Webhooks.0.1.8\lib\net40\Slack.Webhooks.dll</HintPath>
+    <Reference Include="Slack.Webhooks, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Slack.Webhooks.1.0.3\lib\net45\Slack.Webhooks.dll</HintPath>
     </Reference>
     <Reference Include="SQLCE4Umbraco, Version=1.0.6470.38241, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\UmbracoCms.Core.7.7.0\lib\net45\SQLCE4Umbraco.dll</HintPath>

diff --git a/src/Our.Umbraco.HCSlackNM/packages.config b/src/Our.Umbraco.HCSlackNM/packages.config
@@ -30,13 +30,11 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
   <package id="MySql.Data" version="6.9.9" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="RestSharp" version="104.4.0" targetFramework="net45" />
   <package id="semver" version="1.1.2" targetFramework="net45" />
-  <package id="ServiceStack.Text" version="3.9.71" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="Slack.Webhooks" version="0.1.8" targetFramework="net45" />
+  <package id="Slack.Webhooks" version="1.0.3" targetFramework="net45" />
   <package id="System.Threading.Tasks.Dataflow" version="4.7.0" targetFramework="net45" />
   <package id="UmbracoCms.Core" version="7.7.0" targetFramework="net45" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />

diff --git a/src/TestSite/TestSite.csproj b/src/TestSite/TestSite.csproj
@@ -150,22 +150,16 @@
       <HintPath>..\..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
-    <Reference Include="RestSharp, Version=104.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll</HintPath>
-    </Reference>
     <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\semver.1.1.2\lib\net45\Semver.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Text, Version=3.9.71.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\ServiceStack.Text.3.9.71\lib\net35\ServiceStack.Text.dll</HintPath>
-    </Reference>
-    <Reference Include="Slack.Webhooks, Version=0.1.8.1091, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Slack.Webhooks.0.1.8\lib\net40\Slack.Webhooks.dll</HintPath>
+    <Reference Include="Slack.Webhooks, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Slack.Webhooks.1.0.3\lib\net45\Slack.Webhooks.dll</HintPath>
     </Reference>
     <Reference Include="SQLCE4Umbraco, Version=1.0.6470.38241, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\UmbracoCms.Core.7.7.0\lib\net45\SQLCE4Umbraco.dll</HintPath>

diff --git a/src/TestSite/packages.config b/src/TestSite/packages.config
@@ -36,13 +36,11 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
   <package id="MySql.Data" version="6.9.9" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="RestSharp" version="104.4.0" targetFramework="net45" />
   <package id="semver" version="1.1.2" targetFramework="net45" />
-  <package id="ServiceStack.Text" version="3.9.71" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="Slack.Webhooks" version="0.1.8" targetFramework="net45" />
+  <package id="Slack.Webhooks" version="1.0.3" targetFramework="net45" />
   <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
   <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
   <package id="System.Threading.Tasks.Dataflow" version="4.7.0" targetFramework="net45" />