Restored AttributeUsage projection (#809)

* Restored AttributeUsage projection * Restored AllowMultiple attribute arg as well * Add test for multiple allowed attributes
microsoft · Apr 19, 2021 · 5695e66 · 5695e66
1 parent 039332d
commit 5695e66
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/Tests/UnitTest/WinUITest.net5.cs b/src/Tests/UnitTest/WinUITest.net5.cs
@@ -8,6 +8,8 @@
 using WinRT;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 
 namespace UnitTest
 {
@@ -20,8 +22,13 @@ public TestWinUI()
  public class App : Microsoft.UI.Xaml.Application
  {
 
- }
-
+ }
+
+ // Compile time test to ensure multiple allowed attributes 
+ [TemplatePart(Name = "PartButton", Type = typeof(Button))]
+ [TemplatePart(Name = "PartGrid", Type = typeof(Grid))]
+ public class TestAllowMultipleAttributes { };
+
  [Fact]
  public void TestApp()
  {

diff --git a/src/cswinrt/code_writers.h b/src/cswinrt/code_writers.h
@@ -1407,6 +1407,7 @@ remove => %.% -= value;
  void write_custom_attributes(writer& w, std::pair<CustomAttribute, CustomAttribute> const& custom_attributes, bool enable_platform_attrib)
  {
  std::map<std::string, std::vector<std::string>> attributes;
+ bool allow_multiple = false;
  for (auto&& attribute : custom_attributes)
  {
  auto [attribute_namespace, attribute_name] = attribute.TypeNamespaceAndName();
@@ -1426,13 +1427,22 @@ remove => %.% -= value;
  attributes["global::System.Runtime.Versioning.SupportedOSPlatform"].push_back(platform);
  }
  }
- // Skip metadata attributes
- if (attribute_namespace == "Windows.Foundation.Metadata" && attribute_name != "DefaultOverload" && attribute_name != "Overload") continue;
+ // Skip metadata attributes without a projection
+ if (attribute_namespace == "Windows.Foundation.Metadata")
+ {
+ if (attribute_name == "AllowMultiple")
+ {
+ allow_multiple = true;
+ }
+ if (attribute_name != "DefaultOverload" && attribute_name != "Overload" && attribute_name != "AttributeUsage")
+ {
+ continue;
+ }
+ }
  attributes[attribute_full] = std::move(params);
  }
  if (auto&& usage = attributes.find("AttributeUsage"); usage != attributes.end())
  {
- bool allow_multiple = attributes.find("Windows.Foundation.Metadata.AllowMultiple") != attributes.end();
  usage->second.push_back(w.write_temp("AllowMultiple = %", allow_multiple ? "true" : "false"));
  }