Copy testbed in pipeline; initialize signal handler in server process; use explicit test package parameter in tests

Author: JohnMcPMS

azure-pipelines.yml

@@ -213,6 +213,7 @@ jobs:
       Contents: |
         AppInstallerCLIE2ETests\**
         AppInstallerCLITests\**
+        ComInprocTestbed\**
         Microsoft.Management.Configuration\**
         Microsoft.Management.Configuration.UnitTests\**
         Microsoft.Management.Configuration.OutOfProc\**

src/AppInstallerCLICore/Public/ShutdownMonitoring.h

@@ -71,7 +71,7 @@ namespace AppInstaller::ShutdownMonitoring
         using ShutdownCompleteCallback = void (*)();
 
         // Initializes the monitoring system and sets up a callback to be invoked when shutdown is completed.
-        static void Initialize(ShutdownCompleteCallback callback);
+        static void Initialize(ShutdownCompleteCallback callback, bool createTerminationSignalHandler = true);
 
         // "Interface" for a single component to synchronize with.
         struct ComponentSystem

src/AppInstallerCLICore/ShutdownMonitoring.cpp

@@ -286,9 +286,16 @@ namespace AppInstaller::ShutdownMonitoring
         }
     }
 
-    void ServerShutdownSynchronization::Initialize(ShutdownCompleteCallback callback)
+    void ServerShutdownSynchronization::Initialize(ShutdownCompleteCallback callback, bool createTerminationSignalHandler)
     {
         Instance().m_callback = callback;
+
+        // Force the creation of the TerminationSignalHandler singleton so that the process can listen for termination signals even if
+        // it never attempts to run anything that explicitly registers for cancellation callbacks.
+        if (createTerminationSignalHandler)
+        {
+            TerminationSignalHandler::Instance();
+        }
     }
 
     void ServerShutdownSynchronization::AddComponent(const ComponentSystem& component)

src/AppInstallerCLIE2ETests/Constants.cs

@@ -33,6 +33,7 @@ public class Constants
         public const string SkipTestSourceParameter = "SkipTestSource";
         public const string ForcedExperimentalFeaturesParameter = "ForcedExperimentalFeatures";
         public const string InprocTestbedPathParameter = "InprocTestbedPath";
+        public const string InprocTestbedUseTestPackageParameter = "InprocTestbedUseTestPackage";
 
         // Test Sources
         public const string DefaultWingetSourceName = @"winget";

src/AppInstallerCLIE2ETests/Helpers/TestSetup.cs

@@ -31,6 +31,7 @@ private TestSetup()
             this.VerboseLogging = this.InitializeBoolParam(Constants.VerboseLoggingParameter, true);
             this.LooseFileRegistration = this.InitializeBoolParam(Constants.LooseFileRegistrationParameter);
             this.SkipTestSource = this.InitializeBoolParam(Constants.SkipTestSourceParameter, this.IsDefault);
+            this.InprocTestbedUseTestPackage = this.InitializeBoolParam(Constants.InprocTestbedUseTestPackageParameter);
 
             // For packaged context, default to AppExecutionAlias
             this.AICLIPath = this.InitializeStringParam(Constants.AICLIPathParameter, this.PackagedContext ? "WinGetDev.exe" : TestCommon.GetTestFile("winget.exe"));
@@ -136,6 +137,11 @@ public static TestSetup Parameters
         /// </summary>
         public string InprocTestbedPath { get; }
 
+        /// <summary>
+        /// Gets a value indicating whether to use the test package or not.
+        /// </summary>
+        public bool InprocTestbedUseTestPackage { get; }
+
         /// <summary>
         /// Gets a value indicating whether to skip creating test source.
         /// </summary>

src/AppInstallerCLIE2ETests/InprocTestbedTests.cs

@@ -75,11 +75,10 @@ public void OneTimeSetup()
             if (string.IsNullOrWhiteSpace(this.InprocTestbedPath))
             {
                 string assemblyLocation = Assembly.GetExecutingAssembly().Location;
-                this.InprocTestbedPath = Path.Combine(Path.GetDirectoryName(assemblyLocation), "..\\ComInprocTestbed\\ComInprocTestbed.exe");
+                this.InprocTestbedPath = Path.Join(Path.GetDirectoryName(assemblyLocation), "..\\ComInprocTestbed\\ComInprocTestbed.exe");
             }
 
-            // If we are using the test source, target a package in it
-            if (!TestSetup.Parameters.SkipTestSource)
+            if (TestSetup.Parameters.InprocTestbedUseTestPackage)
             {
                 this.TargetPackageInformation = $"-pkg {Constants.ExeInstallerPackageId} -src {Constants.TestSourceName} -url {Constants.TestSourceUrl}";
             }

templates/e2e-test.template.yml

@@ -33,6 +33,7 @@ steps:
                                       -PowerShellModulePath $(buildOutDir)\PowerShell\Microsoft.WinGet.Client\Microsoft.WinGet.Client.psd1
                                       -LocalServerCertPath $(Agent.TempDirectory)\servercert.cer
                                       -SkipTestSource true
+                                      -InprocTestbedUseTestPackage true
                                       -ForcedExperimentalFeatures ${{ parameters.experimentalFeatures }}'
       ${{ else }}:
           overrideTestrunParameters: '-PackagedContext false
@@ -41,6 +42,7 @@ steps:
                                       -PowerShellModulePath $(buildOutDir)\PowerShell\Microsoft.WinGet.Client\Microsoft.WinGet.Client.psd1
                                       -LocalServerCertPath $(Agent.TempDirectory)\servercert.cer
                                       -SkipTestSource true
+                                      -InprocTestbedUseTestPackage true
                                       -ForcedExperimentalFeatures ${{ parameters.experimentalFeatures }}'
 
   - task: CmdLine@2