Merge pull request #1807 from sibille/fix_templateOrder

Fix template and compositionOrder for Mac
microsoft · May 13, 2021 · b197e17 · b197e17
2 parents 8d0571f + 99678f1
commit b197e17
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 29 deletions.
diff --git a/templates/RN/Pages/Blank/.template.config/template.json b/templates/RN/Pages/Blank/.template.config/template.json
@@ -15,7 +15,7 @@
     "wts.projecttype": "all",
     "wts.frontendframework": "all",
     "wts.version": "1.0.0",
-    "wts.displayOrder": "0"
+    "wts.displayOrder": "1"
   },
   "sourceName": "wts.ItemName",
   "preferNameDirectory": true,

diff --git a/templates/RN/Pages/MasterDetail/.template.config/template.json b/templates/RN/Pages/MasterDetail/.template.config/template.json
@@ -15,7 +15,7 @@
     "wts.projecttype": "all",
     "wts.frontendframework": "all",
     "wts.version": "1.0.0",
-    "wts.displayOrder": "0"
+    "wts.displayOrder": "2"
   },
   "sourceName": "wts.ItemName",
   "preferNameDirectory": true,

diff --git a/templates/RN/Pages/Settings/.template.config/template.json b/templates/RN/Pages/Settings/.template.config/template.json
@@ -16,7 +16,7 @@
     "wts.frontendframework": "all",
     "wts.multipleInstance": "false",
     "wts.version": "1.0.0",
-    "wts.displayOrder": "0"
+    "wts.displayOrder": "3"
   },
   "sourceName": "wts.ItemName",
   "preferNameDirectory": true,

diff --git a/templates/RN/_composition/Tabbed/Page.AddNavigate/.template.config/template.json b/templates/RN/_composition/Tabbed/Page.AddNavigate/.template.config/template.json
@@ -6,12 +6,13 @@
   "shortName": "wts.RN.Tabbed.Page.AddNavigate",
   "identity": "wts.RN.Tabbed.Page.AddNavigate",
   "tags": {
-    "language": "Any",
+    "language":  "Any",
     "type": "item",
     "wts.type": "composition",
     "wts.platform": "RN",
     "wts.version": "1.0.0",
-    "wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Blank|wts.RN.Page.Settings"
+    "wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Blank|wts.RN.Page.Settings",
+    "wts.compositionOrder": "0"
   },
   "sourceName": "wts.ItemName",
   "preferNameDirectory": true,

diff --git a/templates/RN/_composition/Tabbed/Page.Blank.AddTheme/.template.config/template.json b/templates/RN/_composition/Tabbed/Page.Blank.AddTheme/.template.config/template.json
@@ -11,7 +11,8 @@
     "wts.type": "composition",
     "wts.platform": "RN",
     "wts.version": "1.0.0",
-    "wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Blank & $page == wts.RN.Page.Settings"
+    "wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Blank & $page == wts.RN.Page.Settings",
+    "wts.compositionOrder": "1"
   },
   "sourceName": "wts.ItemName",
   "preferNameDirectory": true,

diff --git a/...lates/RN/_composition/Tabbed/Page.MasterDetail.AddNavigate/.template.config/template.json b/...lates/RN/_composition/Tabbed/Page.MasterDetail.AddNavigate/.template.config/template.json
@@ -11,7 +11,8 @@
     "wts.type": "composition",
     "wts.platform": "RN",
     "wts.version": "1.0.0",
-    "wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.MasterDetail"
+    "wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.MasterDetail",
+    "wts.compositionOrder": "0"
   },
   "sourceName": "wts.ItemName",
   "preferNameDirectory": true,

diff --git a/templates/RN/_composition/Tabbed/Page.MasterDetail.AddTheme/.template.config/template.json b/templates/RN/_composition/Tabbed/Page.MasterDetail.AddTheme/.template.config/template.json
@@ -11,7 +11,8 @@
     "wts.type": "composition",
     "wts.platform": "RN",
     "wts.version": "1.0.0",
-    "wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.MasterDetail & $page == wts.RN.Page.Settings"
+    "wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.MasterDetail & $page == wts.RN.Page.Settings",
+    "wts.compositionOrder": "1"
   },
   "sourceName": "wts.ItemName",
   "preferNameDirectory": true,

diff --git a/templates/RN/_composition/Tabbed/Page.Settings.AddNavigate/.template.config/template.json b/templates/RN/_composition/Tabbed/Page.Settings.AddNavigate/.template.config/template.json
@@ -11,7 +11,8 @@
     "wts.type": "composition",
     "wts.platform": "RN",
     "wts.version": "1.0.0",
-    "wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Settings"
+    "wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Settings",
+    "wts.compositionOrder": "1"
   },
   "sourceName": "wts.ItemName",
   "preferNameDirectory": true,

