Skip to content

different behaviour for non sdk style for IVsBuildPropertyStorage ? #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using System.Linq;
using FineCodeCoverage.Core.Utilities;
using System.Xml.Linq;
using FineCodeCoverage.Output;

namespace FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage
{
Expand All @@ -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)
Expand All @@ -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);
})
);

Expand All @@ -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}");
}
}

Expand Down
12 changes: 6 additions & 6 deletions SharedProject/Core/Utilities/ProjectFilePropertyWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading