Merge pull request #779 from stankovski/release-0.15.0

Fix for #633 - C# generator emits some empty classes and updates from master
Azure · Mar 2, 2016 · d3f3abd · d3f3abd
2 parents df2ddf1 + 8ee8d12
commit d3f3abd
Show file tree

Hide file tree

Showing 52 changed files with 276 additions and 969 deletions.
diff --git a/...Tests/Expected/AcceptanceTests/AzureBodyDuration/AutoRestDurationTestServiceExtensions.cs b/...Tests/Expected/AcceptanceTests/AzureBodyDuration/AutoRestDurationTestServiceExtensions.cs
diff --git a/.../AcceptanceTests/AzureParameterGrouping/AutoRestParameterGroupingTestServiceExtensions.cs b/.../AcceptanceTests/AzureParameterGrouping/AutoRestParameterGroupingTestServiceExtensions.cs
diff --git a/...ected/AcceptanceTests/AzureSpecials/AutoRestAzureSpecialParametersTestClientExtensions.cs b/...ected/AcceptanceTests/AzureSpecials/AutoRestAzureSpecialParametersTestClientExtensions.cs
diff --git a/...s/Expected/AcceptanceTests/CustomBaseUri/AutoRestParameterizedHostTestClientExtensions.cs b/...s/Expected/AcceptanceTests/CustomBaseUri/AutoRestParameterizedHostTestClientExtensions.cs
diff --git a/...arp/Azure.CSharp.Tests/Expected/AcceptanceTests/Head/AutoRestHeadTestServiceExtensions.cs b/...arp/Azure.CSharp.Tests/Expected/AcceptanceTests/Head/AutoRestHeadTestServiceExtensions.cs
diff --git a/...sts/Expected/AcceptanceTests/HeadExceptions/AutoRestHeadExceptionTestServiceExtensions.cs b/...sts/Expected/AcceptanceTests/HeadExceptions/AutoRestHeadExceptionTestServiceExtensions.cs
diff --git a/...p.Tests/Expected/AcceptanceTests/Lro/AutoRestLongRunningOperationTestServiceExtensions.cs b/...p.Tests/Expected/AcceptanceTests/Lro/AutoRestLongRunningOperationTestServiceExtensions.cs
diff --git a/...Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/AutoRestPagingTestServiceExtensions.cs b/...Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/AutoRestPagingTestServiceExtensions.cs
diff --git a/...ests/Expected/AcceptanceTests/SubscriptionIdApiVersion/MicrosoftAzureTestUrlExtensions.cs b/...ests/Expected/AcceptanceTests/SubscriptionIdApiVersion/MicrosoftAzureTestUrlExtensions.cs
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp/AzureCSharpCodeGenerator.cs b/AutoRest/Generators/CSharp/Azure.CSharp/AzureCSharpCodeGenerator.cs
@@ -95,11 +95,14 @@ public override async Task Generate(ServiceClient serviceClient)
             await Write(serviceClientTemplate, serviceClient.Name + ".cs");
 
             // Service client extensions
-            var extensionsTemplate = new ExtensionsTemplate
+            if (serviceClient.Methods.Any(m => m.Group == null))
             {
-                Model = new AzureExtensionsTemplateModel(serviceClient, null),
-            };
-            await Write(extensionsTemplate, serviceClient.Name + "Extensions.cs");
+                var extensionsTemplate = new ExtensionsTemplate
+                {
+                    Model = new AzureExtensionsTemplateModel(serviceClient, null),
+                };
+                await Write(extensionsTemplate, serviceClient.Name + "Extensions.cs");
+            }
 
             // Service client interface
             var serviceClientInterfaceTemplate = new ServiceClientInterfaceTemplate

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/AutoRest.Generator.CSharp.Tests.xproj b/AutoRest/Generators/CSharp/CSharp.Tests/AutoRest.Generator.CSharp.Tests.xproj
@@ -25,7 +25,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties Swagger_4swagger-internal-ctors_1json__JSONSchema="..\..\..\..\..\schema\swagger-extensions.json" />
+      <UserProperties />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
diff --git a/...harp.Tests/Expected/AcceptanceTests/BodyArray/AutoRestSwaggerBATArrayServiceExtensions.cs b/...harp.Tests/Expected/AcceptanceTests/BodyArray/AutoRestSwaggerBATArrayServiceExtensions.cs
diff --git a/...rp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/AutoRestBoolTestServiceExtensions.cs b/...rp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/AutoRestBoolTestServiceExtensions.cs
diff --git a/...CSharp.Tests/Expected/AcceptanceTests/BodyByte/AutoRestSwaggerBATByteServiceExtensions.cs b/...CSharp.Tests/Expected/AcceptanceTests/BodyByte/AutoRestSwaggerBATByteServiceExtensions.cs
diff --git a/...CSharp.Tests/Expected/AcceptanceTests/BodyComplex/AutoRestComplexTestServiceExtensions.cs b/...CSharp.Tests/Expected/AcceptanceTests/BodyComplex/AutoRestComplexTestServiceExtensions.cs
diff --git a/...Sharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/AutoRestDateTestServiceExtensions.cs b/...Sharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/AutoRestDateTestServiceExtensions.cs