From 5a780d19684f44de4956aaebfeb531b2d2666a31 Mon Sep 17 00:00:00 2001
From: azurepowershell <azurepowershell@ms.com>
Date: Fri, 10 May 2024 04:59:15 +0000
Subject: [PATCH] Sync tools folder from main branch to generation branch

---
 .azure-pipelines/util/analyze-steps.yml    | 2 +-
 .azure-pipelines/util/test-steps.yml       | 2 +-
 src/shared/ConfigKeys.cs                   | 1 +
 tools/Az/Az.psd1                           | 1 +
 tools/VersionController/MinimalVersion.csv | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/util/analyze-steps.yml b/.azure-pipelines/util/analyze-steps.yml
index 50a4fb11eb35..7c4bb145a22b 100644
--- a/.azure-pipelines/util/analyze-steps.yml
+++ b/.azure-pipelines/util/analyze-steps.yml
@@ -65,4 +65,4 @@ steps:
 
 - template: publish-artifacts-steps.yml
   parameters:
-    artifactName: analyze-${{ parameters.testFramework }}
+    artifactName: analyze-${{ parameters.testFramework }}-$(System.JobAttempt)
diff --git a/.azure-pipelines/util/test-steps.yml b/.azure-pipelines/util/test-steps.yml
index bd70b260529f..828ff47a9244 100644
--- a/.azure-pipelines/util/test-steps.yml
+++ b/.azure-pipelines/util/test-steps.yml
@@ -87,4 +87,4 @@ steps:
 
 - template: publish-artifacts-steps.yml
   parameters:
-    artifactName: test-${{ parameters.testFramework }}-${{ parameters.osName }}
+    artifactName: test-${{ parameters.testFramework }}-${{ parameters.osName }}-$(System.JobAttempt)
diff --git a/src/shared/ConfigKeys.cs b/src/shared/ConfigKeys.cs
index 6fa5b91b0af5..91f6d7edae81 100644
--- a/src/shared/ConfigKeys.cs
+++ b/src/shared/ConfigKeys.cs
@@ -37,5 +37,6 @@ internal static class ConfigKeys
         public const string CheckForUpgrade = "CheckForUpgrade";
         public const string EnvCheckForUpgrade = "AZUREPS_CHECK_FOR_UPGRADE";
         public const string DisplaySecretsWarning = "DisplaySecretsWarning";
+        public const string LoginExperienceV2 = "LoginExperienceV2";
     }
 }
diff --git a/tools/Az/Az.psd1 b/tools/Az/Az.psd1
index 50f80d848a28..db0a29889397 100644
--- a/tools/Az/Az.psd1
+++ b/tools/Az/Az.psd1
@@ -121,6 +121,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.19.0'; },
                @{ModuleName = 'Az.RedisCache'; RequiredVersion = '1.9.1'; }, 
                @{ModuleName = 'Az.RedisEnterpriseCache'; RequiredVersion = '1.2.1'; }, 
                @{ModuleName = 'Az.Relay'; RequiredVersion = '2.0.1'; }, 
+               @{ModuleName = 'Az.ResourceGraph'; RequiredVersion = '0.13.1'; }, 
                @{ModuleName = 'Az.ResourceMover'; RequiredVersion = '1.2.1'; }, 
                @{ModuleName = 'Az.Resources'; RequiredVersion = '6.16.2'; }, 
                @{ModuleName = 'Az.Security'; RequiredVersion = '1.6.2'; }, 
diff --git a/tools/VersionController/MinimalVersion.csv b/tools/VersionController/MinimalVersion.csv
index 1d3ef90e178a..7d729afb9c9b 100644
--- a/tools/VersionController/MinimalVersion.csv
+++ b/tools/VersionController/MinimalVersion.csv
@@ -1,2 +1,3 @@
 "Module","Minimal Version"
 "Az.DnsResolver","1.0.0"
+"Az.ResourceGraph","1.0.0"
\ No newline at end of file