Skip to content

Commit ed76c68

Browse files
trwalketrwalke
authored
Merge branch 'main' into trwalke/addGhActionForIssues
2 parents 52a3945 + 9e18cb3 commit ed76c68

72 files changed

Lines changed: 1044 additions & 203 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/benchmark-action.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ jobs:
2727
- uses: actions/setup-dotnet@v4
2828
with:
2929
dotnet-version: '8.0.x'
30+
- name: Restore NuGet packages
31+
run: dotnet restore tests/Microsoft.Identity.Test.Performance
3032
- name: Run benchmark
31-
run: cd tests/Microsoft.Identity.Test.Performance && dotnet run -c release -f net8.0 --exporters json
33+
run: cd tests/Microsoft.Identity.Test.Performance && dotnet run --no-restore -c release -f net8.0 --exporters json
3234

3335
- name: Download previous benchmark data
3436
uses: actions/cache@v3

‎.github/workflows/deploy-managed-identity-webapi.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,23 @@ on:
44
push:
55
branches:
66
- main
7+
pull_request:
8+
paths:
9+
- '.github/workflows/deploy-managed-identity-webapi.yml'
10+
- 'src/client/Microsoft.Identity.Client/ManagedIdentity/**'
711

812
jobs:
913
build-and-deploy:
1014
runs-on: ubuntu-latest
15+
env:
16+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
1117

1218
steps:
1319
- name: Checkout code
14-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
1521

1622
- name: Setup .NET
17-
uses: actions/setup-dotnet@v4
23+
uses: actions/setup-dotnet@v5
1824
with:
1925
dotnet-version: '8.0.x'
2026

@@ -31,7 +37,7 @@ jobs:
3137
run: dotnet publish -c Release -o ${{github.workspace}}/publish
3238

