Merge pull request #495 from tonyhallett/fix-no-mscodecoverage-non-sdk-style

different behaviour for non sdk style for IVsBuildPropertyStorage ?

Author: tonyhallett

SharedProject/Core/MsTestPlatform/CodeCoverage/ProjectRunSettingsGenerator.cs

@@ -7,6 +7,7 @@
 using System.Linq;
 using FineCodeCoverage.Core.Utilities;
 using System.Xml.Linq;
+using FineCodeCoverage.Output;
 
 namespace FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage
 {
@@ -15,16 +16,19 @@ internal class ProjectRunSettingsGenerator : IProjectRunSettingsGenerator
     {
         private readonly IFileUtil fileUtil;
         private readonly IVsRunSettingsWriter vsRunSettingsWriter;
+        private readonly ILogger logger;
         private const string fccGeneratedRunSettingsSuffix = "fcc-mscodecoverage-generated";
 
         [ImportingConstructor]
         public ProjectRunSettingsGenerator(
             IFileUtil fileUtil,
-            IVsRunSettingsWriter vsRunSettingsWriter
+            IVsRunSettingsWriter vsRunSettingsWriter,
+            ILogger logger
         )
         {
             this.fileUtil = fileUtil;
             this.vsRunSettingsWriter = vsRunSettingsWriter;
+            this.logger = logger;
         }
 
         public Task RemoveGeneratedProjectSettingsAsync(IEnumerable<ICoverageProject> coverageProjects)
@@ -43,7 +47,7 @@ public Task WriteProjectsRunSettingsAsync(IEnumerable<ICoverageProjectRunSetting
                 {
                     var coverageProject = coverageProjectRunSettings.CoverageProject;
                     var projectRunSettingsFilePath = GeneratedProjectRunSettingsFilePath(coverageProject);
-                    return WriteProjectRunSettingsAsync(coverageProject.Id, projectRunSettingsFilePath, coverageProjectRunSettings.RunSettings);
+                    return WriteProjectRunSettingsAsync(coverageProject.Id, coverageProject.ProjectName, projectRunSettingsFilePath, coverageProjectRunSettings.RunSettings);
                 })
             );
 
@@ -54,13 +58,18 @@ internal static string GeneratedProjectRunSettingsFilePath(ICoverageProject cove
             return Path.Combine(coverageProject.CoverageOutputFolder, $"{coverageProject.ProjectName}-{fccGeneratedRunSettingsSuffix}.runsettings");
         }
 
-        private async Task WriteProjectRunSettingsAsync(Guid projectGuid, string projectRunSettingsFilePath, string projectRunSettings)
+        private async Task WriteProjectRunSettingsAsync(Guid projectGuid,string projectName, string projectRunSettingsFilePath, string projectRunSettings)
         {
             var ok = await vsRunSettingsWriter.WriteRunSettingsFilePathAsync(projectGuid, projectRunSettingsFilePath);
             if (ok)
             {
                 projectRunSettings = XDocument.Parse(projectRunSettings).FormatXml();
                 fileUtil.WriteAllText(projectRunSettingsFilePath, projectRunSettings);
+                logger.Log($"runsettings written to {projectRunSettingsFilePath}", projectRunSettings);
+            }
+            else
+            {
+                logger.Log($"Issue writing runsettings for {projectName}");
             }
         }
 

SharedProject/Core/Utilities/ProjectFilePropertyWriter.cs

@@ -13,14 +13,14 @@ public async System.Threading.Tasks.Task<bool> WritePropertyAsync(IVsHierarchy p
             await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             if (projectHierarchy is IVsBuildPropertyStorage vsBuildPropertyStorage)
             {
-                if(vsBuildPropertyStorage.GetPropertyValue(propertyName, string.Empty, (uint)_PersistStorageType.PST_PROJECT_FILE, out var v) == VSConstants.S_OK)
+                var result = vsBuildPropertyStorage.GetPropertyValue(propertyName, string.Empty, (uint)_PersistStorageType.PST_PROJECT_FILE, out var v);
+                if (result == VSConstants.S_OK && v == value)
                 {
-                    if (v == value)
-                    {
-                        return true;
-                    }
-                    return vsBuildPropertyStorage.SetPropertyValue(propertyName, string.Empty, (uint)_PersistStorageType.PST_PROJECT_FILE, value) == VSConstants.S_OK;
+                    return true;
                 }
+                
+                return vsBuildPropertyStorage.SetPropertyValue(propertyName, string.Empty, (uint)_PersistStorageType.PST_PROJECT_FILE, value) == VSConstants.S_OK;
+                
             }
 
             return false;