Merged

Author: odaibert

src/APIM_ARMTemplate/API.json

@@ -5,14 +5,9 @@
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\apimtemplate\apimtemplate.csproj" />
-  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <ProjectReference Include="..\apimtemplate\apimtemplate.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -27,4 +22,8 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\apimtemplate\apimtemplate.csproj" />
+  </ItemGroup>
+
 </Project>

src/APIM_ARMTemplate/APIM_ARMTemplate.sln

@@ -48,9 +48,6 @@ public ExtractCommand()
                     string apiname = (string)oApis["value"][i]["name"];
                     ColoredConsole.WriteLine(apiname);
 
-                    ReadFile();
-
-
                     ColoredConsole.WriteLine(api.GetAPIOperations(apimname, resourceGroup, apiname).Result);
                 }
                 Console.ReadKey();

src/APIM_ARMTemplate/apimtemplate.test/apimtemplate.test.csproj

@@ -5,7 +5,7 @@
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
 {
-    public class Template
+    public class ExtractorTemplate
     {
         [JsonProperty(PropertyName = "$schema")]
         public string schema { get; set; }
@@ -16,7 +16,7 @@ public class Template
         public object outputs { get; set; }
     }
 
-    public class TemplateParameterProperties
+    public class ExtractorTemplateParameterProperties
     {
         public string type { get; set; }
         public TemplateParameterMetadata metadata { get; set; }
@@ -25,12 +25,12 @@ public class TemplateParameterProperties
         public string value { get; set; }
     }
 
-    public class TemplateParameterMetadata
+    public class ExtractorTemplateParameterMetadata
     {
         public string description { get; set; }
     }
 
-    public class TemplateResource
+    public class ExtractorTemplateResource
     {
         public string name { get; set; }
         public string type { get; set; }

src/APIM_ARMTemplate/apimtemplate/Commands/Extract.cs

@@ -7,9 +7,9 @@
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
 {
-    public class TemplateCreator
+    public class ExtractTemplateCreator
     {
-        public Template CreateEmptyTemplate()
+        public Template ExtractorCreateEmptyTemplate()
         {
             // creates empty template for use in all other template creators
             Template template = new Template()