Merge pull request #2011 from evoskuil/master

Problem: msvc imports missing Rule.Category declarations.
zeromq · May 25, 2016 · 9a50364 · 9a50364
2 parents 5708051 + 96a66ba
commit 9a50364
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/builds/msvc/vs2015/libzmq.import.xml b/builds/msvc/vs2015/libzmq.import.xml
@@ -2,8 +2,11 @@
 <ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
   <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
     <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
+      <Category Name="tweet" DisplayName="tweet" />
       <Category Name="sodium" DisplayName="sodium" />
+      <Category Name="openpgm" DisplayName="openpgm" />
+      <Category Name="gssapi" DisplayName="gssapi" />
+      <Category Name="draftapi" DisplayName="draftapi" />
     </Rule.Categories>
     <Rule.DataSource>
       <DataSource Persistence="ProjectFile" ItemType="" />

diff --git a/builds/msvc/vs2015/libzmq/libzmq.xml b/builds/msvc/vs2015/libzmq/libzmq.xml
@@ -2,9 +2,11 @@
 <ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
   <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
     <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
+      <Category Name="tweet" DisplayName="tweet" />
       <Category Name="sodium" DisplayName="sodium" />
+      <Category Name="openpgm" DisplayName="openpgm" />
       <Category Name="gssapi" DisplayName="gssapi" />
+      <Category Name="draftapi" DisplayName="draftapi" />
     </Rule.Categories>
     <Rule.DataSource>
       <DataSource Persistence="ProjectFile" ItemType="" />