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

Jump to bottom

Move Avalonia.NameGenerator to the main repository #10407

Merged
merged 112 commits into from
Mar 4, 2023
Merged

Move Avalonia.NameGenerator to the main repository #10407

merged 112 commits into from
Mar 4, 2023

Conversation

maxkatz6
Copy link
Member

@maxkatz6 maxkatz6 commented Feb 20, 2023 •
edited
Loading

What does the pull request do?

  • Moves Avalonia.NameGenerator to this repository.
  • Renames Avalonia.NameGenerator to Avalonia.Generators, as we plan to add more generators in the future (partial properties of C# 12 possibly)
  • Including tests
  • Enables generators on the ControlCatalog (used only in couple of pages)
  • History of changes and commit authors are kept the same (as far as github allows hit)
  • Include Avalonia.Generators in the main "Avalonia" package (similarly how System.Text.Json has done it, where main package and generator are combined, and generator can be disabled optionally).

To be done, but out of scope of this PR:

How was the solution implemented (if it's not obvious)?

  • Updated main repo project structure to match the main repo.
  • Merged one repo into another with a magic word (--allow-unrelated-histories)
  • Updated generator projects to fit main repo, use the same xamlx submodule, updated csproj...

worldbeater and others added 30 commits October 25, 2020 20:51
@worldbeater
Initial commit
85de11d
@worldbeater
Add Avalonia Source Generator for x:Name refs
5f132c9
@worldbeater
Ignore Idea stuff
e5f3c79
@worldbeater
Allow specifying namespaces manually
433c279
@worldbeater
Support custom controls via AdditionalNamespaces
2318f71
@worldbeater
feature: Add XamlXRawNameReferenceXamlParser (#4)
2c8d46d 
* Add XAML parser based on XamlX
@worldbeater
feature: Use XamlX for Type Resolution (#5)
08ed528
@worldbeater
Remove markup extension transformer
b45c450
@worldbeater
housekeeping: Diagnostics and Refactorings (#6)
e3490c6 
* NameDirectiveTransformer.cs
* Build-time diagnostics
@worldbeater
housekeeping: Add XamlNameReferenceGenerator.Tests (#7)
7fc979f 
* Add basic MiniCompiler unit tests
* Add XamlX tests stub file
@worldbeater
feature: Don't Generate x:Name References for DataTemplates (#10)
701daf0
@worldbeater
Update README.md
53942a5
@worldbeater
Exclude ControlTemplates (#2)
aa0fbc6
@worldbeater
housekeeping: Add Basic GitHub Actions Configuration (#11)
73cd39b
@worldbeater
fix: Don't Throw when Attached Properties are Unknown (#12)
734f344 
* Fix attached properties resolution
* Strip out controls that aren't IControl
* Be more strict and check the namespace
* Update packages, throw when class is not partial
* Use internal access modifier explicitly
* Move the attribute to Avalonia.Controls namespace
* Further documentation updates
* Add the badges
@worldbeater
fix: Remove ConstructableObjectTransformer (#13)
03b33fb 
* Strip out the namespace
* Strip out the instantiation
* Actually strip out the transformer
@worldbeater
fix: Use global:: for Type Names (#14)
e1a87d6
@worldbeater
housekeeping: Update Generated Code Sample (#15)
489a610
@worldbeater
housekeeping: Rename to Avalonia.NameGenerator (#16)
ecc9677
@worldbeater
housekeeping: Temporary use old package name
063ef71
@worldbeater
housekeeping: Add GIF recordings
af3b0be
@worldbeater
feature: Support x:FieldModifier Directive (#20)
edf0217 
* Refactoring, decomposition, more unit tests
* Support x:FieldModifier
* Use Xamarin.Forms API for x:FieldModifier
* Use <RestoreSources /> directive, bump Avalonia
* CRLF dance
* Use Fluent theme
* Move Avalonia packages to Directory.Build.props
* Bump test SDK version
@worldbeater
fix: Temporary use old <PackageId /> (#21)
fee0c58
@workgroupengineering
feature: Generate x:Name mapping without the GenerateTypedNameReferen…
cff386b 
…ces attribute (#22)

* feature: Generate x:Name mapping without the GenerateTypedNameReferences attribute.
* fix: Update README.md
@worldbeater
feature: Document the AvaloniaNameGenerator Property, Don't Crash on …
631870b 
…Failure (#23)

* Update README.md
* Don't crash when something goes wrong
* Add back the warning
* Update version.json
@worldbeater
docs: Document AXN warnings suppression
806fe0f 
Closes AvaloniaUI/Avalonia.NameGenerator#24
@worldbeater
feature: Resolve Class Name from x:Class (#27)
592fae2 
* Switch over to using x:Class
* The MsBuild property is no longer required
* Documentation updates
* Bring back the AXN0003 warning
* Bring back AXN0002
* Mocks for unit tests
* Actually use the mock in unit tests
* Bump version
@worldbeater
housekeeping: Cleanup README.md
8e8d684
@worldbeater
fix: Don't parse XAML twice, bring back the extensions
3fdacad
@worldbeater
IClassResolver->IViewResolver
11b74bb
@avaloniaui-team
Copy link
Contributor

You can test this PR using the following package version. 11.0.999-cibuild0030381-beta. (feed url: https://pkgs.dev.azure.com/AvaloniaUI/AvaloniaUI/_packaging/avalonia-all/nuget/v3/index.json) [PRBUILDID]

@maxkatz6
Copy link
Member Author

@worldbeater @robloo done. Restore sandbox and reorganized code.
Also enabled this generator as part of the Avalonia package and added one more parameter to enable/disable it.

@avaloniaui-team
Copy link
Contributor

You can test this PR using the following package version. 11.0.999-cibuild0030873-beta. (feed url: https://pkgs.dev.azure.com/AvaloniaUI/AvaloniaUI/_packaging/avalonia-all/nuget/v3/index.json) [PRBUILDID]

@avaloniaui-team
Copy link
Contributor

You can test this PR using the following package version. 11.0.999-cibuild0031423-beta. (feed url: https://pkgs.dev.azure.com/AvaloniaUI/AvaloniaUI/_packaging/avalonia-all/nuget/v3/index.json) [PRBUILDID]

@maxkatz6 maxkatz6 added this pull request to the merge queue Mar 4, 2023
Merged via the queue into master with commit 1da8891 Mar 4, 2023
@maxkatz6 maxkatz6 deleted the move-name-generator branch March 4, 2023 21:59
@MarkusKgit MarkusKgit mentioned this pull request Mar 7, 2023
Closed
@rabbitism
Copy link
Contributor

This generator (I assume it's in analyzer folder) is not generating InitializeComponent() method. What should we config for this?

@laolarou726
Copy link
Contributor

This generator (I assume it's in analyzer folder) is not generating InitializeComponent() method. What should we config for this?

I also encounter this issue. Is there any switch we need to enable in the .csproj file?

@maxkatz6
Copy link
Member Author

In the telegram chat was found a workaround:
sharing:
1, remove XamlNameReferenceGenerator.dll from your nuget
2, add this into your proj.csproj (edit with plain text)
<Target Name="_InjectAdditionalFiles" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun"> <ItemGroup> <AdditionalFiles Include="@(AvaloniaXaml)" SourceItemGroup="AvaloniaXaml" /> </ItemGroup> </Target>
and then *.axml will be compiled just fine.
my current solution, not sure there will be other ways from official later.

@maxkatz6
Copy link
Member Author

For the proper solution, nuget props should include Avalonia.Generators.props which is missing currently

@maxkatz6 maxkatz6 mentioned this pull request Mar 10, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kekekeks kekekeks kekekeks approved these changes

@worldbeater worldbeater worldbeater approved these changes

Assignees
No one assigned
Labels
area-analyzers breaking-change feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.