Skip to content

Commit 5aef76f

Browse files
RyAuldRyAuld
committed
Merge main into Update-MI-Test-MI-For-Region-Lock-SFI branch
- Resolved merge conflict in ManagedIdentityImdsTests.cs - Preserved null SAMI test configuration for authentic system-assigned identity testing - Kept original client ID (8ef2ae5a-f349-4d36-bc0e-a567f2cc50f7) from branch for the fix - Adopted updated resource IDs and display names from main branch - Combined best of both branches: authentic SAMI testing with current lab infrastructure and original client ID fix
2 parents ed99733 + 3ea20b4 commit 5aef76f

File tree

182 files changed

+8564
-552
lines changed

Some content is hidden

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

182 files changed

+8564
-552
lines changed

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@
1919
<PackageVersion Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
2020
<!-- Should match Azure Functions runtime: https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/4456 -->
2121
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
22+
<PackageVersion Include="System.Formats.Asn1" Version="9.0.8" />
2223
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
2324
<PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
2425
<PackageVersion Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
2526
<PackageVersion Include="System.Runtime.Serialization.Json" Version="4.3.0" />
2627
<PackageVersion Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
28+
<PackageVersion Include="System.Security.Cryptography.Cng" Version="5.0.0" PrivateAssets="All" />
2729
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="4.5.0" />
2830
<PackageVersion Include="System.Security.SecureString" Version="4.3.0" />
2931
<PackageVersion Include="System.ServiceModel.Http" Version="4.5.3" />
@@ -73,7 +75,6 @@
7375
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.35.0" />
7476
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
7577
<PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />
76-
<PackageVersion Include="System.Security.Cryptography.Cng" Version="5.0.0" />
7778
<PackageVersion Include="System.Text.Json" Version="6.0.10" />
7879
<PackageVersion Include="System.Threading" Version="4.3.0" />
7980
<PackageVersion Include="System.Threading.Tasks" Version="4.3.0" />
@@ -82,6 +83,5 @@
8283
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
8384
<PackageVersion Include="System.Windows.Forms" Version="4.0.0" />
8485
<PackageVersion Include="CommandLineParser" Version="2.8.0" />
85-
<PackageVersion Include="System.Formats.Asn1" Version="9.0.0" />
8686
</ItemGroup>
8787
</Project>

