Work CI-CD

- Fix generation of build number for WIN32 nanoCLR.

***NO_CI***

Author: josesimoes

azure-pipelines-templates/nb-gitversioning.yml

@@ -31,14 +31,6 @@ steps:
         $counter = $env:REVISION
         $version = ([int]$counter).ToString()
 
-        if($env:Build_SourceBranch.StartsWith('release-') -or 
-            $env:Build_SourceBranch.StartsWith('main'))
-        {
-            Write-Host "$("##vso[task.setvariable variable=TARGET_BUILD_COUNTER]")$env:NBGV_RevisionNumber"
-            Write-Host "*** BUILD NUMBER IS: $(NBGV_VersionMajor).$(NBGV_VersionMinor).$(NBGV_BuildNumber).$(NBGV_RevisionNumber) ***"
-        }
-        else
-        {
-            Write-Host "$("##vso[task.setvariable variable=TARGET_BUILD_COUNTER]")$version"
-            Write-Host "*** BUILD NUMBER IS: $(NBGV_VersionMajor).$(NBGV_VersionMinor).$(NBGV_BuildNumber).$version ***"
-        }
+        Write-Host "$("##vso[task.setvariable variable=TARGET_BUILD_COUNTER]")$version"
+        Write-Host "$("##vso[task.setvariable variable=NBGV_NuGetPackageVersion]")$(NBGV_VersionMajor).$(NBGV_VersionMinor).$(NBGV_BuildNumber).$version"
+        Write-Host "*** BUILD NUMBER IS: $(NBGV_VersionMajor).$(NBGV_VersionMinor).$(NBGV_BuildNumber).$version ***"

azure-pipelines.yml

@@ -655,7 +655,7 @@ jobs:
     DOTNET_NOLOGO: true
     TargetPublishName: WIN32_nanoCLR
     # creates a counter and assigns it to the revision variable
-    REVISION: $[counter('WIN32_1_8_0_versioncounter', 0)]
+    REVISION: $[counter('WIN32_1_8_0__versioncounter', 400)]
 
   steps:
   - template: azure-pipelines-templates/nb-gitversioning.yml

targets/win32/nanoCLR/nanoCLR.vcxproj

@@ -55,8 +55,8 @@
     <NBGV_VersionMajor Condition="'$(NBGV_VersionMajor)'==''">9</NBGV_VersionMajor>
     <NBGV_VersionMinor Condition="'$(NBGV_VersionMinor)'==''">99</NBGV_VersionMinor>
     <NBGV_BuildNumber Condition="'$(NBGV_BuildNumber)'==''">999</NBGV_BuildNumber>
-    <NBGV_VersionHeight Condition="'$(NBGV_VersionHeight)'==''">9999</NBGV_VersionHeight>
-    <NBGV_AssemblyInformationalVersion Condition="'$(NBGV_AssemblyInformationalVersion)'==''">9.99.999.9999</NBGV_AssemblyInformationalVersion>
+    <NBGV_VersionHeight Condition="'$(TARGET_BUILD_COUNTER)'==''">9999</NBGV_VersionHeight>
+    <NBGV_AssemblyInformationalVersion Condition="'$(NBGV_AssemblyInformationalVersion)'==''">$(NBGV_VersionMajor).$(NBGV_VersionMinor).$(NBGV_BuildNumber).$(TARGET_BUILD_COUNTER)$(NBGV_SemVerBuildSuffix)</NBGV_AssemblyInformationalVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">