Merge pull request hmscott4#20 from randomnote1/FixBuildNumbers

Fix build numbers

Author: randomnote1

AlertManagement/AlertManagement.mpproj

@@ -5,7 +5,7 @@
     <RootNamespace>SCOM.Alert.Management</RootNamespace>
     <Name>SCOM.Alert.Management</Name>
     <ManagementPackName>SCOM.Alert.Management</ManagementPackName>
-    <Version>1.0.25.103</Version>
+    <Version>1.0.30.108</Version>
     <MpFrameworkVersion>v7.0.2</MpFrameworkVersion>
     <MpFrameworkProfile>OM</MpFrameworkProfile>
     <ProductVersion>1.1.0.0</ProductVersion>

AlertManagement/AlertManagement.mpproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <DeploymentNextVersion>1.0.25.104</DeploymentNextVersion>
+    <DeploymentNextVersion>1.0.30.109</DeploymentNextVersion>
     <DeploymentAutoIncrementVersion>True</DeploymentAutoIncrementVersion>
     <DeploymentStartAction>None</DeploymentStartAction>
     <DeploymentWebConsoleUrl />

Build/build.ps1

@@ -47,32 +47,37 @@ foreach ( $solution in ( Get-ChildItem -Filter *.sln ) )
 		$projectUserFile = Get-ChildItem -Path $projectFile.Directory -Filter *.mpproj.user
 		$projectUserFileXml = [System.Xml.XmlDocument] ( $projectUserFile | Get-Content )
 		$nextVersion = [System.Version]::new($projectUserFileXml.Project.PropertyGroup.DeploymentNextVersion)
+		Write-Verbose -Message "Current Management Pack Version: $($nextVersion.ToString())"
 
 		# Break out the version components to make it easier to work with
 		$nextVersionMajor = $nextVersion.Major
 		$nextVersionMinor = $nextVersion.Minor
 		$nextVersionBuild = $nextVersion.Build
 		$nextVersionRevision = $nextVersion.Revision
 
-		# Increment the minor version
-		if ( ( $env:GITHUB_REF -match '^refs/heads/dev' ) -and $env:GITHUB_HEAD_REF -and $env:GITHUB_BASE_REF )
+		Write-Verbose -Message "Branch: $env:GITHUB_REF"
+		switch -Regex ( $env:GITHUB_REF )
 		{
-			$nextVersionMinor++
-		}
-
-		# Increment the major version
-		if ( ( $env:GITHUB_REF -match '^refs/heads/main' ) -and $env:GITHUB_HEAD_REF -and $env:GITHUB_BASE_REF )
-		{
-			$nextVersionMajor++
-			$nextVersionMinor = 0
+			# Increment the minor version
+			'^refs/heads/dev'
+			{
+				$nextVersionMinor++
+			}
+
+			# Increment the major version
+			'^refs/heads/main'
+			{
+				$nextVersionMajor++
+				$nextVersionMinor = 0
+			}
 		}
 
 		# Increment the build
 		$nextVersionBuild++
 
 		# Create the new version
 		$newVersion = [System.Version]::new($nextVersionMajor,$nextVersionMinor,$nextVersionBuild,$nextVersionRevision)
-		Write-Verbose -Message "Management Pack Version: $($newVersion.ToString())"
+		Write-Verbose -Message "New Management Pack Version: $($newVersion.ToString())"
 
 		# Set the next management pack version in the project file
 		$projectFileXml = [System.Xml.XmlDocument] ( $projectFile | Get-Content )