‎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}") = "MacMauiAppWithBroker", "tes
194194
EndProject
195195
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacConsoleAppWithBroker", "tests\devapps\MacConsoleAppWithBroker\MacConsoleAppWithBroker.csproj", "{DBD18BC8-72E4-47D4-BD79-8DEBD9F2C0D0}"
196196
EndProject
197+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Identity.Client.MtlsPop", "src\client\Microsoft.Identity.Client.MtlsPop\Microsoft.Identity.Client.MtlsPop.csproj", "{3E1C29E5-6E67-D9B2-28DF-649A609937A2}"
198+
EndProject
197199
Global
198200
GlobalSection(SolutionConfigurationPlatforms) = preSolution
199201
Debug + MobileApps|Any CPU = Debug + MobileApps|Any CPU
@@ -1987,6 +1989,48 @@ Global
19871989
{DBD18BC8-72E4-47D4-BD79-8DEBD9F2C0D0}.Release|x64.Build.0 = Release|Any CPU
19881990
{DBD18BC8-72E4-47D4-BD79-8DEBD9F2C0D0}.Release|x86.ActiveCfg = Release|Any CPU
19891991
{DBD18BC8-72E4-47D4-BD79-8DEBD9F2C0D0}.Release|x86.Build.0 = Release|Any CPU
1992+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|Any CPU.ActiveCfg = Debug|Any CPU
1993+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|Any CPU.Build.0 = Debug|Any CPU
1994+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|ARM.ActiveCfg = Debug|Any CPU
1995+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|ARM.Build.0 = Debug|Any CPU
1996+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|ARM64.ActiveCfg = Debug|Any CPU
1997+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|ARM64.Build.0 = Debug|Any CPU
1998+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|iPhone.ActiveCfg = Debug|Any CPU
1999+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|iPhone.Build.0 = Debug|Any CPU
2000+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|iPhoneSimulator.ActiveCfg = Debug|Any CPU
2001+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|iPhoneSimulator.Build.0 = Debug|Any CPU
2002+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|x64.ActiveCfg = Debug|Any CPU
2003+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|x64.Build.0 = Debug|Any CPU
2004+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|x86.ActiveCfg = Debug|Any CPU
2005+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug + MobileApps|x86.Build.0 = Debug|Any CPU
2006+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2007+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
2008+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|ARM.ActiveCfg = Debug|Any CPU
2009+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|ARM.Build.0 = Debug|Any CPU
2010+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|ARM64.ActiveCfg = Debug|Any CPU
2011+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|ARM64.Build.0 = Debug|Any CPU
2012+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
2013+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|iPhone.Build.0 = Debug|Any CPU
2014+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
2015+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
2016+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|x64.ActiveCfg = Debug|Any CPU
2017+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|x64.Build.0 = Debug|Any CPU
2018+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|x86.ActiveCfg = Debug|Any CPU
2019+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Debug|x86.Build.0 = Debug|Any CPU
2020+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
2021+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|Any CPU.Build.0 = Release|Any CPU
2022+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|ARM.ActiveCfg = Release|Any CPU
2023+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|ARM.Build.0 = Release|Any CPU
2024+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|ARM64.ActiveCfg = Release|Any CPU
2025+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|ARM64.Build.0 = Release|Any CPU
2026+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|iPhone.ActiveCfg = Release|Any CPU
2027+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|iPhone.Build.0 = Release|Any CPU
2028+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
2029+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
2030+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|x64.ActiveCfg = Release|Any CPU
2031+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|x64.Build.0 = Release|Any CPU
2032+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|x86.ActiveCfg = Release|Any CPU
2033+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2}.Release|x86.Build.0 = Release|Any CPU
19902034
EndGlobalSection
19912035
GlobalSection(SolutionProperties) = preSolution
19922036
HideSolutionNode = FALSE
@@ -2045,6 +2089,7 @@ Global
20452089
{97995B86-AA0F-3AF9-DA40-85A6263E4391} = {9B0B5396-4D95-4C15-82ED-DC22B5A3123F}
20462090
{AEF6BB00-931F-4638-955D-24D735625C34} = {34BE693E-3496-45A4-B1D2-D3A0E068EEDB}
20472091
{DBD18BC8-72E4-47D4-BD79-8DEBD9F2C0D0} = {34BE693E-3496-45A4-B1D2-D3A0E068EEDB}
2092+
{3E1C29E5-6E67-D9B2-28DF-649A609937A2} = {1A37FD75-94E9-4D6F-953A-0DABBD7B49E9}
20482093
EndGlobalSection
20492094
GlobalSection(ExtensibilityGlobals) = postSolution
20502095
SolutionGuid = {020399A9-DC27-4B82-9CAA-EF488665AC27}

‎build/template-pack-and-sign-all-nugets.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ steps:
4444
ProjectRootPath: '$(Build.SourcesDirectory)\$(MsalSourceDir)src\client'
4545
AssemblyName: 'Microsoft.Identity.Client.Extensions.Msal'
4646

47+
# Sign binary and pack Microsoft.Identity.Client.MtlsPop
48+
- template: template-pack-and-sign-nuget.yaml
49+
parameters:
50+
BuildConfiguration: ${{ parameters.BuildConfiguration }}
51+
ProjectRootPath: '$(Build.SourcesDirectory)\$(MsalSourceDir)src\client'
52+
AssemblyName: 'Microsoft.Identity.Client.MtlsPop'
53+
4754
# Copy all packages out to staging
4855
- task: CopyFiles@2
4956
displayName: 'Copy Files to: $(Build.ArtifactStagingDirectory)\packages'

‎build/template-run-mi-e2e-azurearc.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ steps:
3737
codeCoverageEnabled: false
3838
failOnMinTestsNotRun: true
3939
minimumExpectedTests: '1'
40-
testFiltercriteria: 'TestCategory=MI_E2E_AzureArc'
40+
testFiltercriteria: '(TestCategory=MI_E2E_AzureArc|TestCategory=MI_E2E_KeyAcquisition_KeyGuard)'

‎build/template-run-mi-e2e-imds.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ steps:
4747
runInParallel: false
4848
failOnMinTestsNotRun: true
4949
minimumExpectedTests: '1'
50-
testFiltercriteria: 'TestCategory=MI_E2E_Imds'
50+
testFiltercriteria: '(TestCategory=MI_E2E_Imds|TestCategory=MI_E2E_KeyAcquisition_Hardware)'

‎prototype/MsiV2DemoApp/MsiV2DemoApp.csproj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.Identity.Client" />
12+
<PackageReference Include="Microsoft.Identity.Client.MtlsPop" />
13+
</ItemGroup>
14+
15+
</Project>

0 commit comments

Comments
 (0)