Merge pull request #14 from egvijayanand/working

Reliability updates
egvijayanand · Nov 23, 2022 · 347673e · 347673e
2 parents c87a041 + 517891b
commit 347673e
Show file tree

Hide file tree

Showing 21 changed files with 41 additions and 37 deletions.
diff --git a/src/FormsTemplatesCLI/FormsClassLib/.template.config/template.json b/src/FormsTemplatesCLI/FormsClassLib/.template.config/template.json
@@ -14,7 +14,7 @@
     "description": "A project template for Xamarin.Forms 5 Class Library (ver. 5.0.0.2515)",
     "name": "Xamarin.Forms 5 Class Library",
     "shortName": "formsclasslib",
-    "sourceName": "FormsClassLib",
+    "sourceName": "FormsClassLib.1",
     "tags": {
         "language": "C#",
         "type": "project"
@@ -104,7 +104,7 @@
                 {
                     "condition": "(no-solution-file || !(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\"))",
                     "exclude": [
-                        "FormsClassLib.sln"
+                        "FormsClassLib.1.sln"
                     ]
                 }
             ]

diff --git a/src/FormsTemplatesCLI/FormsClassLib/Class1.cs b/src/FormsTemplatesCLI/FormsClassLib/Class1.cs
@@ -1,4 +1,4 @@
-namespace FormsClassLib
+namespace FormsClassLib._1
 {
     public class Class1
     {

diff --git a/...tesCLI/FormsClassLib/FormsClassLib.csproj → ...sCLI/FormsClassLib/FormsClassLib.1.csproj b/...tesCLI/FormsClassLib/FormsClassLib.csproj → ...sCLI/FormsClassLib/FormsClassLib.1.csproj
@@ -5,7 +5,7 @@
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <RootNamespace>FormsClassLib</RootNamespace>
+        <RootNamespace>FormsClassLib._1</RootNamespace>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Xamarin.Forms" Version="5.0.0.2515"/>

diff --git a/...platesCLI/FormsClassLib/FormsClassLib.sln → ...atesCLI/FormsClassLib/FormsClassLib.1.sln b/...platesCLI/FormsClassLib/FormsClassLib.sln → ...atesCLI/FormsClassLib/FormsClassLib.1.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30114.105
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsClassLib", "FormsClassLib.csproj", "{104D078F-F441-4A4A-A89B-21C40D7B8C10}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsClassLib.1", "FormsClassLib.1.csproj", "{104D078F-F441-4A4A-A89B-21C40D7B8C10}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/FormsTemplatesCLI/FormsPage/.template.config/template.json b/src/FormsTemplatesCLI/FormsPage/.template.config/template.json
@@ -15,13 +15,13 @@
     "description": "An item template for Xamarin.Forms ContentPage in XAML",
     "name": "Xamarin.Forms ContentPage",
     "shortName": "forms-page",
-    "sourceName": "FormsPage",
+    "sourceName": "FormsPage.1",
     "primaryOutputs": [
         {
-            "path": "FormsPage.xaml"
+            "path": "FormsPage.1.xaml"
         },
         {
-            "path": "FormsPage.xaml.cs"
+            "path": "FormsPage.1.xaml.cs"
         }
     ],
     "tags": {

diff --git a/...ormsTemplatesCLI/FormsPage/FormsPage.xaml → ...msTemplatesCLI/FormsPage/FormsPage.1.xaml b/...ormsTemplatesCLI/FormsPage/FormsPage.xaml → ...msTemplatesCLI/FormsPage/FormsPage.1.xaml
@@ -2,7 +2,7 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:MyApp.Namespace"
-             x:Class="MyApp.Namespace.FormsPage">
+             x:Class="MyApp.Namespace.FormsPage__1">
     <ContentPage.Content>
         <StackLayout>
             <Label Text="Welcome to Xamarin.Forms!!!"

diff --git a/...sTemplatesCLI/FormsView/FormsView.xaml.cs → ...emplatesCLI/FormsPage/FormsPage.1.xaml.cs b/...sTemplatesCLI/FormsView/FormsView.xaml.cs → ...emplatesCLI/FormsPage/FormsPage.1.xaml.cs
@@ -4,9 +4,9 @@
 namespace MyApp.Namespace
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FormsView : ContentView
+    public partial class FormsPage__1 : ContentPage
     {
-        public FormsView()
+        public FormsPage__1()
         {
             InitializeComponent();
         }

diff --git a/src/FormsTemplatesCLI/FormsPageCS/.template.config/template.json b/src/FormsTemplatesCLI/FormsPageCS/.template.config/template.json
@@ -15,10 +15,10 @@
     "description": "An item template for Xamarin.Forms ContentPage in C#",
     "name": "Xamarin.Forms ContentPage (C#)",
     "shortName": "forms-page-cs",
-    "sourceName": "FormsPage",
+    "sourceName": "FormsPage.1",
     "primaryOutputs": [
         {
-            "path": "FormsPage.cs"
+            "path": "FormsPage.1.cs"
         }
     ],
     "tags": {

diff --git a/...ormsTemplatesCLI/FormsPageCS/FormsPage.cs → ...msTemplatesCLI/FormsPageCS/FormsPage.1.cs b/...ormsTemplatesCLI/FormsPageCS/FormsPage.cs → ...msTemplatesCLI/FormsPageCS/FormsPage.1.cs
@@ -2,9 +2,9 @@
 
 namespace MyApp.Namespace
 {
-    public partial class FormsPage : ContentPage
+    public partial class FormsPage__1 : ContentPage
     {
-        public FormsPage()
+        public FormsPage__1()
         {
             Content = new StackLayout()
             {

diff --git a/src/FormsTemplatesCLI/FormsResDict/.template.config/template.json b/src/FormsTemplatesCLI/FormsResDict/.template.config/template.json
@@ -15,7 +15,7 @@
     "description": "An item template for Xamarin.Forms ResourceDictionary in XAML",
     "name": "Xamarin.Forms ResourceDictionary",
     "shortName": "forms-resdict",
-    "sourceName": "FormsResDict",
+    "sourceName": "FormsResDict.1",
     "tags": {
         "language": "C#",
         "type": "item"
@@ -44,7 +44,7 @@
                 {
                     "condition": "(XamlOnly)",
                     "exclude": [
-                        "FormsResDict.xaml.cs"
+                        "FormsResDict.1.xaml.cs"
                     ]
                 }
             ]

diff --git a/...mplatesCLI/FormsResDict/FormsResDict.xaml → ...latesCLI/FormsResDict/FormsResDict.1.xaml b/...mplatesCLI/FormsResDict/FormsResDict.xaml → ...latesCLI/FormsResDict/FormsResDict.1.xaml
@@ -10,7 +10,7 @@
 <ResourceDictionary xmlns="http://xamarin.com/schemas/2014/forms"
                     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                     xmlns:local="clr-namespace:MyApp.Namespace"
-                    x:Class="MyApp.Namespace.FormsResDict">
+                    x:Class="MyApp.Namespace.FormsResDict__1">
     <!-- Define your resources here -->
 </ResourceDictionary>
 <!--#endif-->
diff --git a/...atesCLI/FormsResDict/FormsResDict.xaml.cs → ...esCLI/FormsResDict/FormsResDict.1.xaml.cs b/...atesCLI/FormsResDict/FormsResDict.xaml.cs → ...esCLI/FormsResDict/FormsResDict.1.xaml.cs
@@ -4,9 +4,9 @@
 namespace MyApp.Namespace
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FormsResDict : ResourceDictionary
+    public partial class FormsResDict__1 : ResourceDictionary
     {
-        public FormsResDict()
+        public FormsResDict__1()
         {
             InitializeComponent();
         }

diff --git a/src/FormsTemplatesCLI/FormsShell/.template.config/template.json b/src/FormsTemplatesCLI/FormsShell/.template.config/template.json
@@ -15,13 +15,13 @@
     "description": "An item template for Xamarin.Forms ShellPage in XAML",
     "name": "Xamarin.Forms ShellPage",
     "shortName": "forms-shell",
-    "sourceName": "FormsShell",
+    "sourceName": "FormsShell.1",
     "primaryOutputs": [
         {
-            "path": "FormsShell.xaml"
+            "path": "FormsShell.1.xaml"
         },
         {
-            "path": "FormsShell.xaml.cs"
+            "path": "FormsShell.1.xaml.cs"
         }
     ],
     "tags": {

diff --git a/...msTemplatesCLI/FormsShell/FormsShell.xaml → ...TemplatesCLI/FormsShell/FormsShell.1.xaml b/...msTemplatesCLI/FormsShell/FormsShell.xaml → ...TemplatesCLI/FormsShell/FormsShell.1.xaml
@@ -2,7 +2,7 @@
 <Shell xmlns="http://xamarin.com/schemas/2014/forms"
        xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
        xmlns:local="clr-namespace:MyApp.Namespace"
-       x:Class="MyApp.Namespace.FormsShell">
+       x:Class="MyApp.Namespace.FormsShell__1">
     <!--
         The overall app visual hierarchy is defined here, along with navigation.
         Ensure atleast a Flyout item or a TabBar is defined for Shell to work

diff --git a/...emplatesCLI/FormsShell/FormsShell.xaml.cs → ...platesCLI/FormsShell/FormsShell.1.xaml.cs b/...emplatesCLI/FormsShell/FormsShell.xaml.cs → ...platesCLI/FormsShell/FormsShell.1.xaml.cs
@@ -4,9 +4,9 @@
 namespace MyApp.Namespace
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FormsShell : Shell
+    public partial class FormsShell__1 : Shell
     {
-        public FormsShell()
+        public FormsShell__1()
         {
             InitializeComponent();
         }

diff --git a/src/FormsTemplatesCLI/FormsView/.template.config/template.json b/src/FormsTemplatesCLI/FormsView/.template.config/template.json
@@ -14,13 +14,13 @@
     "description": "An item template for Xamarin.Forms ContentView in XAML",
     "name": "Xamarin.Forms ContentView",
     "shortName": "forms-view",
-    "sourceName": "FormsView",
+    "sourceName": "FormsView.1",
     "primaryOutputs": [
         {
-            "path": "FormsView.xaml"
+            "path": "FormsView.1.xaml"
         },
         {
-            "path": "FormsView.xaml.cs"
+            "path": "FormsView.1.xaml.cs"
         }
     ],
     "tags": {

diff --git a/...ormsTemplatesCLI/FormsView/FormsView.xaml → ...msTemplatesCLI/FormsView/FormsView.1.xaml b/...ormsTemplatesCLI/FormsView/FormsView.xaml → ...msTemplatesCLI/FormsView/FormsView.1.xaml
@@ -2,7 +2,7 @@
 <ContentView xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:MyApp.Namespace"
-             x:Class="MyApp.Namespace.FormsView">
+             x:Class="MyApp.Namespace.FormsView__1">
     <ContentView.Content>
         <StackLayout>
             <Label Text="Welcome to Xamarin.Forms!!!"

diff --git a/...sTemplatesCLI/FormsPage/FormsPage.xaml.cs → ...emplatesCLI/FormsView/FormsView.1.xaml.cs b/...sTemplatesCLI/FormsPage/FormsPage.xaml.cs → ...emplatesCLI/FormsView/FormsView.1.xaml.cs
@@ -4,9 +4,9 @@
 namespace MyApp.Namespace
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class FormsPage : ContentPage
+    public partial class FormsView__1 : ContentView
     {
-        public FormsPage()
+        public FormsView__1()
         {
             InitializeComponent();
         }

diff --git a/src/FormsTemplatesCLI/FormsViewCS/.template.config/template.json b/src/FormsTemplatesCLI/FormsViewCS/.template.config/template.json
@@ -14,10 +14,10 @@
     "description": "An item template for Xamarin.Forms ContentView in C#",
     "name": "Xamarin.Forms ContentView (C#)",
     "shortName": "forms-view-cs",
-    "sourceName": "FormsView",
+    "sourceName": "FormsView.1",
     "primaryOutputs": [
         {
-            "path": "FormsView.cs"
+            "path": "FormsView.1.cs"
         }
     ],
     "tags": {

diff --git a/...ormsTemplatesCLI/FormsViewCS/FormsView.cs → ...msTemplatesCLI/FormsViewCS/FormsView.1.cs b/...ormsTemplatesCLI/FormsViewCS/FormsView.cs → ...msTemplatesCLI/FormsViewCS/FormsView.1.cs
@@ -2,9 +2,9 @@
 
 namespace MyApp.Namespace
 {
-    public partial class FormsView : ContentView
+    public partial class FormsView__1 : ContentView
     {
-        public FormsView()
+        public FormsView__1()
         {
             Content = new StackLayout()
             {

diff --git a/src/FormsTemplatesCLI/release-notes.txt b/src/FormsTemplatesCLI/release-notes.txt
@@ -1,4 +1,8 @@
-What's new in ver. 1.4.1:
+What's new in ver. 1.4.2:
+
+Little housekeeping to improve the reliability of the templates.
+
+v1.4.1
 
 Xamarin.Forms version bumped to 5.0.0.2515 (SR12).