Updating all the build scripts

Author: Jeavon

appveyor.yml

@@ -1,26 +1,39 @@
-os: Visual Studio 2017
-
-# Version format
 version: 2.0.0.{build}
 
+os: Visual Studio 2017
+
 cache:
   - src\packages -> **\packages.config   # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
 
-# 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=alpha3
+configuration: Release
+
+environment:
+  # Version Suffix
+  version_suffix: alpha3
 
 install:
+  - ps: .\build\appveyor-semver.ps1
+  - ps: .\build\check-release-version.ps1
+  - ps: Update-AppveyorBuild -Version $Env:appveyor_version
   - ps: >-
       $msiPath = "$($env:USERPROFILE)\MicrosoftAzureStorageEmulator.msi"
 
       (New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/F/3/8/F3857A38-D344-43B4-8E5B-2D03489909B9/MicrosoftAzureStorageEmulator.msi', $msiPath)
 
       cmd /c start /wait msiexec /i $msiPath /quiet
 
+assembly_info:
+  patch: true
+  file: 'src\UmbracoFileSystemProviders.Azure**\AssemblyInfo.*'
+  assembly_version: '$(appveyor_file_version)'
+  assembly_file_version: '$(appveyor_file_version)'
+  assembly_informational_version: '$(mssemver)'
+
 build_script:
-- build-appveyor.cmd
+- cmd: >-
+    build-appveyor.cmd
+
+    cd..
 
 before_test:
 - cmd: '"%programfiles(x86)%\Microsoft SDKs\Azure\Storage Emulator\AzureStorageEmulator.exe" start'

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.exe restore src\UmbracoFileSystemProviders.Azure.sln
 
@@ -14,24 +15,28 @@ IF NOT EXIST "%toolsFolder%" (
 
 IF NOT EXIST "%toolsFolder%vswhere.exe" (
 	ECHO vswhere not found - fetching now
-	tools\nuget.exe install vswhere -Version 2.5.9 -Source nuget.org -OutputDirectory tools
+	nuget install vswhere -Version 2.6.7 -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
-)
+SETLOCAL EnableDelayedExpansion
+
+:: This string specifies vs 2019
+:: set vswherestr=^"!%CD%\tools\vswhere.exe^" -version [16.0,17.0^^) -latest -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
 
-SET VSWherePath="%InstallDir%\MSBuild"
+set vswherestr=^"!%CD%\tools\vswhere.exe^" -latest -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
+for /f "usebackq tokens=*" %%i in (`!vswherestr!`) do (  
+  set MsBuildDir=%%i
+)
 
 ECHO.
-ECHO Visual Studio is installed in: %InstallDir%
+ECHO MsBuild is installed in: %MsBuildDir%
 
-CALL "%InstallDir%\MSBuild\15.0\Bin\amd64\MsBuild.exe" package.proj %~1
+CALL "%MsBuildDir%" package.proj %~1
 
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @EXIT /B 0
 :err
-@EXIT /B 1
+@EXIT /B 1

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):
 
@@ -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%-beta-%APPVEYOR_BUILD_NUMBER%
+
+SET CONFIGURATION=Debug
 
 build-appveyor.cmd
 

build/UmbracoFileSystemProviders.Azure.proj

@@ -12,7 +12,6 @@
   <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" />
   <Import Project="$(MSBuildUmbracoTasksPath)\MSBuild.Umbraco.Tasks.Targets" />
   <Import Project="$(MSBuildNugetTasksPath)\MSBuild.NuGet.Tasks.Targets" />
-  <Import Project="$(AppVeyorUmbracoPath)\AppVeyorUmbraco.Targets" />
 
   <!-- SHARED PROPERTIES -->
   <PropertyGroup>
@@ -40,37 +39,12 @@
 
   <!-- APPVEYOR PROPERTIES -->
   <PropertyGroup>
-    <FileVersion>$(APPVEYOR_BUILD_VERSION)</FileVersion>
+    <FileVersion>$(mssemver)</FileVersion>
   </PropertyGroup>
-  <Choose>
-    <When Condition="$(APPVEYOR_BUILD_NUMBER) != '' And $(APPVEYOR_REPO_TAG) != 'true' ">
-      <PropertyGroup>
-        <Release>false</Release>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <Release>true</Release>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
-  <Choose>
-    <When Condition="$(Release) == 'false' And $(UMBRACO_PACKAGE_PRERELEASE_SUFFIX) == 'rtm'">
-      <PropertyGroup>
-        <AbortBuild>true</AbortBuild>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <AbortBuild>false</AbortBuild>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
+  
   <!-- PATHS -->
   <PropertyGroup>
-    <BuildConfig>Release</BuildConfig>
+    <BuildConfig>$(CONFIGURATION)</BuildConfig>
     <RootDir>$(MSBuildProjectDirectory)\..</RootDir>
     <BuildDir>$(MSBuildProjectDirectory)\_core</BuildDir>
     <BuildUmbDir>$(BuildDir)\_umbraco</BuildUmbDir>
@@ -81,16 +55,8 @@
     <TestsProjectDir>$(RootDir)\src\UmbracoFileSystemProviders.Azure.Tests</TestsProjectDir>
   </PropertyGroup>
 
-  <!-- TARGETS -->
-  <Target Name="GetProductVersion">
-    <Error Condition="$(AbortBuild) == 'true'" Text="Aborting the build as the UMBRACO_PACKAGE_PRERELEASE_SUFFIX suffix is set 'rtm' but APPVEYOR_REPO_TAG is not 'true'" />
-    <GetProductVersion BuildVersion="$(APPVEYOR_BUILD_VERSION)" BuildSuffix="$(UMBRACO_PACKAGE_PRERELEASE_SUFFIX)" Release="$(Release)">
-      <Output TaskParameter="ProductVersion" PropertyName="ProductVersion"/>
-    </GetProductVersion>
-  </Target>
-
   <!-- CLEAN -->
-  <Target Name="Clean" DependsOnTargets="GetProductVersion">
+  <Target Name="Clean">
     <RemoveDir Directories="$(BuildDir)" Condition="Exists('$(BuildDir)')" />
     <RemoveDir Directories="$(ArtifactsDir)" Condition="Exists('$(ArtifactsDir)')" />
     <MakeDir Directories="$(BuildDir)" />
@@ -99,19 +65,8 @@
     <MakeDir Directories="$(ArtifactsDir)" />
   </Target>
 
-  <!-- UPDATE PROJECT ASSEMBLEY VERSION -->
-  <Target Name="UpdateAssemblyInfo" DependsOnTargets="Clean">
-    <FileUpdate Encoding="ASCII" Files="$(ProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyVersion(&quot;$(FileVersion)&quot;)]" />
-    <FileUpdate Encoding="ASCII" Files="$(ProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyFileVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyFileVersion(&quot;$(FileVersion)&quot;)]" />
-    <FileUpdate Encoding="ASCII" Files="$(ProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyInformationalVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyInformationalVersion(&quot;$(ProductVersion)&quot;)]" />
-
-    <FileUpdate Encoding="ASCII" Files="$(InstallerProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyVersion(&quot;$(FileVersion)&quot;)]" />
-    <FileUpdate Encoding="ASCII" Files="$(InstallerProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyFileVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyFileVersion(&quot;$(FileVersion)&quot;)]" />
-    <FileUpdate Encoding="ASCII" Files="$(InstallerProjectDir)\Properties\VersionInfo.cs" Regex="AssemblyInformationalVersion\(&quot;.*&quot;\)\]" ReplacementText="AssemblyInformationalVersion(&quot;$(ProductVersion)&quot;)]" />
-  </Target>
-
   <!-- COMPILE -->
-  <Target Name="Compile" DependsOnTargets="UpdateAssemblyInfo">
+  <Target Name="Compile" DependsOnTargets="Clean">
     <MSBuild Projects="$(ProjectDir)\UmbracoFileSystemProviders.Azure.csproj" Properties="Configuration=$(BuildConfig)" />
     <MSBuild Projects="$(TestsProjectDir)\UmbracoFileSystemProviders.Azure.Tests.csproj" Properties="Configuration=$(BuildConfig)" />
     <MSBuild Projects="$(InstallerProjectDir)\UmbracoFileSystemProviders.Azure.Installer.csproj" Properties="Configuration=$(BuildConfig)" />

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

build/check-release-version.ps1

@@ -0,0 +1,57 @@
+$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"
+
+#$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
+	}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)
+	}
+}

build/tools/AppVeyorUmbraco/AppVeyorUmbraco.Targets

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2008
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29001.49
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UmbracoFileSystemProviders.Azure", "UmbracoFileSystemProviders.Azure\UmbracoFileSystemProviders.Azure.csproj", "{749BC432-144A-4250-9066-D1FE170AFE42}"
 EndProject
@@ -14,9 +14,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildPackage", "BuildPackage", "{DDE4D2E6-E526-4CB3-BECE-D89DFFB37B10}"
 	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\transforms\media-web.config.install.xdt = ..\build\transforms\media-web.config.install.xdt
 		..\build\transforms\media-web.config.uninstall.xdt = ..\build\transforms\media-web.config.uninstall.xdt
 		..\build\package.nuspec = ..\build\package.nuspec