From 4379eecdf3e30a63d613ff7323ce9a6a3fbf1e03 Mon Sep 17 00:00:00 2001
From: cra0zy <cra0zy@gmail.com>
Date: Sun, 29 Oct 2017 01:35:22 +0200
Subject: [PATCH] Connect template to the build system

---
 .../GtkSharp.Template.CSharp.nuspec}          | 12 ++---
 .../content/.template.config/template.json    | 12 +++--
 .../content/GtkNamespace.csproj               |  0
 .../content/MainWindow.cs                     |  0
 .../content/MainWindow.glade                  |  0
 .../content/Program.cs                        |  0
 Source/Templates/NetCore/test/MainWindow.cs   | 37 +++++++++++++++
 .../Templates/NetCore/test/MainWindow.glade   | 46 +++++++++++++++++++
 Source/Templates/NetCore/test/Program.cs      | 23 ++++++++++
 Source/Templates/NetCore/test/test.csproj     | 14 ++++++
 build.cake                                    | 13 ++++++
 11 files changed, 146 insertions(+), 11 deletions(-)
 rename Source/Templates/{NetCoreTemplates/Gtk.Template.CSharp/Gtk.Template.CSharp.nuspec => NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec} (67%)
 rename Source/Templates/{NetCoreTemplates/Gtk.Template.CSharp => NetCore/GtkSharp.Template.CSharp}/content/.template.config/template.json (60%)
 rename Source/Templates/{NetCoreTemplates/Gtk.Template.CSharp => NetCore/GtkSharp.Template.CSharp}/content/GtkNamespace.csproj (100%)
 rename Source/Templates/{NetCoreTemplates/Gtk.Template.CSharp => NetCore/GtkSharp.Template.CSharp}/content/MainWindow.cs (100%)
 rename Source/Templates/{NetCoreTemplates/Gtk.Template.CSharp => NetCore/GtkSharp.Template.CSharp}/content/MainWindow.glade (100%)
 rename Source/Templates/{NetCoreTemplates/Gtk.Template.CSharp => NetCore/GtkSharp.Template.CSharp}/content/Program.cs (100%)
 create mode 100755 Source/Templates/NetCore/test/MainWindow.cs
 create mode 100755 Source/Templates/NetCore/test/MainWindow.glade
 create mode 100755 Source/Templates/NetCore/test/Program.cs
 create mode 100755 Source/Templates/NetCore/test/test.csproj

diff --git a/Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/Gtk.Template.CSharp.nuspec b/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec
similarity index 67%
rename from Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/Gtk.Template.CSharp.nuspec
rename to Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec
index 756efe36a..65fbdf14b 100755
--- a/Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/Gtk.Template.CSharp.nuspec
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <metadata>
-    <id>Gtk.Template.CSharp</id>
+    <id>GtkSharp.Template.CSharp</id>
     <version>3.0.0</version>
     <title>Gtk template for CSharp</title>
     <summary>A simple C# template for your .Net Core Gtk Application.</summary>
     <description>A simple C# template for your .Net Core Gtk Application.</description>
-    <authors>GLibSharp Team</authors>
-    <owners>GLibSharp Team</owners>
-    <projectUrl>https://github.com/GLibSharp/GtkSharp</projectUrl>
+    <authors>cra0zy</authors>
+    <owners>cra0zy</owners>
+    <projectUrl>https://github.com/cra0zy/GtkSharp</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <releaseNotes></releaseNotes>
-    <tags>gtk app dotnet new template</tags>
+    <tags>gtk gtksharp gtk-sharp app dotnet new template</tags>
     <packageTypes>
       <packageType name="Template" />
     </packageTypes>
   </metadata>
