Pass in patch version from pipeline (#2020)

* Pass in patch version from pipeline

* Correct patch version

* Fix packaging

* Fix nuget version

* Revert nuget package changes

Directory.Build.props

@@ -12,8 +12,15 @@
     <RootDir>$(MSBuildThisFileDirectory)</RootDir>
 
     <!-- Defaults-->
+    <!-- The revision version is currently generated by the release stage, which runs after build. So until
+         that can be refactored just set to 0/99 here since it doesn't need to exactly match the release version
+         (especially with the commit hash being embedded in)
+    -->
+    <Revision Condition="$(Patch) != ''">0</Revision>
+    <Revision Condition="$(Patch) == ''">99</Revision>
     <Major Condition="$(Major) == ''">99</Major>
     <Minor Condition="$(Minor) == ''">99</Minor>
+    <Patch Condition="$(Patch) == ''">99</Patch>
     <Build_BuildNumber Condition="'$(Build_BuildNumber)' == ''">99.99</Build_BuildNumber>
     <StableRelease Condition="$(StableRelease) == ''">false</StableRelease>
 
@@ -23,7 +30,7 @@
     <!-- AssemblyFileVersion should change for every build. -->
     <!-- For preview releases, sample Version = 3.0.20221104.1-preview -->
     <!-- For stable releases, sample Version = 3.0.0 -->
-    <VersionPrefix>$(Major).$(Minor).$(Build_BuildNumber)</VersionPrefix>
+    <VersionPrefix>$(Major).$(Minor).$(Patch).$(Revision)</VersionPrefix>
     <VersionPrefix Condition="$(StableRelease.Equals('true'))">$(Major).$(Minor).0</VersionPrefix>
     <VersionSuffix Condition="!$(StableRelease.Equals('true'))">preview</VersionSuffix>
     <AssemblyFileVersion>$(VersionPrefix)-$(VersionSuffix)</AssemblyFileVersion>

azure-pipelines/build-and-release.yml

@@ -8,6 +8,9 @@ variables:
   # Minor version number for the release (should be incremented post a stable release)
 - name: Minor
   value: '7'
+  # Patch version number for the release (should be incremented in release branch once one is created)
+- name: Patch
+  value: '0'
 
 stages:
 - stage: Build

azure-pipelines/release.yml

@@ -35,7 +35,7 @@ steps:
   displayName: 'Run Automated Release Script'
   inputs:
     filePath: '$(System.DefaultWorkingDirectory)/CrossPlatBuildScripts/AutomatedReleases/sqltoolsserviceRelease.ps1'
-    arguments: '-workspace $(Build.SourcesDirectory) -minTag $(Major).$(Minor).0.0 -target $(Build.SourceBranch) -isPrerelease $false -artifactsBuildId $(Build.BuildId)'
+    arguments: '-workspace $(Build.SourcesDirectory) -minTag $(Major).$(Minor).$(Patch).0 -target $(Build.SourceBranch) -isPrerelease $false -artifactsBuildId $(Build.BuildId)'
     workingDirectory: '$(Build.SourcesDirectory)'
   env:
     GITHUB_DISTRO_MIXIN_PASSWORD: $(github-distro-mixin-password)