diff --git a/...tes/RN/_composition/Tabbed/Page.Settings.AddThemeSelection/.template.config/template.json b/...tes/RN/_composition/Tabbed/Page.Settings.AddThemeSelection/.template.config/template.json
@@ -12,6 +12,7 @@
     "wts.platform": "RN",
     "wts.version": "1.0.0",
     "wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Settings",
+    "wts.compositionOrder": "1",
     "wts.licenses": "[Async storage](https://github.com/react-native-async-storage/async-storage/blob/master/LICENSE)"
   },
   "sourceName": "wts.ItemName",

diff --git a/templates/RN/_composition/_shared/Page.AddPicker/.template.config/template.json b/templates/RN/_composition/_shared/Page.AddPicker/.template.config/template.json
@@ -12,6 +12,7 @@
     "wts.platform": "RN",
     "wts.version": "1.0.0",
     "wts.compositionFilter": "groupidentity == wts.RN.Page.Settings",
+    "wts.casing.projectName": "lower",
     "wts.licenses": "[React Native Picker](https://github.com/react-native-picker/picker/blob/master/LICENSE)"
   },
   "sourceName": "wts.ItemName",
@@ -23,6 +24,12 @@
       "dataType": "string",
       "replaces": "Param_ProjectName",
       "fileRename": "Param_ProjectName"
+    },
+    "wts.projectName.casing.lower":
+    {
+      "type": "parameter",
+      "replaces": "Param_ProjectToLower",
+      "fileRename": "Param_ProjectToLower"
     }
   }
 }
diff --git a/.../Param_ProjectName/App_postaction.xaml.cs → ...ram_ProjectToLower/App_postaction.xaml.cs b/.../Param_ProjectName/App_postaction.xaml.cs → ...ram_ProjectToLower/App_postaction.xaml.cs
@@ -1,7 +1,6 @@
-
-            PackageProviders.Add(new ReactPackageProvider());
-            //{[{
-            PackageProviders.Add(new ReactNativePicker.ReactPackageProvider());
-            //}]}
-            InitializeComponent();
-        }
+            PackageProviders.Add(new ReactPackageProvider());
+            //{[{
+            PackageProviders.Add(new ReactNativePicker.ReactPackageProvider());
+            //}]}
+            InitializeComponent();
+        }
diff --git a/...tName/Param_ProjectName_postaction.csproj → ...er/Param_ProjectToLower_postaction.csproj b/...tName/Param_ProjectName_postaction.csproj → ...er/Param_ProjectToLower_postaction.csproj
@@ -1,14 +1,14 @@
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.9</Version>
-    </PackageReference>
-  </ItemGroup>
-  <!--{[{-->
-  <ItemGroup>
-    <ProjectReference Include="..\..\node_modules\%40react-native-picker\picker\windows\ReactNativePicker\ReactNativePicker.vcxproj">
-      <Project>{bedcc600-4541-41f2-aa46-9e058202b6ad}</Project>
-      <Name>ReactNativePicker</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <!--}]}-->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.2.9</Version>
+    </PackageReference>
+  </ItemGroup>
+  <!--{[{-->
+  <ItemGroup>
+    <ProjectReference Include="..\..\node_modules\%40react-native-picker\picker\windows\ReactNativePicker\ReactNativePicker.vcxproj">
+      <Project>{bedcc600-4541-41f2-aa46-9e058202b6ad}</Project>
+      <Name>ReactNativePicker</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <!--}]}-->
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
diff --git a/.../windows/Param_ProjectName_postaction.sln → ...ndows/Param_ProjectToLower_postaction.sln b/.../windows/Param_ProjectName_postaction.sln → ...ndows/Param_ProjectToLower_postaction.sln
diff --git a/templates/RN/_composition/_shared/Project.AddGitignore/.template.config/template.json b/templates/RN/_composition/_shared/Project.AddGitignore/.template.config/template.json
@@ -11,6 +11,7 @@
     "wts.type": "composition",
     "wts.platform": "RN",
     "wts.version": "1.0.0",
+    "wts.casing.projectName": "lower",
     "wts.compositionFilter": "identity == wts.RN.Project.Default"
   },
   "sourceName": "wts.ItemName",
@@ -22,6 +23,12 @@
       "dataType": "string",
       "replaces": "Param_ProjectName",
       "fileRename": "Param_ProjectName"
+    },
+    "wts.projectName.casing.lower":
+    {
+      "type": "parameter",
+      "replaces": "Param_ProjectToLower",
+      "fileRename": "Param_ProjectToLower"
     }
   }
 }
diff --git a/...nore/windows/Param_ProjectName/.gitignore → ...e/windows/Param_ProjectToLower/.gitignore b/...nore/windows/Param_ProjectName/.gitignore → ...e/windows/Param_ProjectToLower/.gitignore