updates for one build (#2777)

* updates for one build * Delete build/version.props * Move the version to version.projs a it's also included by tests (#2784) * update other ymls to use MicrosoftIdentityModelVersion * Re-adding version.props to the solution --------- Co-authored-by: Jean-Marc Prieur <[email protected]>
AzureAD · Aug 19, 2024 · 2f4f9e6 · 2f4f9e6
1 parent a120bde
commit 2f4f9e6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 33 deletions.
diff --git a/build/common.props b/build/common.props
@@ -2,6 +2,7 @@
 
   <Import Project="dependencies.props" />
   <Import Project="targets.props" />
+  <Import Project="version.props" />
 
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
@@ -31,20 +32,6 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
 
-  <!-- Wilson version  -->
-  <PropertyGroup>
-    <WilsonCurrentVersion>8.0.0</WilsonCurrentVersion>
-
-    <PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == '' and '$(BuildingInsideVisualStudio)' != 'true'">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHHmmss"))</PreviewVersionSuffix>
-    <!--VS re-evaluates the variables, so having seconds or minutes creates an infinite loop of package updates-->
-    <PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == '' and '$(BuildingInsideVisualStudio)' == 'true'">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHH"))</PreviewVersionSuffix>
-    <IsCustomPreview>$(WilsonVersion.Contains("-"))</IsCustomPreview>
-    <Version Condition="'$(WilsonVersion)' != ''">$(WilsonVersion)</Version>
-    <VersionSuffix Condition="'$(WilsonVersion)' == ''">$(PreviewVersionSuffix)</VersionSuffix>
-    <VersionPrefix Condition="'$(WilsonVersion)' == ''">$(WilsonCurrentVersion)</VersionPrefix>
-    <FileVersion Condition="'$(WilsonVersion)' != '' and '$(IsCustomPreview)' != 'true' ">$(WilsonVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd"))</FileVersion>
-    <FileVersion Condition="'$(WilsonVersion)' == ''">$(WilsonCurrentVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd"))</FileVersion>
-  </PropertyGroup>
 
   <PropertyGroup>
     <EnablePackageValidation>false</EnablePackageValidation>

diff --git a/build/releaseBuild.yml b/build/releaseBuild.yml
@@ -13,7 +13,7 @@ schedules:
 
     # The following variables are set in the release build UI:
     # BuildConfiguration: 'debug|release'
-    # WilsonVersion: ''. Full version number
+    # MicrosoftIdentityModelVersion: ''. Full version number
     # BuildPlatform: 'any cpu'
 
 jobs:
@@ -28,4 +28,4 @@ jobs:
 
   steps:
 
-  - template: template-Build-run-tests-sign.yml
+  - template: template-Build-run-tests-sign.yml
diff --git a/build/template-Build-run-tests-sign.yml b/build/template-Build-run-tests-sign.yml
@@ -4,8 +4,8 @@ steps:
 - script: echo $(BuildConfiguration)
   displayName: 'display Build Configuration'
 
-- script: echo $(WilsonVersion)
-  displayName: 'display WilsonVersion'
+- script: echo $(MicrosoftIdentityModelVersion)
+  displayName: 'display MicrosoftIdentityModelVersion'
 
 - task: UseDotNet@2
   displayName: 'Use .NET Core sdk 2.x'
@@ -187,7 +187,7 @@ steps:
 
 - task: NuGetCommand@2
   displayName: 'Upload NuGet Package to VSTS NuGet'
-  condition: eq(variables['WilsonVersion'], '')
+  condition: eq(variables['MicrosoftIdentityModelVersion'], '')
   inputs:
     command: push
     packagesToPush: '$(Build.Repository.LocalPath)\artifacts\*.nupkg'

diff --git a/build/version.props b/build/version.props
@@ -1,17 +1,17 @@
 <!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix.  -->
 <Project>
-    <PropertyGroup>
-        <VersionPrefix>0.0.1</VersionPrefix>
-        <VersionSuffix>preview</VersionSuffix>
-    </PropertyGroup>
+<!-- Wilson version  -->
+  <PropertyGroup>
+    <MicrosoftIdentityModelCurrentVersion>8.0.1</MicrosoftIdentityModelCurrentVersion>
 
-    <!--Enables to create preview NuGet packages.-->
-    <PropertyGroup Condition=" '$(VersionSuffix)' == '' ">
-      <Version>$(VersionPrefix)</Version>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(VersionSuffix)' != '' ">
-      <Version>$(VersionPrefix)-$(VersionSuffix)</Version>
-    </PropertyGroup>
-
-</Project>
+    <PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == '' and '$(BuildingInsideVisualStudio)' != 'true'">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHHmmss"))</PreviewVersionSuffix>
+    <!--VS re-evaluates the variables, so having seconds or minutes creates an infinite loop of package updates-->
+    <PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == '' and '$(BuildingInsideVisualStudio)' == 'true'">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHH"))</PreviewVersionSuffix>
+    <IsCustomPreview>$(MicrosoftIdentityModelVersion.Contains("-"))</IsCustomPreview>
+    <Version Condition="'$(MicrosoftIdentityModelVersion)' != ''">$(MicrosoftIdentityModelVersion)</Version>
+    <VersionSuffix Condition="'$(MicrosoftIdentityModelVersion)' == ''">$(PreviewVersionSuffix)</VersionSuffix>
+    <VersionPrefix Condition="'$(MicrosoftIdentityModelVersion)' == ''">$(MicrosoftIdentityModelCurrentVersion)</VersionPrefix>
+    <FileVersion Condition="'$(MicrosoftIdentityModelVersion)' != '' and '$(IsCustomPreview)' != 'true' ">$(MicrosoftIdentityModelVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd"))</FileVersion>
+    <FileVersion Condition="'$(MicrosoftIdentityModelVersion)' == ''">$(MicrosoftIdentityModelCurrentVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd"))</FileVersion>
+  </PropertyGroup>
+</Project>