Update MSAL versioning property to use MicrosoftIdentityClientVersion (#5301)

* Rename version variable for MISE integration

* pca projects too

---------

Co-authored-by: Bogdan Gavril <[email protected]>

Author: trwalke

CONTRIBUTING.md

@@ -144,5 +144,5 @@ For MAUI, edit the .csproj and enable the mobile targets.
 You can create a package from Visual Studio or from the command line with custom version parameters:
 
 ```bash
-msbuild <msal>.csproj /t:pack /p:MsalClientSemVer=1.2.3-preview
+msbuild <msal>.csproj /t:pack /p:MicrosoftIdentityClientVersion=1.2.3-preview
 ```

build/template-OneBranch-CI-libsandsamples.yaml

@@ -4,7 +4,7 @@
 parameters:
   BuildPlatform: 'any cpu'
   BuildConfiguration: 'release'
-  MsalClientSemVer: '4.60.0-devopsbuild' 
+  MicrosoftIdentityClientVersion: '4.60.0-devopsbuild' 
   MsalSourceDir: 'microsoft-authentication-library-for-dotnet\' #Default MSAL Location
 
 steps:
@@ -82,6 +82,6 @@ steps:
   displayName: 'Build solution ${{ parameters.Solution }}'
   inputs:
     solution: ${{ parameters.Solution }}
-    msbuildArgs: '/p:RunCodeAnalysis=false /p:MsalClientSemVer=${{ parameters.MsalClientSemVer }} /p:SourceLinkCreate=true /p:ContinousIntegrationBuild=true'
+    msbuildArgs: '/p:RunCodeAnalysis=false /p:MicrosoftIdentityClientVersion=${{ parameters.MicrosoftIdentityClientVersion }} /p:SourceLinkCreate=true /p:ContinousIntegrationBuild=true'
     platform: ${{ parameters.BuildPlatform }}
     configuration: ${{ parameters.BuildConfiguration }}

build/template-OneBranch-Release-libsandsamples.yaml

@@ -5,15 +5,15 @@
 parameters:
   BuildPlatform: 'any cpu'
   BuildConfiguration: 'release'
-  MsalClientSemVer: '4.55.0-devopsbuild'
+  MicrosoftIdentityClientVersion: '4.55.0-devopsbuild'
   MsalSourceDir: 'microsoft-authentication-library-for-dotnet\' #Default MSAL Location
 
 steps:
 
 - template: template-OneBranch-CI-libsandsamples.yaml
   parameters:
     Solution: 'microsoft-authentication-library-for-dotnet/LibsAndSamples.sln'
-    MsalClientSemVer: $(MsalClientSemVer) #Default MSAL package version
+    MicrosoftIdentityClientVersion: $(MicrosoftIdentityClientVersion) #Default MSAL package version
     MsalSourceDir: $(MsalSourceDir) #Default MSAL root directory
     PipelineType: $(PipelineType) #Build type
 

build/template-build-and-prep-automation.yaml

@@ -15,7 +15,7 @@ steps:
   parameters:
     BuildPlatform: '$(BuildPlatform)'
     BuildConfiguration: '$(BuildConfiguration)'
-    MsalClientSemVer: $(MsalClientSemVer)
+    MicrosoftIdentityClientVersion: $(MicrosoftIdentityClientVersion)
     Solution: 'LibsAndSamples.sln'    
 
 - task: CopyFiles@2

build/template-restore-build-libsandsamples.yaml

@@ -4,7 +4,7 @@
 parameters:
   BuildPlatform: 'any cpu'
   BuildConfiguration: 'Release'
-  MsalClientSemVer: '4.60.0-devopsbuild'
+  MicrosoftIdentityClientVersion: '4.60.0-devopsbuild'
 
 steps:
 
@@ -47,7 +47,7 @@ steps:
   displayName: 'Build solution ${{ parameters.Solution }}'
   inputs:
     solution: ${{ parameters.Solution }}
-    msbuildArgs: '/p:RunCodeAnalysis=false /p:MsalClientSemVer=${{ parameters.MsalClientSemVer }} /p:SourceLinkCreate=true /p:ContinousIntegrationBuild=true'
+    msbuildArgs: '/p:RunCodeAnalysis=false /p:MicrosoftIdentityClientVersion=${{ parameters.MicrosoftIdentityClientVersion }} /p:SourceLinkCreate=true /p:ContinousIntegrationBuild=true'
     platform: ${{ parameters.BuildPlatform }}
     configuration: ${{ parameters.BuildConfiguration }}
     maximumCpuCount: true

src/client/Microsoft.Identity.Client.Broker/Microsoft.Identity.Client.Broker.csproj

@@ -11,9 +11,9 @@
 
   <PropertyGroup Label="NuGet and AssemblyInfo metadata">
     <!--This should be passed from the VSTS build-->
-    <MsalClientSemVer Condition="'$(MsalClientSemVer)' == ''">$(MsalInternalVersion)</MsalClientSemVer>
+    <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">$(MsalInternalVersion)</MicrosoftIdentityClientVersion>
     <!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
-    <Version>$(MsalClientSemVer)</Version>
+    <Version>$(MicrosoftIdentityClientVersion)</Version>
     <!-- Copyright needs to be in the form of © not (c) to be compliant -->
     <Title>MSAL.NET extension for public client broker support</Title>
     <Description>

src/client/Microsoft.Identity.Client.Desktop/Microsoft.Identity.Client.Desktop.csproj

@@ -13,10 +13,10 @@
 
   <PropertyGroup Label="NuGet and AssemblyInfo metadata">
     <!--This should be passed from the VSTS build-->
-    <MsalClientSemVer Condition="'$(MsalClientSemVer)' == ''">$(MsalInternalVersion)</MsalClientSemVer>
-    <MsalClientSemVer>$(MsalClientSemVer)</MsalClientSemVer>
+    <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">$(MsalInternalVersion)</MicrosoftIdentityClientVersion>
+    <MicrosoftIdentityClientVersion>$(MicrosoftIdentityClientVersion)</MicrosoftIdentityClientVersion>
     <!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
-    <Version>$(MsalClientSemVer)</Version>
+    <Version>$(MicrosoftIdentityClientVersion)</Version>
     <!-- Copyright needs to be in the form of © not (c) to be compliant -->
     <Title>MSAL.NET extension for desktop scenarios for older .NET platforms</Title>
     <Description>

src/client/Microsoft.Identity.Client.Extensions.Msal/Microsoft.Identity.Client.Extensions.Msal.csproj

@@ -7,9 +7,9 @@
   <PropertyGroup Label="NuGet and AssemblyInfo metadata">
     <!-- most of the properties are in Directory.Build.props-->
     <!--This should be passed from the VSTS build-->
-    <MsalClientSemVer Condition="'$(MsalClientSemVer)' == ''">$(MsalInternalVersion)</MsalClientSemVer>
+    <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">$(MsalInternalVersion)</MicrosoftIdentityClientVersion>
     <!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
-    <Version>$(MsalClientSemVer)</Version>
+    <Version>$(MicrosoftIdentityClientVersion)</Version>
     <Description>This package contains the public client (desktop) caching to Microsoft Authentication Library for .NET (MSAL.NET)</Description>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>

src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj

@@ -28,9 +28,9 @@
 
   <PropertyGroup Label="NuGet and AssemblyInfo metadata">
     <!--This should be passed from the VSTS build-->
-    <MsalClientSemVer Condition="'$(MsalClientSemVer)' == ''">$(MsalInternalVersion)</MsalClientSemVer>
+    <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">$(MsalInternalVersion)</MicrosoftIdentityClientVersion>
     <!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
-    <Version>$(MsalClientSemVer)</Version>
+    <Version>$(MicrosoftIdentityClientVersion)</Version>
 
     <!-- Copyright needs to be in the form of © not (c) to be compliant -->
     <Title>Microsoft Authentication Library for .NET</Title>