backup different recommended for net framework

Author: tonyhallett

FineCodeCoverageTests/MsCodeCoverage/RunSettingsTemplate_Tests.cs

@@ -107,7 +107,7 @@ public void Should_Be_Replaceable_With_Recommended_You_Do_Not_Change_Elements_Wh
                 </DataCollectionRunSettings>
             </RunSettings>";
 
-            var result = runSettingsTemplate.ReplaceTemplate(template, replacements);
+            var result = runSettingsTemplate.ReplaceTemplate(template, replacements, true);
 
             XmlAssert.NoXmlDifferences(result.Replaced, expected);
         }
@@ -117,7 +117,7 @@ public void Should_Be_ReplacedTestAdapter_When_Template_Has_The_FCC_TestAdapter_
         {
             var runSettingsTemplate = new RunSettingsTemplate();
             var template = runSettingsTemplate.ToString();
-            Assert.True(runSettingsTemplate.ReplaceTemplate(template, new RunSettingsTemplateReplacements()).ReplacedTestAdapter);
+            Assert.True(runSettingsTemplate.ReplaceTemplate(template, new RunSettingsTemplateReplacements(), true).ReplacedTestAdapter);
         }
 
         [Test]
@@ -132,7 +132,7 @@ public void Should_Be_ReplacedTestAdapter_False_When_Custom_Template_Does_Not_Ha
                 </RunSettings>
             ";
             var configuredCustomTemplate = runSettingsTemplate.ConfigureCustom(customTemplate);
-            Assert.False(runSettingsTemplate.ReplaceTemplate(configuredCustomTemplate, new RunSettingsTemplateReplacements()).ReplacedTestAdapter);
+            Assert.False(runSettingsTemplate.ReplaceTemplate(configuredCustomTemplate, new RunSettingsTemplateReplacements(), true).ReplacedTestAdapter);
         }
 
         [TestCase("%fcc_testadapter%", true)]
@@ -185,7 +185,7 @@ public void Should_Not_Add_Recommended_You_Do_Not_Change_Elements_When_Provided(
             </RunSettings>";
 
             var runSettingsTemplate = new RunSettingsTemplate();
-            var result = runSettingsTemplate.ReplaceTemplate(template, new RunSettingsTemplateReplacements());
+            var result = runSettingsTemplate.ReplaceTemplate(template, new RunSettingsTemplateReplacements(), true);
 
             XmlAssert.NoXmlDifferences(result.Replaced, template);
 

FineCodeCoverageTests/MsCodeCoverage/TemplatedRunSettingsService_Tests.cs

@@ -44,7 +44,7 @@ public async Task Should_Create_Run_Settings_From_Template()
             mockRunSettingsTemplate.Verify(
                 runSettingsTemplate => runSettingsTemplate.ReplaceTemplate(
                     "<MockRunSettingsTemplate/>",
-                    runSettingsTemplateReplacements)
+                    runSettingsTemplateReplacements, It.IsAny<bool>())
             );
 
         }
@@ -73,7 +73,7 @@ public async Task Should_Create_Run_Settings_From_Configured_Custom_Template_If_
             mockRunSettingsTemplate.Verify(
                 runSettingsTemplate => runSettingsTemplate.ReplaceTemplate(
                     "<ConfiguredCustom/>",
-                    runSettingsTemplateReplacements)
+                    runSettingsTemplateReplacements, It.IsAny<bool>())
             );
         }
 
