Skip to content

Commit b197e17

Browse files
author
David Gómez
authored
Merge pull request #1807 from sibille/fix_templateOrder
Fix template and compositionOrder for Mac
2 parents 8d0571f + 99678f1 commit b197e17

File tree

15 files changed

+48
-29
lines changed

15 files changed

+48
-29
lines changed

‎templates/RN/Pages/Blank/.template.config/template.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"wts.projecttype": "all",
1616
"wts.frontendframework": "all",
1717
"wts.version": "1.0.0",
18-
"wts.displayOrder": "0"
18+
"wts.displayOrder": "1"
1919
},
2020
"sourceName": "wts.ItemName",
2121
"preferNameDirectory": true,

‎templates/RN/Pages/MasterDetail/.template.config/template.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"wts.projecttype": "all",
1616
"wts.frontendframework": "all",
1717
"wts.version": "1.0.0",
18-
"wts.displayOrder": "0"
18+
"wts.displayOrder": "2"
1919
},
2020
"sourceName": "wts.ItemName",
2121
"preferNameDirectory": true,

‎templates/RN/Pages/Settings/.template.config/template.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"wts.frontendframework": "all",
1717
"wts.multipleInstance": "false",
1818
"wts.version": "1.0.0",
19-
"wts.displayOrder": "0"
19+
"wts.displayOrder": "3"
2020
},
2121
"sourceName": "wts.ItemName",
2222
"preferNameDirectory": true,

‎templates/RN/_composition/Tabbed/Page.AddNavigate/.template.config/template.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
"shortName": "wts.RN.Tabbed.Page.AddNavigate",
77
"identity": "wts.RN.Tabbed.Page.AddNavigate",
88
"tags": {
9-
"language": "Any",
9+
"language": "Any",
1010
"type": "item",
1111
"wts.type": "composition",
1212
"wts.platform": "RN",
1313
"wts.version": "1.0.0",
14-
"wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Blank|wts.RN.Page.Settings"
14+
"wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Blank|wts.RN.Page.Settings",
15+
"wts.compositionOrder": "0"
1516
},
1617
"sourceName": "wts.ItemName",
1718
"preferNameDirectory": true,

‎templates/RN/_composition/Tabbed/Page.Blank.AddTheme/.template.config/template.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"wts.type": "composition",
1212
"wts.platform": "RN",
1313
"wts.version": "1.0.0",
14-
"wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Blank & $page == wts.RN.Page.Settings"
14+
"wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Blank & $page == wts.RN.Page.Settings",
15+
"wts.compositionOrder": "1"
1516
},
1617
"sourceName": "wts.ItemName",
1718
"preferNameDirectory": true,

‎templates/RN/_composition/Tabbed/Page.MasterDetail.AddNavigate/.template.config/template.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"wts.type": "composition",
1212
"wts.platform": "RN",
1313
"wts.version": "1.0.0",
14-
"wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.MasterDetail"
14+
"wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.MasterDetail",
15+
"wts.compositionOrder": "0"
1516
},
1617
"sourceName": "wts.ItemName",
1718
"preferNameDirectory": true,

‎templates/RN/_composition/Tabbed/Page.MasterDetail.AddTheme/.template.config/template.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"wts.type": "composition",
1212
"wts.platform": "RN",
1313
"wts.version": "1.0.0",
14-
"wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.MasterDetail & $page == wts.RN.Page.Settings"
14+
"wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.MasterDetail & $page == wts.RN.Page.Settings",
15+
"wts.compositionOrder": "1"
1516
},
1617
"sourceName": "wts.ItemName",
1718
"preferNameDirectory": true,

‎templates/RN/_composition/Tabbed/Page.Settings.AddNavigate/.template.config/template.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"wts.type": "composition",
1212
"wts.platform": "RN",
1313
"wts.version": "1.0.0",
14-
"wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Settings"
14+
"wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Settings",
15+
"wts.compositionOrder": "1"
1516
},
1617
"sourceName": "wts.ItemName",
1718
"preferNameDirectory": true,

‎templates/RN/_composition/Tabbed/Page.Settings.AddThemeSelection/.template.config/template.json

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"wts.platform": "RN",
1313
"wts.version": "1.0.0",
1414
"wts.compositionFilter": "$projectType == Tabbed & identity == wts.RN.Page.Settings",
15+
"wts.compositionOrder": "1",
1516
"wts.licenses": "[Async storage](https://github.com/react-native-async-storage/async-storage/blob/master/LICENSE)"
1617
},
1718
"sourceName": "wts.ItemName",