3339
- name: Deploy to Azure Web App
34-
uses: azure/webapps-deploy@v3
40+
uses: azure/webapps-deploy@v2
3541
with:
3642
app-name: 'msalmsi'
3743
publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
4.83.3
2+
======
3+
4+
### New Features
5+
- Added support for User Federated Identity Credential (UserFIC) scenarios through the `IByUserFederatedIdentityCredential` interface and `user_fic` grant type. [#5802](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5802)
6+
7+
### Changes
8+
- Updated NativeInterop to version 0.20.3. [#5866](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5866)
9+
10+
### Bug Fixes
11+
- Fixed response handling in `HttpListenerInterceptor.cs` to ensure the full response is properly closed. [#5478](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5478)
12+
- Fixed macOS detection to include maccatalyst target in desktop platform checks.[#5882](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5882)
13+
14+
### Infrastructure & Dependencies
15+
- Extracted reusable MSAL test infrastructure into `Microsoft.Identity.Lab.API`. [#5864](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/pull/5864)
16+
117
4.83.1
218
======
319

‎Directory.Packages.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<!-- Version of the Microsoft.Identity.Client.NativeInterop package. -->
5-
<MSALRuntimeNativeInteropVersion>0.19.4</MSALRuntimeNativeInteropVersion>
5+
<MSALRuntimeNativeInteropVersion>0.20.4</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>

‎LibsAndSamples.sln‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Identity.Client.K
194194
EndProject
195195
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Identity.Lab.Api", "src\client\Microsoft.Identity.Lab.Api\Microsoft.Identity.Lab.Api.csproj", "{5EC9968E-2CB0-0CBB-6FBA-CBEEBB26FCEA}"
196196
EndProject
197+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Identity.Test.Common", "tests\Microsoft.Identity.Test.Common\Microsoft.Identity.Test.Common.csproj", "{F484DC37-BB44-45B5-A78E-06819D261F53}"
198+
EndProject
197199
Global
198200
GlobalSection(SolutionConfigurationPlatforms) = preSolution
199201
Debug + MobileApps|Any CPU = Debug + MobileApps|Any CPU
@@ -1988,6 +1990,48 @@ Global
19881990
{5EC9968E-2CB0-0CBB-6FBA-CBEEBB26FCEA}.Release|x64.Build.0 = Release|Any CPU
19891991
{5EC9968E-2CB0-0CBB-6FBA-CBEEBB26FCEA}.Release|x86.ActiveCfg = Release|Any CPU
19901992
{5EC9968E-2CB0-0CBB-6FBA-CBEEBB26FCEA}.Release|x86.Build.0 = Release|Any CPU
1993+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|Any CPU.ActiveCfg = Debug + MobileApps|Any CPU
1994+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|Any CPU.Build.0 = Debug + MobileApps|Any CPU
1995+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|ARM.ActiveCfg = Debug + MobileApps|Any CPU
1996+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|ARM.Build.0 = Debug + MobileApps|Any CPU
1997+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|ARM64.ActiveCfg = Debug + MobileApps|Any CPU
1998+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|ARM64.Build.0 = Debug + MobileApps|Any CPU
1999+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|iPhone.ActiveCfg = Debug + MobileApps|Any CPU
2000+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|iPhone.Build.0 = Debug + MobileApps|Any CPU
2001+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|iPhoneSimulator.ActiveCfg = Debug + MobileApps|Any CPU
2002+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|iPhoneSimulator.Build.0 = Debug + MobileApps|Any CPU
2003+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|x64.ActiveCfg = Debug + MobileApps|Any CPU
2004+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|x64.Build.0 = Debug + MobileApps|Any CPU
2005+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|x86.ActiveCfg = Debug + MobileApps|Any CPU
2006+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug + MobileApps|x86.Build.0 = Debug + MobileApps|Any CPU
2007+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2008+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|Any CPU.Build.0 = Debug|Any CPU
2009+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|ARM.ActiveCfg = Debug|Any CPU
2010+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|ARM.Build.0 = Debug|Any CPU
2011+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|ARM64.ActiveCfg = Debug|Any CPU
2012+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|ARM64.Build.0 = Debug|Any CPU
2013+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|iPhone.ActiveCfg = Debug|Any CPU
2014+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|iPhone.Build.0 = Debug|Any CPU
2015+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
2016+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
2017+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|x64.ActiveCfg = Debug|Any CPU
2018+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|x64.Build.0 = Debug|Any CPU
2019+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|x86.ActiveCfg = Debug|Any CPU
2020+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Debug|x86.Build.0 = Debug|Any CPU
2021+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|Any CPU.ActiveCfg = Release|Any CPU
2022+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|Any CPU.Build.0 = Release|Any CPU
2023+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|ARM.ActiveCfg = Release|Any CPU
2024+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|ARM.Build.0 = Release|Any CPU
2025+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|ARM64.ActiveCfg = Release|Any CPU
2026+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|ARM64.Build.0 = Release|Any CPU
2027+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|iPhone.ActiveCfg = Release|Any CPU
2028+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|iPhone.Build.0 = Release|Any CPU
2029+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
2030+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
2031+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|x64.ActiveCfg = Release|Any CPU
2032+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|x64.Build.0 = Release|Any CPU
2033+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|x86.ActiveCfg = Release|Any CPU
2034+
{F484DC37-BB44-45B5-A78E-06819D261F53}.Release|x86.Build.0 = Release|Any CPU
19912035
EndGlobalSection
19922036
GlobalSection(SolutionProperties) = preSolution
19932037
HideSolutionNode = FALSE
@@ -2046,6 +2090,7 @@ Global
20462090
{CE282240-0806-EB91-87E4-D791DC86DEE8} = {34BE693E-3496-45A4-B1D2-D3A0E068EEDB}
20472091
{425EAEBE-595F-0037-6FDC-2D08D5184705} = {1A37FD75-94E9-4D6F-953A-0DABBD7B49E9}
20482092
{5EC9968E-2CB0-0CBB-6FBA-CBEEBB26FCEA} = {9B0B5396-4D95-4C15-82ED-DC22B5A3123F}
2093+
{F484DC37-BB44-45B5-A78E-06819D261F53} = {9B0B5396-4D95-4C15-82ED-DC22B5A3123F}
20492094
EndGlobalSection
20502095
GlobalSection(ExtensibilityGlobals) = postSolution
20512096
SolutionGuid = {020399A9-DC27-4B82-9CAA-EF488665AC27}

‎build/linux-install-deps.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if [ $PACKAGE_MANAGER == 'apt' ]; then
3838
x11-xserver-utils \
3939
xorg \
4040
libp11-kit-dev \
41-
libwebkit2gtk-4.0-dev
41+
libwebkit2gtk-4.1-dev
4242
fi
4343

4444
echo "Installing JavaBroker"

‎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

0 commit comments

Comments
 (0)