Update rel/v2 with lab api/lab app changes (#2746)

* Updating lab api to 0.12.2 (#2744) * Updating to Lab.Api 0.12.2 * Updating keyvault target * Updating lab service connection * Fixing typo * Update --------- Co-authored-by: trwalke <trwalke@microsoft.com> * Updating constants for lab apps (#2745) * Updating constants * revert --------- Co-authored-by: trwalke <trwalke@microsoft.com> --------- Co-authored-by: trwalke <trwalke@microsoft.com>
AzureAD · Apr 5, 2024 · 9a576f7 · 9a576f7
1 parent 72a4388
commit 9a576f7
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/benchmark/Directory.Build.props b/benchmark/Directory.Build.props
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Common dependency versions">
-    <MicrosoftIdentityLabApiVersion>0.12.1</MicrosoftIdentityLabApiVersion>
+    <MicrosoftIdentityLabApiVersion>0.12.2</MicrosoftIdentityLabApiVersion>
     <BenchmarkDotNetVersion>0.13.12</BenchmarkDotNetVersion>
     <BenchmarkDotNetDiagnosticsWindowsVersion>0.13.12</BenchmarkDotNetDiagnosticsWindowsVersion>
 	</PropertyGroup>

diff --git a/build/template-install-dependencies.yaml b/build/template-install-dependencies.yaml
@@ -31,14 +31,14 @@ steps:
 # Install all secrets needed from KeyVault onto the build machine.
 
 - task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: buildautomation'
+  displayName: 'Azure Key Vault: msidlabs'
   inputs:
-    azureSubscription: '.NET Keyvault'
-    KeyVaultName: buildautomation
-    SecretsFilter: 'AzureADIdentityDivisionTestAgentCert'
+    azureSubscription: 'AuthSdkResourceManager'
+    KeyVaultName: 'msidlabs'
+    SecretsFilter: 'LabVaultAccessCert'
 
 - powershell: |
-   $kvSecretBytes = [System.Convert]::FromBase64String('$(AzureADIdentityDivisionTestAgentCert)')
+   $kvSecretBytes = [System.Convert]::FromBase64String('$(LabVaultAccessCert)')
    $certCollection = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2Collection
    $certCollection.Import($kvSecretBytes, $null, [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable)
 

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -32,7 +32,7 @@
     <!--CVE-2021-24112-->
     <SystemDrawingCommonVersion>5.0.3</SystemDrawingCommonVersion>
     <SystemManagementVersion>8.0.0</SystemManagementVersion>
-    <MicrosoftIdentityLabApiVersion>0.12.1</MicrosoftIdentityLabApiVersion>
+    <MicrosoftIdentityLabApiVersion>0.12.2</MicrosoftIdentityLabApiVersion>
 	</PropertyGroup>
 
   <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">

diff --git a/tests/Microsoft.Identity.Web.Test.Common/TestConstants.cs b/tests/Microsoft.Identity.Web.Test.Common/TestConstants.cs
@@ -104,15 +104,15 @@ public static class TestConstants
 
         // Constants for the lab
         public const string OBOClientKeyVaultUri = "TodoListServiceV2-OBO";
-        public const string ConfidentialClientKeyVaultUri = "https://buildautomation.vault.azure.net/secrets/AzureADIdentityDivisionTestAgentSecret/";
-        public const string ConfidentialClientId = "16dab2ba-145d-4b1b-8569-bf4b9aed4dc8";
+        public const string ConfidentialClientKeyVaultUri = "https://msidlabs.vault.azure.net/secrets/LabVaultAccessCert/";
+        public const string ConfidentialClientId = "f62c5ae3-bf3a-4af5-afa8-a68b800396e9";
         public const string ConfidentialClientLabTenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
         public const string OBOUser = "fIDLAB@msidlab4.com";
         public const string OBOClientSideClientId = "c0485386-1e9a-4663-bc96-7ab30656de7f";
         public static string[] s_oBOApiScope = new string[] { "api://f4aa5217-e87c-42b2-82af-5624dd14ee72/.default" };
-        public const string LabClientId = "16dab2ba-145d-4b1b-8569-bf4b9aed4dc8";
+        public const string LabClientId = "f62c5ae3-bf3a-4af5-afa8-a68b800396e9";
         public const string MSIDLabLabKeyVaultName = "https://msidlabs.vault.azure.net";
-        public const string AzureADIdentityDivisionTestAgentSecret = "AzureADIdentityDivisionTestAgentSecret";
+        public const string AzureADIdentityDivisionTestAgentSecret = "MSIDLABAccessSecret";
         public const string BuildAutomationKeyVaultName = "https://buildautomation.vault.azure.net/";
         public const string LabVaultAppId = "LabVaultAppID";
         public const string LabVaultAppSecret = "LabVaultAppSecret";

diff --git a/tools/CrossPlatformValidator/CrossPlatformValidation/Benchmark/Benchmark.csproj b/tools/CrossPlatformValidator/CrossPlatformValidation/Benchmark/Benchmark.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
-    <PackageReference Include="Microsoft.Identity.Lab.Api" Version="0.12.1" />
+    <PackageReference Include="Microsoft.Identity.Lab.Api" Version="0.12.2" />
 
   </ItemGroup>
 

diff --git a/tools/CrossPlatformValidator/CrossPlatformValidation/BenchmarkCSharp/BenchmarkCSharp.csproj b/tools/CrossPlatformValidator/CrossPlatformValidation/BenchmarkCSharp/BenchmarkCSharp.csproj
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
-    <PackageReference Include="Microsoft.Identity.Lab.Api" Version="0.12.1" />
+    <PackageReference Include="Microsoft.Identity.Lab.Api" Version="0.12.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(UseWilson7)' == 'true'">

diff --git a/...s/CrossPlatformValidator/CrossPlatformValidation/CSharpConsoleApp/CSharpConsoleApp.csproj b/...s/CrossPlatformValidator/CrossPlatformValidation/CSharpConsoleApp/CSharpConsoleApp.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Lab.Api" Version="0.12.1" />
+    <PackageReference Include="Microsoft.Identity.Lab.Api" Version="0.12.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...or/CrossPlatformValidation/CrossPlatformValidatorTests/CrossPlatformValidatorTests.csproj b/...or/CrossPlatformValidation/CrossPlatformValidatorTests/CrossPlatformValidatorTests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Lab.Api" Version="0.12.1" />
+    <PackageReference Include="Microsoft.Identity.Lab.Api" Version="0.12.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">