Merge release/2.2 into master

test/MusicStore.E2ETests/PublishAndRunTests.cs

@@ -16,14 +16,24 @@ namespace E2ETests
     {
         public static TestMatrix TestVariants
             => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
-                .WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461)
+                .WithTfms(Tfm.NetCoreApp22)
                 .WithAllApplicationTypes()
                 .WithAllAncmVersions()
                 .WithAllHostingModels()
                 .WithAllArchitectures();
 
+        // ANCM In-process cannot run on netcoreapp2.1 and below
+        public static TestMatrix TestVariantsWithoutInproc
+            => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
+                .WithTfms(Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461)
+                .WithAllApplicationTypes()
+                .WithAllAncmVersions()
+                .WithHostingModels(HostingModel.OutOfProcess)
+                .WithAllArchitectures();
+        
         [ConditionalTheory]
         [MemberData(nameof(TestVariants))]
+        [MemberData(nameof(TestVariantsWithoutInproc))]
         public async Task PublishAndRun_Test(TestVariant variant)
         {
             var testName = $"PublishAndRunTests_{variant}";

test/MusicStore.E2ETests/SmokeTests.cs

@@ -17,13 +17,23 @@ namespace E2ETests
     {
         public static TestMatrix TestVariants
             => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
-                .WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461)
+                .WithTfms(Tfm.NetCoreApp22)
                 .WithAllApplicationTypes()
                 .WithAllAncmVersions()
                 .WithAllHostingModels();
 
+        // ANCM In-process cannot run on netcoreapp2.1 and below
+        public static TestMatrix TestVariantsWithoutInproc
+            => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
+                .WithTfms(Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461)
+                .WithAllApplicationTypes()
+                .WithAllAncmVersions()
+                .WithHostingModels(HostingModel.OutOfProcess)
+                .WithAllArchitectures();
+
         [ConditionalTheory]
         [MemberData(nameof(TestVariants))]
+        [MemberData(nameof(TestVariantsWithoutInproc))]
         public async Task Smoke_Tests(TestVariant variant)
         {
             var testName = $"SmokeTestSuite_{variant}";