Fix handling of wildcard AssemblyVersion properties during markup compilation #2691

rladuca · 2020-03-02T23:24:39Z

…a wildcard string is detected in AssemblyVersion.

lindexi · 2020-03-05T09:11:25Z

Maybe we should fix the line break.

rladuca · 2020-03-05T17:15:28Z

Maybe we should fix the line break.

I think we need to sweep the repo and set some attributes to ensure we're all using the same line endings. I don't want to make single changes in this PR, for now I'll keep this as is and we'll make a choice and fixup the repo.

EDIT: The renormalization would be a bigger PR, so just going to fix this one file for now.

...Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs

…ilures.

...Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs

… on the AssemblyVersion. This allows for the error to be thrown once per MarkupCompile pass and won't present itself as an error at some point in the XAML, but rather as a general error with the AssemblyVersion.

...Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlParser.cs

rladuca · 2020-03-12T21:08:36Z

Moving this from WIP to actual, I think it's working pretty well right now.

rladuca · 2020-03-31T22:45:03Z

I've checked the following scenarios:

Normal build (Deterministic + non-wildcard AssemblyVersion)
WildCard Framework-Style (Non-Deterministic + wildcard AssemblyVersionAttribute)
WildCard Core-Style (Non-Deterministic + wildcard AssemblyVersion)
Various permutations of bad AssemblyVersion properties (1.1.x, 1.1.1x, etc)

Everything works as expected. The error is shown on a bad AssemblyVersion (assuming XAML compilation occurs). Without the fix, wildcard applications using AssemblyVersion crash as in the report. With the fix, they no longer crash. Behavior is the same in both normal scenarios and in AssemblyVersionAttribute scenarios (as far as I can tell).

C# does give a warning about wildcard AssemblyVersion properties:

 obj\Debug\netcoreapp5.0\PbtWildCardTest.AssemblyInfo.cs(16,59): warning CS7035: The specified version string does not
 conform to the recommended format - major.minor.build.revision [d:\wpf\PbtWildCardTest\PbtWildCardTest.csproj]

That seems to be the only difference between using the attribute and the msbuild property.

...Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/VersionHelper.cs

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/xlf/Strings.cs.xlf

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/VersionHelper.cs

ghost · 2020-04-01T16:37:12Z

Hello @rladuca!

Because this pull request has the auto_merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.

HClausing · 2020-10-21T00:50:06Z

Thanks @vatsan-madhavan !

Now I understand the correlation between these tags on csproj file and Application.LoadComponent() method.

vatsan-madhavan · 2020-10-21T17:21:51Z

@dotnet/wpf-developers Please write a nice doc for this and make it discoverable through public documentation so that the next person can learn about it more easily. Right now the only way to discover it is for someone in the know to make the correlation and point community-members to this PR and the associated issue.

rladuca and others added 3 commits February 19, 2020 14:14

Use empty version strings for generation of InitializeComponent when …

ed47999

…a wildcard string is detected in AssemblyVersion.

Some cleanup.

1dd77b9

Simplifying checks

93ef3d1

rladuca self-assigned this Mar 2, 2020

ghost requested a review from vatsan-madhavan March 2, 2020 23:24

ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Mar 2, 2020

ghost requested a review from SamBent March 2, 2020 23:24

rladuca added this to the 5.0 milestone Mar 2, 2020

Robert LaDuca added 2 commits March 2, 2020 15:28

Fixing bad push

1f8f31d

Fixing bad conditional

a702281

Update line endings

75edc7b

vatsan-madhavan requested changes Mar 6, 2020

View reviewed changes

...Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs Outdated Show resolved Hide resolved

Add parsing of AssemblyVersion and a new error for version parsing fa…

6daf54f

…ilures.

rladuca changed the title ~~Fix handling of wildcard AssemblyVersion properties during markup compilation~~ WIP: Fix handling of wildcard AssemblyVersion properties during markup compilation Mar 6, 2020

rladuca commented Mar 6, 2020

View reviewed changes

...Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs Outdated Show resolved Hide resolved

Merge latest from master

d7aba41

rladuca force-pushed the pbtwildcards branch from 6079222 to d7aba41 Compare March 6, 2020 22:00

Robert LaDuca added 3 commits March 6, 2020 14:08

Fixing line ending issues from merge

8e4d124

XLF updates

f7d9a34

weltkante reviewed Mar 9, 2020

View reviewed changes

...Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs Outdated Show resolved Hide resolved

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlParser.cs Outdated Show resolved Hide resolved

Fixing re-throws to preserve stack.

9230956

rladuca changed the title ~~WIP: Fix handling of wildcard AssemblyVersion properties during markup compilation~~ Fix handling of wildcard AssemblyVersion properties during markup compilation Mar 12, 2020

rladuca requested a review from vatsan-madhavan March 13, 2020 01:07

vatsan-madhavan approved these changes Mar 31, 2020

View reviewed changes

lindexi reviewed Apr 1, 2020

View reviewed changes

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/VersionHelper.cs Outdated Show resolved Hide resolved

rladuca added 2 commits April 1, 2020 09:29

Addressing feedback

a1f7a8f

Clarifying comments

2f7d0ff

rladuca added the auto_merge bot-command label Apr 1, 2020

Fixing issue with null or empty AssemblyVersion

ece1580

rladuca removed the auto_merge bot-command label Apr 1, 2020

rladuca merged commit 5a9976c into dotnet:master Apr 1, 2020

vatsan-madhavan mentioned this pull request Oct 21, 2020

Problem with loading component in WPF project #1688

Open

ghost locked as resolved and limited conversation to collaborators Apr 12, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix handling of wildcard AssemblyVersion properties during markup compilation #2691

Fix handling of wildcard AssemblyVersion properties during markup compilation #2691

rladuca commented Mar 2, 2020

lindexi commented Mar 5, 2020

rladuca commented Mar 5, 2020 •

edited

Loading

rladuca commented Mar 12, 2020

rladuca commented Mar 31, 2020

ghost commented Apr 1, 2020

HClausing commented Oct 21, 2020

vatsan-madhavan commented Oct 21, 2020

Fix handling of wildcard AssemblyVersion properties during markup compilation #2691

Fix handling of wildcard AssemblyVersion properties during markup compilation #2691

Conversation

rladuca commented Mar 2, 2020

lindexi commented Mar 5, 2020

rladuca commented Mar 5, 2020 • edited Loading

rladuca commented Mar 12, 2020

rladuca commented Mar 31, 2020

ghost commented Apr 1, 2020

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

HClausing commented Oct 21, 2020

vatsan-madhavan commented Oct 21, 2020

rladuca commented Mar 5, 2020 •

edited

Loading

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.