Added building sample to test

Author: JoshLozensky

1-WebApp-OIDC/1-3-AnyOrgOrPersonal/appsettings.json

@@ -1,4 +1,4 @@
-{
+{
   "AzureAd": {
     "Instance": "https://login.microsoftonline.com/",
     "Domain": "[Enter the domain of your tenant, e.g. contoso.onmicrosoft.com]",

UiTests/AnyOrgOrPersonalUiTest/AnyOrgOrPersonalTest.cs

@@ -24,8 +24,10 @@ public class AnyOrgOrPersonalTest : IClassFixture<InstallPlaywrightBrowserFixtur
         private const uint ClientPort = 44321;
         private const string TraceFileClassName = "OpenIDConnect";
         private const uint NumProcessRetries = 3;
+        private const string SampleSlnFileName = "1-3-AnyOrgOrPersonal.sln";
         private readonly LocatorAssertionsToBeVisibleOptions _assertVisibleOptions = new() { Timeout = 25000 };
         private readonly string _sampleAppPath = "1-WebApp-OIDC" + Path.DirectorySeparatorChar + "1-3-AnyOrgOrPersonal" + Path.DirectorySeparatorChar.ToString();
+        private readonly string _testAppsettingsPath = "UiTests" + Path.DirectorySeparatorChar + "AnyOrgOrPersonalUiTest" + Path.DirectorySeparatorChar.ToString() + TC.AppSetttingsDotJson;
         private readonly string _testAssemblyLocation = typeof(AnyOrgOrPersonalTest).Assembly.Location;
         private readonly ITestOutputHelper _output;
 
@@ -58,6 +60,9 @@ public async Task ChallengeUser_MicrosoftIdFlow_LocalApp_ValidEmailPasswordCreds
 
             try
             {
+                // Build the sample app with correct appsettings file.
+                UiTestHelpers.BuildSampleWithTestAppsettings(_testAssemblyLocation, _sampleAppPath, _testAppsettingsPath, SampleSlnFileName);
+
                 // Start the web app and api processes.
                 // The delay before starting client prevents transient devbox issue where the client fails to load the first time after rebuilding
                 var clientProcessOptions = new ProcessStartOptions(_testAssemblyLocation, _sampleAppPath, TC.s_oidcWebAppExe, clientEnvVars);

UiTests/AnyOrgOrPersonalUiTest/AnyOrgOrPersonalUiTest.csproj

@@ -26,7 +26,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.csproj" />
-    <ProjectReference Include="..\..\1-WebApp-OIDC\1-3-AnyOrgOrPersonal\WebApp-OpenIDConnect-DotNet.csproj" />
   </ItemGroup>
 
 </Project>

UiTests/Common/UiTestHelpers.cs

@@ -454,37 +454,32 @@ public static string GetRunningProcessAsString(Dictionary<string, Process>? proc
         /// </summary>
         /// <param name="path1">The path of the first file to swap</param>
         /// <param name="path2">The path of the file to swap it with</param>
-        public static void SwapFiles(string path1, string path2)
+        private static void SwapFiles(string path1, string path2)
         {
-            string tempFile = Path.GetTempFileName();
-            string file1Name = Path.GetFileName(path1);
-            string file2Name = Path.GetFileName(path2);
-            string file1Dir = Path.GetDirectoryName(path1);
-            string file2Dir = Path.GetDirectoryName(path2);
+            // Read the contents of both files
+            string file1Contents = File.ReadAllText(path1);
+            string file2Contents = File.ReadAllText(path2);
 
-            // Move file1 to tempFile
-            File.Move(path1, tempFile);
+            // Write the contents of file2 to file1
+            File.WriteAllText(path1, file2Contents);
 
-            // Move file2 to file1's original location and rename it to file1's name
-            File.Move(path2, Path.Combine(file1Dir, file1Name));
+            // Write the contents of file1 to file2
+            File.WriteAllText(path2, file1Contents);
 
-            // Move tempFile (original file1) to file2's original location and rename it to file2's name
-            File.Move(tempFile, Path.Combine(file2Dir, file2Name));
-
-            Console.WriteLine("Files swapped and renamed successfully.");
+            Console.WriteLine("File contents swapped successfully.");
         }
 
 
-        public static void RebuildSolution(string solutionPath)
+        private static void RebuildSolution(string solutionPath)
         {
             ProcessStartInfo startInfo = new ProcessStartInfo
             {
                 FileName = "dotnet",
-                Arguments = $"build {solutionPath} --no-incremental",
+                Arguments = $"build {solutionPath}",
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
                 UseShellExecute = false,
-                CreateNoWindow = true
+                CreateNoWindow = false
             };
 
             using (Process process = new Process())
@@ -502,15 +497,22 @@ public static void RebuildSolution(string solutionPath)
             Console.WriteLine("Solution rebuild initiated.");
         }
 
-        public static void BuildSampleWithTestAppsettings(string testAssemblyLocation, string appLocation, string testAppsettingsName)
+        public static void BuildSampleWithTestAppsettings(
+            string testAssemblyLocation, 
+            string appLocation, 
+            string testAppsettingsPathFromRepoRoot,
+            string solutionFileName
+            )
         {
             string appsettingsDirectory = GetAppsettingsDirectory(testAssemblyLocation, appLocation);
             string appsettingsPath = Path.Combine(appsettingsDirectory, TestConstants.AppSetttingsDotJson);
-            string testAppsettingsPath = Path.Combine(appsettingsDirectory, testAppsettingsName);
-            SwapFiles(appsettingsPath, testAppsettingsPath);
-            RebuildSolution(appsettingsDirectory);
+            string testAppsettingsPath = GetAppsettingsDirectory(testAssemblyLocation, testAppsettingsPathFromRepoRoot);
+
             SwapFiles(appsettingsPath, testAppsettingsPath);
 
+            try { RebuildSolution(appsettingsDirectory + solutionFileName); }
+            catch (Exception) { throw; }
+            finally { SwapFiles(appsettingsPath, testAppsettingsPath); }
         }
     }