‎templates/RN/_composition/_shared/Page.AddPicker/.template.config/template.json

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"wts.platform": "RN",
1313
"wts.version": "1.0.0",
1414
"wts.compositionFilter": "groupidentity == wts.RN.Page.Settings",
15+
"wts.casing.projectName": "lower",
1516
"wts.licenses": "[React Native Picker](https://github.com/react-native-picker/picker/blob/master/LICENSE)"
1617
},
1718
"sourceName": "wts.ItemName",
@@ -23,6 +24,12 @@
2324
"dataType": "string",
2425
"replaces": "Param_ProjectName",
2526
"fileRename": "Param_ProjectName"
27+
},
28+
"wts.projectName.casing.lower":
29+
{
30+
"type": "parameter",
31+
"replaces": "Param_ProjectToLower",
32+
"fileRename": "Param_ProjectToLower"
2633
}
2734
}
2835
}

‎templates/RN/_composition/_shared/Page.AddPicker/windows/Param_ProjectName/App_postaction.xaml.cs renamed to ‎templates/RN/_composition/_shared/Page.AddPicker/windows/Param_ProjectToLower/App_postaction.xaml.cs

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-

2-
PackageProviders.Add(new ReactPackageProvider());
3-
//{[{
4-
PackageProviders.Add(new ReactNativePicker.ReactPackageProvider());
5-
//}]}
6-
InitializeComponent();
7-
}
1+
 PackageProviders.Add(new ReactPackageProvider());
2+
//{[{
3+
PackageProviders.Add(new ReactNativePicker.ReactPackageProvider());
4+
//}]}
5+
InitializeComponent();
6+
}

‎templates/RN/_composition/_shared/Page.AddPicker/windows/Param_ProjectName/Param_ProjectName_postaction.csproj renamed to ‎templates/RN/_composition/_shared/Page.AddPicker/windows/Param_ProjectToLower/Param_ProjectToLower_postaction.csproj

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<ItemGroup>
2-
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
3-
<Version>6.2.9</Version>
4-
</PackageReference>
5-
</ItemGroup>
6-
<!--{[{-->
7-
<ItemGroup>
8-
<ProjectReference Include="..\..\node_modules\%40react-native-picker\picker\windows\ReactNativePicker\ReactNativePicker.vcxproj">
9-
<Project>{bedcc600-4541-41f2-aa46-9e058202b6ad}</Project>
10-
<Name>ReactNativePicker</Name>
11-
</ProjectReference>
12-
</ItemGroup>
13-
<!--}]}-->
1+
<ItemGroup>
2+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
3+
<Version>6.2.9</Version>
4+
</PackageReference>
5+
</ItemGroup>
6+
<!--{[{-->
7+
<ItemGroup>
8+
<ProjectReference Include="..\..\node_modules\%40react-native-picker\picker\windows\ReactNativePicker\ReactNativePicker.vcxproj">
9+
<Project>{bedcc600-4541-41f2-aa46-9e058202b6ad}</Project>
10+
<Name>ReactNativePicker</Name>
11+
</ProjectReference>
12+
</ItemGroup>
13+
<!--}]}-->
1414
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">

‎templates/RN/_composition/_shared/Page.AddPicker/windows/Param_ProjectName_postaction.sln renamed to ‎templates/RN/_composition/_shared/Page.AddPicker/windows/Param_ProjectToLower_postaction.sln

File renamed without changes.

‎templates/RN/_composition/_shared/Project.AddGitignore/.template.config/template.json

+7
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"wts.type": "composition",
1212
"wts.platform": "RN",
1313
"wts.version": "1.0.0",
14+
"wts.casing.projectName": "lower",
1415
"wts.compositionFilter": "identity == wts.RN.Project.Default"
1516
},
1617
"sourceName": "wts.ItemName",
@@ -22,6 +23,12 @@
2223
"dataType": "string",
2324
"replaces": "Param_ProjectName",
2425
"fileRename": "Param_ProjectName"
26+
},
27+
"wts.projectName.casing.lower":
28+
{
29+
"type": "parameter",
30+
"replaces": "Param_ProjectToLower",
31+
"fileRename": "Param_ProjectToLower"
2532
}
2633
}
2734
}

‎templates/RN/_composition/_shared/Project.AddGitignore/windows/Param_ProjectName/.gitignore renamed to ‎templates/RN/_composition/_shared/Project.AddGitignore/windows/Param_ProjectToLower/.gitignore

File renamed without changes.

0 commit comments

Comments
 (0)