Skip to content

Commit 9c052b6

Browse files
Copilotgladjohn
andauthored
fix: Introduce dedicated LabApiVersion property for Microsoft.Identity.Lab.Api NuGet versioning (#5875)
* Initial plan * feat: introduce dedicated LabApiVersion property for Microsoft.Identity.Lab.Api NuGet versioning Co-authored-by: gladjohn <90415114+gladjohn@users.noreply.github.com> Agent-Logs-Url: https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/sessions/d499ae23-b70e-4734-a712-da370f8f147b * fix: remove MsalInternalVersion fallback from Lab.Api csproj - LabApiVersion is always set Co-authored-by: gladjohn <90415114+gladjohn@users.noreply.github.com> Agent-Logs-Url: https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/sessions/44bfbdfc-c9f3-4642-b836-9bbb519cdb3e * LabApiInternalVersion * 2.0.0 --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: gladjohn <90415114+gladjohn@users.noreply.github.com>
1 parent d3af308 commit 9c052b6

6 files changed

Lines changed: 11 additions & 4 deletions

Directory.Packages.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<MSALRuntimeNativeInteropVersion>0.20.3</MSALRuntimeNativeInteropVersion>
66
<!-- Version of MSAL if not defined by the CI-->
77
<MsalInternalVersion>4.61.0</MsalInternalVersion>
8+
<!-- Version of Microsoft.Identity.Lab.Api if not defined by the CI-->
9+
<LabApiInternalVersion>2.0.0</LabApiInternalVersion>
810
</PropertyGroup>
911
<!-- Add packages, then highlight all lines and go to Edit > Advanced > Sort Lines -->
1012
<ItemGroup>

build/template-OneBranch-CI-libsandsamples.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ parameters:
55
BuildPlatform: 'any cpu'
66
BuildConfiguration: 'release'
77
MicrosoftIdentityClientVersion: '4.60.0-devopsbuild'
8+
LabApiVersion: '2.0.0-devopsbuild'
89
MsalSourceDir: 'microsoft-authentication-library-for-dotnet\' #Default MSAL Location
910

1011
steps:
@@ -82,6 +83,6 @@ steps:
8283
displayName: 'Build solution ${{ parameters.Solution }}'
8384
inputs:
8485
solution: ${{ parameters.Solution }}
85-
msbuildArgs: '/p:RunCodeAnalysis=false /p:MicrosoftIdentityClientVersion=${{ parameters.MicrosoftIdentityClientVersion }} /p:SourceLinkCreate=true /p:ContinousIntegrationBuild=true'
86+
msbuildArgs: '/p:RunCodeAnalysis=false /p:MicrosoftIdentityClientVersion=${{ parameters.MicrosoftIdentityClientVersion }} /p:LabApiVersion=${{ parameters.LabApiVersion }} /p:SourceLinkCreate=true /p:ContinousIntegrationBuild=true'
8687
platform: ${{ parameters.BuildPlatform }}
8788
configuration: ${{ parameters.BuildConfiguration }}

build/template-OneBranch-Release-libsandsamples.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ parameters:
66
BuildPlatform: 'any cpu'
77
BuildConfiguration: 'release'
88
MicrosoftIdentityClientVersion: '4.55.0-devopsbuild'
9+
LabApiVersion: '2.0.0-devopsbuild'
910
MsalSourceDir: 'microsoft-authentication-library-for-dotnet\' #Default MSAL Location
1011

1112
steps:
@@ -14,6 +15,7 @@ steps:
1415
parameters:
1516
Solution: 'microsoft-authentication-library-for-dotnet/LibsAndSamples.sln'
1617
MicrosoftIdentityClientVersion: $(MicrosoftIdentityClientVersion) #Default MSAL package version
18+
LabApiVersion: $(LabApiVersion) #Lab.Api package version
1719
MsalSourceDir: $(MsalSourceDir) #Default MSAL root directory
1820
PipelineType: $(PipelineType) #Build type
1921

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ steps:
1616
BuildPlatform: '$(BuildPlatform)'
1717
BuildConfiguration: '$(BuildConfiguration)'
1818
MicrosoftIdentityClientVersion: $(MicrosoftIdentityClientVersion)
19+
LabApiVersion: $(LabApiVersion)
1920
Solution: 'LibsAndSamples.sln'
2021

2122
- task: CopyFiles@2

build/template-restore-build-libsandsamples.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ parameters:
55
BuildPlatform: 'any cpu'
66
BuildConfiguration: 'Release'
77
MicrosoftIdentityClientVersion: '4.60.0-devopsbuild'
8+
LabApiVersion: '2.0.0-devopsbuild'
89

910
steps:
1011

@@ -47,7 +48,7 @@ steps:
4748
displayName: 'Build solution ${{ parameters.Solution }}'
4849
inputs:
4950
solution: ${{ parameters.Solution }}
50-
msbuildArgs: '/p:RunCodeAnalysis=false /p:MicrosoftIdentityClientVersion=${{ parameters.MicrosoftIdentityClientVersion }} /p:SourceLinkCreate=true /p:ContinousIntegrationBuild=true'
51+
msbuildArgs: '/p:RunCodeAnalysis=false /p:MicrosoftIdentityClientVersion=${{ parameters.MicrosoftIdentityClientVersion }} /p:LabApiVersion=${{ parameters.LabApiVersion }} /p:SourceLinkCreate=true /p:ContinousIntegrationBuild=true'
5152
platform: ${{ parameters.BuildPlatform }}
5253
configuration: ${{ parameters.BuildConfiguration }}
5354
maximumCpuCount: true

src/client/Microsoft.Identity.Lab.Api/Microsoft.Identity.Lab.Api.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
</PropertyGroup>
1010

1111
<PropertyGroup Label="NuGet and AssemblyInfo metadata">
12+
<LabApiVersion Condition="'$(LabApiVersion)' == ''">$(LabApiInternalVersion)</LabApiVersion>
1213
<!--This should be passed from the VSTS build-->
13-
<MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">$(MsalInternalVersion)</MicrosoftIdentityClientVersion>
1414
<!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
15-
<Version>$(MicrosoftIdentityClientVersion)</Version>
15+
<Version>$(LabApiVersion)</Version>
1616

1717
<!-- Copyright needs to be in the form of © not (c) to be compliant -->
1818
<Title>Microsoft Authentication Library Test Dependencies</Title>

0 commit comments

Comments
 (0)