-</package>
+</package>
\ No newline at end of file
diff --git a/Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/content/.template.config/template.json b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/.template.config/template.json
similarity index 60%
rename from Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/content/.template.config/template.json
rename to Source/Templates/NetCore/GtkSharp.Template.CSharp/content/.template.config/template.json
index fd1594716..c022053bc 100755
--- a/Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/content/.template.config/template.json
+++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/.template.config/template.json
@@ -1,10 +1,12 @@
 {
   "$schema": "http://json.schemastore.org/template",
-  "author": "GLibSharp Team",
-  "classifications": [ "Console" ], 
+  "author": "cra0zy",
+  "classifications": [
+    "Console"
+  ],
   "name": "Gtk Application",
-  "identity": "Gtk.Template.CSharp",         
-  "groupIdentity": "Gtk.Template",
+  "identity": "GtkSharp.Template.CSharp",
+  "groupIdentity": "GtkSharp.Template",
   "shortName": "gtkapp",
   "tags": {
     "language": "C#",
@@ -12,4 +14,4 @@
   },
   "sourceName": "GtkNamespace",
   "preferNameDirectory": true
-}
+}
\ No newline at end of file
diff --git a/Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/content/GtkNamespace.csproj b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkNamespace.csproj
similarity index 100%
rename from Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/content/GtkNamespace.csproj
rename to Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkNamespace.csproj
diff --git a/Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/content/MainWindow.cs b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/MainWindow.cs
similarity index 100%
rename from Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/content/MainWindow.cs
rename to Source/Templates/NetCore/GtkSharp.Template.CSharp/content/MainWindow.cs
diff --git a/Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/content/MainWindow.glade b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/MainWindow.glade
similarity index 100%
rename from Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/content/MainWindow.glade
rename to Source/Templates/NetCore/GtkSharp.Template.CSharp/content/MainWindow.glade
diff --git a/Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/content/Program.cs b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/Program.cs
similarity index 100%
rename from Source/Templates/NetCoreTemplates/Gtk.Template.CSharp/content/Program.cs
rename to Source/Templates/NetCore/GtkSharp.Template.CSharp/content/Program.cs
diff --git a/Source/Templates/NetCore/test/MainWindow.cs b/Source/Templates/NetCore/test/MainWindow.cs
new file mode 100755
index 000000000..4ae890980
--- /dev/null
+++ b/Source/Templates/NetCore/test/MainWindow.cs
@@ -0,0 +1,37 @@
+using System;
+using Gtk;
+using UI = Gtk.Builder.ObjectAttribute;
+
+namespace test
+{
+    class MainWindow : Window
+    {
+#pragma warning disable 0649
+        [UI] private Label _label1;
+        [UI] private Button _button1;
+#pragma warning restore 0649
+
+        private int _counter;
+
+        public MainWindow() : this(new Builder("MainWindow.glade")) { }
+
+        private MainWindow(Builder builder) : base(builder.GetObject("MainWindow").Handle)
+        {
+            builder.Autoconnect(this);
+
+            DeleteEvent += OnDeleteEvent;
+            _button1.Clicked += Button1_Clicked;
+        }
+
+        private void OnDeleteEvent(object sender, DeleteEventArgs a)
+        {
+            Application.Quit();
+        }
+
+        private void Button1_Clicked(object sender, EventArgs a)
+        {
+            _counter++;
+            _label1.Text = "Hello World! This button has been clicked " + _counter + " time(s).";
+        }
+    }
+}
diff --git a/Source/Templates/NetCore/test/MainWindow.glade b/Source/Templates/NetCore/test/MainWindow.glade
new file mode 100755
index 000000000..a13c41b20
--- /dev/null
+++ b/Source/Templates/NetCore/test/MainWindow.glade
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="3.18"/>
+  <object class="GtkWindow" id="MainWindow">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Example Window</property>
+    <property name="default_width">480</property>
+    <property name="default_height">240</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">4</property>
+        <property name="margin_right">4</property>
+        <property name="margin_top">4</property>
+        <property name="margin_bottom">4</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkLabel" id="_label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Hello World!</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="_button1">
+            <property name="label" translatable="yes">Click me!</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="receives_default">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/Source/Templates/NetCore/test/Program.cs b/Source/Templates/NetCore/test/Program.cs
new file mode 100755
index 000000000..4132e2997
--- /dev/null
+++ b/Source/Templates/NetCore/test/Program.cs
@@ -0,0 +1,23 @@
+using System;
+using Gtk;
+
+namespace test
+{
+    class Program
+    {
+        [STAThread]
+        public static void Main(string[] args)
+        {
+            Application.Init();
+
+            var app = new Application("org.test.test", GLib.ApplicationFlags.None);
+            app.Register(GLib.Cancellable.Current);
+
+            var win = new MainWindow();
+            app.AddWindow(win);
+
+            win.Show();
+            Application.Run();
+        }
+    }
+}
diff --git a/Source/Templates/NetCore/test/test.csproj b/Source/Templates/NetCore/test/test.csproj
new file mode 100755
index 000000000..7a37f7744
--- /dev/null
+++ b/Source/Templates/NetCore/test/test.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MainWindow.glade">
+      <LogicalName>MainWindow.glade</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GtkSharp" Version="3.2.0" />
+  </ItemGroup>
+</Project>
diff --git a/build.cake b/build.cake
index f26b65253..1dc85bdb3 100755
--- a/build.cake
+++ b/build.cake
@@ -106,6 +106,19 @@ Task("PackageNuGet")
         DotNetCorePack(gassembly.Csproj, settings);
 });
 
+Task("PackageTemplates")
+    .IsDependentOn("Init")
+    .Does(() =>
+{
+    var settings = new NuGetPackSettings
+    {
+        BasePath = "Source/Templates/NetCore/GtkSharp.Template.CSharp",
+        OutputDirectory = "BuildOutput/NugetPackages"
+    };
+
+    NuGetPack("Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec", settings);
+});
+
 // TASK TARGETS
 
 Task("Default")