Skip to content
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.

Sign up for GitHub

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

Fix WPF application framework re-enable bug #9256

Merged
merged 6 commits into from
Oct 24, 2023
Merged

Fix WPF application framework re-enable bug #9256

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9e98804
remove application framework property if re-enabled
haileymck Aug 29, 2023
c5f54d9
remove application framework property if re-enabled
haileymck Aug 29, 2023
d873943
Merge branch 'wpf-application-framework-enable-disable' of https://gi…
haileymck Sep 7, 2023
6159f06
remove comment
haileymck Sep 7, 2023
57e1fee
update comments
haileymck Sep 11, 2023
6166e48
PR comments
haileymck Oct 11, 2023
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
48 changes: 33 additions & 15 deletions ...InterceptedProjectProperties/ApplicationPropertyPage/ApplicationFrameworkValueProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.

using Microsoft.Build.Construction;
using Microsoft.VisualStudio.ProjectSystem.VS;
using Microsoft.VisualStudio.ProjectSystem.VS.WindowsForms;
using static Microsoft.VisualStudio.ProjectSystem.Properties.PropertyNames;
Expand Down Expand Up @@ -33,21 +34,24 @@ internal sealed class ApplicationFrameworkValueProvider : InterceptingPropertyVa
private readonly UnconfiguredProject _project;
private readonly IProjectItemProvider _sourceItemsProvider;
private readonly IMyAppFileAccessor _myAppXmlFileAccessor;
private readonly IProjectAccessor _projectAccessor;

[ImportingConstructor]
public ApplicationFrameworkValueProvider(
UnconfiguredProject project,
[Import(ExportContractNames.ProjectItemProviders.SourceFiles)] IProjectItemProvider sourceItemsProvider,
IMyAppFileAccessor myAppXamlFileAccessor)
IMyAppFileAccessor myAppXamlFileAccessor,
IProjectAccessor projectAccessor)
{
_project = project;
_sourceItemsProvider = sourceItemsProvider;
_myAppXmlFileAccessor = myAppXamlFileAccessor;
_projectAccessor = projectAccessor;
}

public override async Task<string?> OnSetPropertyValueAsync(string propertyName, string unevaluatedPropertyValue, IProjectProperties defaultProperties, IReadOnlyDictionary<string, string>? dimensionalConditions = null)
{
if (propertyName == ApplicationFramework)
if (StringComparers.PropertyNames.Equals(propertyName, ApplicationFramework))
{
if (await IsWPFApplicationAsync(defaultProperties))
{
Expand All @@ -66,7 +70,7 @@ public ApplicationFrameworkValueProvider(

public override Task<string> OnGetEvaluatedPropertyValueAsync(string propertyName, string evaluatedPropertyValue, IProjectProperties defaultProperties)
{
if (propertyName == ApplicationFramework)
if (StringComparers.PropertyNames.Equals(propertyName, ApplicationFramework))
{
return GetPropertyValueAsync(defaultProperties);
}
Expand All @@ -78,7 +82,7 @@ public override Task<string> OnGetEvaluatedPropertyValueAsync(string propertyNam

public override Task<string> OnGetUnevaluatedPropertyValueAsync(string propertyName, string unevaluatedPropertyValue, IProjectProperties defaultProperties)
{
if (propertyName == ApplicationFramework)
if (StringComparers.PropertyNames.Equals(propertyName, ApplicationFramework))
{
return GetPropertyValueAsync(defaultProperties);
}
Expand Down Expand Up @@ -165,10 +169,11 @@ private async Task<bool> IsWPFApplicationAsync(IProjectProperties defaultPropert

if (startupObjectValue is not null)
{
string prefix = rootNamespace + ".";
// Use StringComparison.OrdinalIgnoreCase because VB is _not_ case-sensitive
if (startupObjectValue.StartsWith(rootNamespace + ".", StringComparison.OrdinalIgnoreCase))
if (startupObjectValue.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
{
startupObjectValue = startupObjectValue.Substring((rootNamespace + ".").Length);
startupObjectValue = startupObjectValue.Substring(prefix.Length);
}
await _myAppXmlFileAccessor.SetMainFormAsync(startupObjectValue);
}
Expand Down Expand Up @@ -207,17 +212,30 @@ private async Task<bool> IsWPFApplicationAsync(IProjectProperties defaultPropert
{
// Enabled

// Create the Application.xaml if it doesn't exist. We don't care about the path, we just need it to be created.
string? appXamlFilePath = await GetAppXamlRelativeFilePathAsync(create: true);
if (appXamlFilePath is not null)
string? appXamlFileName = Path.GetFileName(await GetAppXamlRelativeFilePathAsync(create: false));

// Project accessor to remove the ApplicationDefinition property if re-enabled
// Note: this code causes CPS tree validation warning in Debug builds only, but we are ignorning
await _projectAccessor.OpenProjectXmlForWriteAsync(_project, project =>
{
IEnumerable<IProjectItem> matchingItems = await _sourceItemsProvider.GetItemsAsync(NoneItemType, appXamlFilePath);
IProjectItem? appXamlItem = matchingItems.FirstOrDefault();
if (appXamlItem is not null)
foreach (ProjectItemGroupElement itemGroup in project.ItemGroups)
{
await appXamlItem.SetItemTypeAsync(ApplicationDefinitionItemType);
foreach (ProjectItemElement item in itemGroup.Items.ToList())
{
if (StringComparers.ItemTypes.Equals(item.ItemType, ApplicationDefinitionItemType))
{
itemGroup.RemoveChild(item);
}
else if (StringComparers.ItemTypes.Equals(item.ItemType, NoneItemType) && StringComparers.Paths.Equals(item.Include, appXamlFileName))
{
itemGroup.RemoveChild(item);
}
}
}
}
});

// Create the Application.xaml if it doesn't exist. We don't care about the path, we just need it to be created.
string? appXamlFilePath = await GetAppXamlRelativeFilePathAsync(create: true);

// Clear out the StartupObject if it has a value.
string? startupObject = await defaultProperties.GetUnevaluatedPropertyValueAsync(StartupObjectMSBuild);
Expand All @@ -237,7 +255,7 @@ private async Task<bool> IsWPFApplicationAsync(IProjectProperties defaultPropert
await defaultProperties.SetPropertyValueAsync(StartupObjectMSBuild, "Sub Main");
}

// Set the Application.xaml file's build action to None.
// Set the Application.xaml file's build action to None, which will also remove it from the ApplicationDefinition item group.
string? appXamlFilePath = await GetAppXamlRelativeFilePathAsync(create: false);
if (appXamlFilePath is not null)
{
Expand Down