Merge branch 'master' into westin/csharp13

AzureAD · Nov 19, 2024 · 31b46e4 · 31b46e4
2 parents 2597983 + 36fac2f
commit 31b46e4
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -79,7 +79,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Common dependency versions">
-    <MicrosoftIdentityModelVersion Condition="'$(MicrosoftIdentityModelVersion)' == ''">8.1.2</MicrosoftIdentityModelVersion>
+    <MicrosoftIdentityModelVersion Condition="'$(MicrosoftIdentityModelVersion)' == ''">8.2.1</MicrosoftIdentityModelVersion>
     <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">4.66.1</MicrosoftIdentityClientVersion>
     <FxCopAnalyzersVersion>3.3.0</FxCopAnalyzersVersion>
     <SystemTextEncodingsWebVersion>4.7.2</SystemTextEncodingsWebVersion>

diff --git a/build/template-install-dependencies.yaml b/build/template-install-dependencies.yaml
@@ -3,6 +3,26 @@
 #install dotnet core
 
 steps:
+- task: UseDotNet@2
+  displayName: 'Use .NET SDK 3.1'
+  inputs:
+    version: 3.1.x
+
+- task: UseDotNet@2
+  displayName: 'Use .NET SDK 6.0.x'
+  inputs:
+    version: 6.0.x
+
+- task: UseDotNet@2
+  displayName: 'Use .NET SDK 7.0.x'
+  inputs:
+    version: 7.0.x
+
+- task: UseDotNet@2
+  displayName: 'Use .NET SDK 8.0.x'
+  inputs:
+    version: 8.0.x
+
 - task: UseDotNet@2
   displayName: 'Use .NET SDK 9.0.x'
   inputs:

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,13 @@
+3.4.0
+========
+- Updated to Microsoft.IdentityModel.* 8.2.1
+- Updated to Microsoft.Identity.Abstractions 7.2.0
+
+### New features
+- Add ROPC flow support for confidential client applications. See [3091](https://github.com/AzureAD/microsoft-identity-web/issues/3091), [3129](https://github.com/AzureAD/microsoft-identity-web/issues/3129), [3139](https://github.com/AzureAD/microsoft-identity-web/issues/3139).
+- Allow multi-tenant applications to specify the AppHomeTenantId to be used for client credentials. See [3121](https://github.com/AzureAD/microsoft-identity-web/issues/3121), [3132](https://github.com/AzureAD/microsoft-identity-web/pull/3132).
+- Update to use .NET 9 GA. See [3127](https://github.com/AzureAD/microsoft-identity-web/issues/3127).
+
 3.3.1
 ========
 - Updated to Microsoft.IdentityModel.* 8.2.0

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -28,7 +28,7 @@
     <MicrosoftApplicationInsightsAspNetCoreVersion>2.22.0</MicrosoftApplicationInsightsAspNetCoreVersion>
     <MicrosoftApplicationInsightsEventCounterCollectionVersion>2.22.0</MicrosoftApplicationInsightsEventCounterCollectionVersion>
     <MicrosoftExtensionsCachingStackExchangeRedisVersion>6.0.12</MicrosoftExtensionsCachingStackExchangeRedisVersion>
-    <MicrosoftPlaywrightVersion>1.36.0</MicrosoftPlaywrightVersion>
+    <MicrosoftPlaywrightVersion>1.48.0</MicrosoftPlaywrightVersion>
     <StackExchangeRedisVersion>2.2.4</StackExchangeRedisVersion>
     <!--CVE-2021-24112-->
     <SystemDrawingCommonVersion>5.0.3</SystemDrawingCommonVersion>

diff --git a/tests/E2E Tests/WebAppUiTests/WebAppUiTests.csproj b/tests/E2E Tests/WebAppUiTests/WebAppUiTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0; net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks); </TargetFrameworks>
     <AssemblyOriginatorKeyFile>../../../build/MSAL.snk</AssemblyOriginatorKeyFile>
     <IsPackable>false</IsPackable>