cleaning up for publishing blog

jeffhollan · jeffhollan · commit 53b81773c727 · 2016-05-24T16:34:05.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,8 @@
 *.user
 *.userosscache
 *.sln.docstates
+*.nuspec
+*.nupkg
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
diff --git a/LogicAppTemplate/Constants/Constants.cs b/LogicAppTemplate/Constants/Constants.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ConverterLibrary
+namespace LogicAppTemplate
 {
     public static class Constants
     {
diff --git a/LogicAppTemplate/LogicAppTemplate.csproj b/LogicAppTemplate/LogicAppTemplate.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{CBEC9309-3748-487F-8118-A3865C21B02C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ConverterLibrary</RootNamespace>
-    <AssemblyName>ConverterLibrary</AssemblyName>
+    <RootNamespace>LogicAppTemplate</RootNamespace>
+    <AssemblyName>LogicAppTemplate</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -59,7 +59,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Constants\Constants.cs" />
-    <Compile Include="Converter.cs" />
+    <Compile Include="TemplateGenerator.cs" />
     <Compile Include="Models\ConnectionTemplate.cs" />
     <Compile Include="Models\DeploymentTemplate.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/LogicAppTemplate/Models/ConnectionTemplate.cs b/LogicAppTemplate/Models/ConnectionTemplate.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ConverterLibrary.Models
+namespace LogicAppTemplate.Models
 {
     public class Api
     {
diff --git a/LogicAppTemplate/Models/DeploymentTemplate.cs b/LogicAppTemplate/Models/DeploymentTemplate.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ConverterLibrary.Models
+namespace LogicAppTemplate.Models
 {
     public class DeploymentTemplate
     {
diff --git a/LogicAppTemplate/Properties/AssemblyInfo.cs b/LogicAppTemplate/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("ConverterLibrary")]
+[assembly: AssemblyTitle("LogicAppTemplate")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ConverterLibrary")]
+[assembly: AssemblyProduct("LogicAppTemplate")]
 [assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.2.0")]
+[assembly: AssemblyFileVersion("0.1.2.0")]
diff --git a/LogicAppTemplate/TemplateGenerator.cs b/LogicAppTemplate/TemplateGenerator.cs
@@ -1,4 +1,4 @@
-﻿using ConverterLibrary.Models;
+﻿using LogicAppTemplate.Models;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -15,10 +15,10 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace ConverterLibrary
+namespace LogicAppTemplate
 {
     [Cmdlet(VerbsCommon.Get, "LogicAppTemplate", ConfirmImpact = ConfirmImpact.None)]
-    public class Converter : PSCmdlet
+    public class TemplateGenerator : PSCmdlet
     {
         [Parameter(
             Mandatory = true,
@@ -50,12 +50,12 @@ public class Converter : PSCmdlet
         private JObject workflowTemplateReference;
 
 
-        public Converter()
+        public TemplateGenerator()
         {       
                 template = JsonConvert.DeserializeObject<DeploymentTemplate>(Constants.deploymentTemplate);
         }
 
-        public Converter(string token) : this()
+        public TemplateGenerator(string token) : this()
         {
             Token = token;
         }
@@ -100,7 +100,7 @@ public async Task<JObject> ConvertWithToken(string subscriptionId, string resour
             WriteVerbose("Retrieving Definition....");
             JObject _definition = await getDefinition();
             WriteVerbose("Converting definition to template");
-            return await convertTemplate(_definition);
+            return await generateDefinition(_definition);
         }
 
         private async Task<JObject> getDefinition()
@@ -120,14 +120,8 @@ private async Task<JObject> getDefinition()
             
         }
 
-        private async Task<JObject> convertTemplate(JObject definition)
-        {
-            
-            return  await createConnections(definition);
-        }
-
 
-        public async Task<JObject> createConnections(JObject definition)
+        private async Task<JObject> generateDefinition(JObject definition)
         {
             workflowTemplateReference = template.resources.Where(t => ((string)t["type"]) == "Microsoft.Logic/workflows").FirstOrDefault();
 
diff --git a/LogicAppTemplate/Templates/starterTemplate.json b/LogicAppTemplate/Templates/starterTemplate.json
diff --git a/LogicAppTemplate/Templates/starterTemplateCreated.json b/LogicAppTemplate/Templates/starterTemplateCreated.json
diff --git a/LogicAppTemplate/packages.config b/LogicAppTemplate/packages.config
diff --git a/LogicAppTemplateCreator.sln b/LogicAppTemplateCreator.sln
@@ -1,9 +1,9 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterLibrary", "ConverterLibrary\ConverterLibrary.csproj", "{CBEC9309-3748-487F-8118-A3865C21B02C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogicAppTemplate", "LogicAppTemplate\LogicAppTemplate.csproj", "{CBEC9309-3748-487F-8118-A3865C21B02C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using System.Text;`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`
`9`		`-namespace ConverterLibrary`
	`9`	`+namespace LogicAppTemplate`
`10`	`10`	`{`
`11`	`11`	`public static class Constants`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Text;`
`5`	`5`	`using System.Threading.Tasks;`
`6`	`6`
`7`		`-namespace ConverterLibrary.Models`
	`7`	`+namespace LogicAppTemplate.Models`
`8`	`8`	`{`
`9`	`9`	`public class Api`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using System.Text;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`
`10`		`-namespace ConverterLibrary.Models`
	`10`	`+namespace LogicAppTemplate.Models`
`11`	`11`	`{`
`12`	`12`	`public class DeploymentTemplate`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using ConverterLibrary.Models;`
	`1`	`+using LogicAppTemplate.Models;`
`2`	`2`	`using Microsoft.IdentityModel.Clients.ActiveDirectory;`
`3`	`3`	`using Newtonsoft.Json;`
`4`	`4`	`using Newtonsoft.Json.Linq;`
`@@ -15,10 +15,10 @@`
`15`	`15`	`using System.Threading.Tasks;`
`16`	`16`	`using System.Windows.Forms;`
`17`	`17`
`18`		`-namespace ConverterLibrary`
	`18`	`+namespace LogicAppTemplate`
`19`	`19`	`{`
`20`	`20`	`[Cmdlet(VerbsCommon.Get, "LogicAppTemplate", ConfirmImpact = ConfirmImpact.None)]`
`21`		`- public class Converter : PSCmdlet`
	`21`	`+ public class TemplateGenerator : PSCmdlet`
`22`	`22`	`{`
`23`	`23`	`[Parameter(`
`24`	`24`	`Mandatory = true,`
`@@ -50,12 +50,12 @@ public class Converter : PSCmdlet`
`50`	`50`	`private JObject workflowTemplateReference;`
`51`	`51`
`52`	`52`
`53`		`- public Converter()`
	`53`	`+ public TemplateGenerator()`
`54`	`54`	`{`
`55`	`55`	`template = JsonConvert.DeserializeObject<DeploymentTemplate>(Constants.deploymentTemplate);`
`56`	`56`	`}`
`57`	`57`
`58`		`- public Converter(string token) : this()`
	`58`	`+ public TemplateGenerator(string token) : this()`
`59`	`59`	`{`
`60`	`60`	`Token = token;`
`61`	`61`	`}`
`@@ -100,7 +100,7 @@ public async Task<JObject> ConvertWithToken(string subscriptionId, string resour`
`100`	`100`	`WriteVerbose("Retrieving Definition....");`
`101`	`101`	`JObject _definition = await getDefinition();`
`102`	`102`	`WriteVerbose("Converting definition to template");`
`103`		`- return await convertTemplate(_definition);`
	`103`	`+ return await generateDefinition(_definition);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`private async Task<JObject> getDefinition()`
`@@ -120,14 +120,8 @@ private async Task<JObject> getDefinition()`
`120`	`120`
`121`	`121`	`}`
`122`	`122`
`123`		`- private async Task<JObject> convertTemplate(JObject definition)`
`124`		`- {`
`125`		`-`
`126`		`- return await createConnections(definition);`
`127`		`- }`
`128`		`-`
`129`	`123`
`130`		`- public async Task<JObject> createConnections(JObject definition)`
	`124`	`+ private async Task<JObject> generateDefinition(JObject definition)`
`131`	`125`	`{`
`132`	`126`	`workflowTemplateReference = template.resources.Where(t => ((string)t["type"]) == "Microsoft.Logic/workflows").FirstOrDefault();`
`133`	`127`