@@ -148,7 +148,7 @@ public async Task Should_Return_A_Result_With_No_ExceptionReason_When_No_Excepti
             var mockRunSettingsTemplate = autoMocker.GetMock<IRunSettingsTemplate>();
             mockRunSettingsTemplate.SetupSequence(
                 runSettingsTemplate =>
-                runSettingsTemplate.ReplaceTemplate(It.IsAny<string>(), It.IsAny<IRunSettingsTemplateReplacements>())
+                runSettingsTemplate.ReplaceTemplate(It.IsAny<string>(), It.IsAny<IRunSettingsTemplateReplacements>(), It.IsAny<bool>())
             ).Returns(
                 new TemplateReplaceResult
                 {
@@ -202,7 +202,7 @@ private void SetupReplaceResult(ITemplateReplacementResult templateReplacementRe
             var mockRunSettingsTemplate = autoMocker.GetMock<IRunSettingsTemplate>();
             mockRunSettingsTemplate.Setup(
                 runSettingsTemplate =>
-                runSettingsTemplate.ReplaceTemplate(It.IsAny<string>(), It.IsAny<IRunSettingsTemplateReplacements>())
+                runSettingsTemplate.ReplaceTemplate(It.IsAny<string>(), It.IsAny<IRunSettingsTemplateReplacements>(), It.IsAny<bool>())
             ).Returns(templateReplacementResult);
         }
 

SharedProject/Core/MsTestPlatform/CodeCoverage/IRunSettingsTemplate.cs

@@ -11,7 +11,10 @@ internal interface ITemplateReplacementResult
 
     internal interface IRunSettingsTemplate
     {
-        ITemplateReplacementResult ReplaceTemplate(string runSettingsTemplate, IRunSettingsTemplateReplacements replacements);
+        ITemplateReplacementResult ReplaceTemplate(
+            string runSettingsTemplate, 
+            IRunSettingsTemplateReplacements replacements, 
+            bool isNetFrameworkProject);
         string Replace(string templatedXml, IRunSettingsTemplateReplacements replacements);
 
         string ConfigureCustom(string runSettingsTemplate);

SharedProject/Core/MsTestPlatform/CodeCoverage/RunSettingsTemplate.cs

@@ -43,14 +43,22 @@ private class ReplacementLookups : IRunSettingsTemplateReplacements
 
         private const string fccMarkerElementName = "FCCGenerated";
 
-        private readonly List<(string elementName, string value)> recommendedYouDoNotChangeElementsDetails = new List<(string elementName, string value)>
+        private readonly List<(string elementName, string value)> recommendedYouDoNotChangeElementsNetCore = new List<(string elementName, string value)>
         {
             ("UseVerifiableInstrumentation", "True"),
             ("AllowLowIntegrityProcesses", "True"),
             ("CollectFromChildProcesses", "True"),
             ("CollectAspDotNet", "False")
         };
 
+        private readonly List<(string elementName, string value)> recommendedYouDoNotChangeElementsNetFramework = new List<(string elementName, string value)>
+        {
+            ("UseVerifiableInstrumentation", "False"),
+            ("AllowLowIntegrityProcesses", "True"),
+            ("CollectFromChildProcesses", "True"),
+            ("CollectAspDotNet", "False")
+        };
+
         private class TemplateReplaceResult : ITemplateReplacementResult
         {
             public string Replaced { get; set; }
@@ -153,24 +161,29 @@ public override string ToString()
             return template;
         }
 
-        public ITemplateReplacementResult ReplaceTemplate(string runSettingsTemplate, IRunSettingsTemplateReplacements replacements)
+        public ITemplateReplacementResult ReplaceTemplate(
+            string runSettingsTemplate, 
+            IRunSettingsTemplateReplacements replacements, 
+            bool isNetFramework
+        )
         {
             var replacedTestAdapter = HasReplaceableTestAdapter(runSettingsTemplate);
             var replacedRunSettingsTemplate = Replace(runSettingsTemplate, replacements);
 
             return new TemplateReplaceResult
             {
                 ReplacedTestAdapter = replacedTestAdapter,
-                Replaced = AddRecommendedYouDoNotChangeElementsIfNotProvided(replacedRunSettingsTemplate)
+                Replaced = AddRecommendedYouDoNotChangeElementsIfNotProvided(replacedRunSettingsTemplate,isNetFramework)
             };
         }
 
-        private string AddRecommendedYouDoNotChangeElementsIfNotProvided(string replacedRunSettingsTemplate)
+        private string AddRecommendedYouDoNotChangeElementsIfNotProvided(string replacedRunSettingsTemplate, bool isNetFramework)
         {
             var templateDocument = XDocument.Parse(replacedRunSettingsTemplate);
             var msDataCollectorCodeCoverageElement = GetMsDataCollectorCodeCoverageElement(templateDocument);
             if (msDataCollectorCodeCoverageElement != null)
             {
+                var recommendedYouDoNotChangeElementsDetails = isNetFramework ? recommendedYouDoNotChangeElementsNetFramework : recommendedYouDoNotChangeElementsNetCore;
                 foreach (var recommendedYouDoNotChangeElementDetails in recommendedYouDoNotChangeElementsDetails)
                 {
                     var elementName = recommendedYouDoNotChangeElementDetails.elementName;

SharedProject/Core/MsTestPlatform/CodeCoverage/TemplatedRunSettingsService.cs

@@ -164,7 +164,7 @@ private ITemplateReplacementResult ReplaceTemplate(ICoverageProject coverageProj
         {
             var replacements = runSettingsTemplateReplacementsFactory.Create(coverageProject, fccMsTestAdapterPath);
 
-            return this.runSettingsTemplate.ReplaceTemplate(runSettingsTemplate, replacements);
+            return this.runSettingsTemplate.ReplaceTemplate(runSettingsTemplate, replacements, coverageProject.IsDotNetFramework);
         }
 
         public Task CleanUpAsync(List<ICoverageProject> coverageProjects)