Merge pull request #23 from Azure/master

.

src/ResourceManagement/ApiApp/ApiAppManagement/ApiAppManagement.csproj

@@ -23,7 +23,6 @@
     <Reference Include="Microsoft.Azure.Common">
       <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.Common.2.1.0\lib\portable-net45+wp8+wpa81+win\Microsoft.Azure.Common.dll</HintPath>
     </Reference>
-
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Generated\ApiAppManagementClient.cs" />
@@ -35,6 +34,7 @@
     <Compile Include="Generated\ITemplateOperations.cs" />
     <Compile Include="Generated\Models\ApiApp.cs" />
     <Compile Include="Generated\Models\DeploymentTemplateMetadata.cs" />
+    <Compile Include="Generated\Models\GetApiAppResponse.cs" />
     <Compile Include="Generated\Models\GetDeploymentMetadataRequest.cs" />
     <Compile Include="Generated\Models\GetDeploymentTemplateMetadataResponse.cs" />
     <Compile Include="Generated\Models\LengthConstraint.cs" />

src/ResourceManagement/ApiApp/ApiAppManagement/Generated/ApiAppOperationsExtensions.cs

@@ -38,6 +38,54 @@ namespace Microsoft.Azure.Management.ApiApps
     /// </summary>
     public static partial class ApiAppOperationsExtensions
     {
+        /// <summary>
+        /// Get information about a specific ApiApp
+        /// </summary>
+        /// <param name='operations'>
+        /// Reference to the
+        /// Microsoft.Azure.Management.ApiApps.IApiAppOperations.
+        /// </param>
+        /// <param name='resourceGroup'>
+        /// Required. The resource group containing the api app
+        /// </param>
+        /// <param name='name'>
+        /// Required. The instance name of the apiapp
+        /// </param>
+        /// <returns>
+        /// A standard service response including an HTTP status code and
+        /// request ID.
+        /// </returns>
+        public static GetApiAppResponse Get(this IApiAppOperations operations, string resourceGroup, string name)
+        {
+            return Task.Factory.StartNew((object s) => 
+            {
+                return ((IApiAppOperations)s).GetAsync(resourceGroup, name);
+            }
+            , operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+        }
+
+        /// <summary>
+        /// Get information about a specific ApiApp
+        /// </summary>
+        /// <param name='operations'>
+        /// Reference to the
+        /// Microsoft.Azure.Management.ApiApps.IApiAppOperations.
+        /// </param>
+        /// <param name='resourceGroup'>
+        /// Required. The resource group containing the api app
+        /// </param>
+        /// <param name='name'>
+        /// Required. The instance name of the apiapp
+        /// </param>
+        /// <returns>
+        /// A standard service response including an HTTP status code and
+        /// request ID.
+        /// </returns>
+        public static Task<GetApiAppResponse> GetAsync(this IApiAppOperations operations, string resourceGroup, string name)
+        {
+            return operations.GetAsync(resourceGroup, name, CancellationToken.None);
+        }
+
         /// <summary>
         /// Return list of the deployed ApiApps for the resource group
         /// </summary>
@@ -46,17 +94,21 @@ public static partial class ApiAppOperationsExtensions
         /// Microsoft.Azure.Management.ApiApps.IApiAppOperations.
         /// </param>
         /// <param name='resourceGroup'>
-        /// Required.
+        /// Required. Name of the resource group containing the apiapps to list
+        /// </param>
+        /// <param name='expand'>
+        /// Optional. Option controlling how much data to return, valid options
+        /// are "basic" or "detail"
         /// </param>
         /// <returns>
         /// A standard service response including an HTTP status code and
         /// request ID.
         /// </returns>
-        public static ListApiAppsResponse List(this IApiAppOperations operations, string resourceGroup)
+        public static ListApiAppsResponse List(this IApiAppOperations operations, string resourceGroup, string expand)
         {
             return Task.Factory.StartNew((object s) => 
             {
-                return ((IApiAppOperations)s).ListAsync(resourceGroup);
+                return ((IApiAppOperations)s).ListAsync(resourceGroup, expand);
             }
             , operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
         }
@@ -69,15 +121,19 @@ public static ListApiAppsResponse List(this IApiAppOperations operations, string
         /// Microsoft.Azure.Management.ApiApps.IApiAppOperations.
         /// </param>
         /// <param name='resourceGroup'>
-        /// Required.
+        /// Required. Name of the resource group containing the apiapps to list
+        /// </param>
+        /// <param name='expand'>
+        /// Optional. Option controlling how much data to return, valid options
+        /// are "basic" or "detail"
         /// </param>
         /// <returns>
         /// A standard service response including an HTTP status code and
         /// request ID.
         /// </returns>
-        public static Task<ListApiAppsResponse> ListAsync(this IApiAppOperations operations, string resourceGroup)
+        public static Task<ListApiAppsResponse> ListAsync(this IApiAppOperations operations, string resourceGroup, string expand)
         {
-            return operations.ListAsync(resourceGroup, CancellationToken.None);
+            return operations.ListAsync(resourceGroup, expand, CancellationToken.None);
         }
 
         /// <summary>

src/ResourceManagement/ApiApp/ApiAppManagement/Generated/IApiAppOperations.cs

@@ -34,17 +34,42 @@ namespace Microsoft.Azure.Management.ApiApps
     /// </summary>
     public partial interface IApiAppOperations
     {
+        /// <summary>
+        /// Get information about a specific ApiApp
+        /// </summary>
+        /// <param name='resourceGroup'>
+        /// The resource group containing the api app
+        /// </param>
+        /// <param name='name'>
+        /// The instance name of the apiapp
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// Cancellation token.
+        /// </param>
+        /// <returns>
+        /// A standard service response including an HTTP status code and
+        /// request ID.
+        /// </returns>
+        Task<GetApiAppResponse> GetAsync(string resourceGroup, string name, CancellationToken cancellationToken);
+
         /// <summary>
         /// Return list of the deployed ApiApps for the resource group
         /// </summary>
+        /// <param name='resourceGroup'>
+        /// Name of the resource group containing the apiapps to list
+        /// </param>
+        /// <param name='expand'>
+        /// Option controlling how much data to return, valid options are
+        /// "basic" or "detail"
+        /// </param>
         /// <param name='cancellationToken'>
         /// Cancellation token.
         /// </param>
         /// <returns>
         /// A standard service response including an HTTP status code and
         /// request ID.
         /// </returns>
-        Task<ListApiAppsResponse> ListAsync(string resourceGroup, CancellationToken cancellationToken);
+        Task<ListApiAppsResponse> ListAsync(string resourceGroup, string expand, CancellationToken cancellationToken);
 
         /// <summary>
         /// Return list of the deployed ApiApps for this subscription

src/ResourceManagement/ApiApp/ApiAppManagement/Generated/Models/GetApiAppResponse.cs

@@ -0,0 +1,53 @@
+// 
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// 
+
+// Warning: This code was generated by a tool.
+// 
+// Changes to this file may cause incorrect behavior and will be lost if the
+// code is regenerated.
+
+using System;
+using System.Linq;
+using Microsoft.Azure;
+using Microsoft.Azure.Management.ApiApps.Models;
+
+namespace Microsoft.Azure.Management.ApiApps.Models
+{
+    /// <summary>
+    /// A standard service response including an HTTP status code and request
+    /// ID.
+    /// </summary>
+    public partial class GetApiAppResponse : AzureOperationResponse
+    {
+        private ApiApp _apiApp;
+
+        /// <summary>
+        /// Optional.
+        /// </summary>
+        public ApiApp ApiApp
+        {
+            get { return this._apiApp; }
+            set { this._apiApp = value; }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the GetApiAppResponse class.
+        /// </summary>
+        public GetApiAppResponse()
+        {
+        }
+    }
+}

src/ResourceManagement/Commerce/Commerce.sln

@@ -0,0 +1,54 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageAggregates", "UsageAggregates\UsageAggregates.csproj", "{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageAggregates.Tests", "UsageAggregates.Tests\UsageAggregates.Tests.csproj", "{84F44D2D-6FED-4968-80E6-0ED31E19572B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestDependencies", "..\..\TestDependencies\TestDependencies.csproj", "{40F35645-00EE-4DF2-B66E-7624546B66DF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Net40-Debug|Any CPU = Net40-Debug|Any CPU
+		Net40-Release|Any CPU = Net40-Release|Any CPU
+		Net45-Debug|Any CPU = Net45-Debug|Any CPU
+		Net45-Release|Any CPU = Net45-Release|Any CPU
+		Portable-Debug|Any CPU = Portable-Debug|Any CPU
+		Portable-Release|Any CPU = Portable-Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
+		{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}.Net40-Debug|Any CPU.Build.0 = Net40-Debug|Any CPU
+		{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
+		{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}.Net40-Release|Any CPU.Build.0 = Net40-Release|Any CPU
+		{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
+		{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
+		{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
+		{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
+		{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
+		{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
+		{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
+		{9F6A517D-ABF7-4A5A-9380-97DACB0BCFD5}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
+		{84F44D2D-6FED-4968-80E6-0ED31E19572B}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
+		{84F44D2D-6FED-4968-80E6-0ED31E19572B}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
+		{84F44D2D-6FED-4968-80E6-0ED31E19572B}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
+		{84F44D2D-6FED-4968-80E6-0ED31E19572B}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
+		{84F44D2D-6FED-4968-80E6-0ED31E19572B}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
+		{84F44D2D-6FED-4968-80E6-0ED31E19572B}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
+		{84F44D2D-6FED-4968-80E6-0ED31E19572B}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
+		{84F44D2D-6FED-4968-80E6-0ED31E19572B}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
+		{40F35645-00EE-4DF2-B66E-7624546B66DF}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
+		{40F35645-00EE-4DF2-B66E-7624546B66DF}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
+		{40F35645-00EE-4DF2-B66E-7624546B66DF}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
+		{40F35645-00EE-4DF2-B66E-7624546B66DF}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
+		{40F35645-00EE-4DF2-B66E-7624546B66DF}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
+		{40F35645-00EE-4DF2-B66E-7624546B66DF}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
+		{40F35645-00EE-4DF2-B66E-7624546B66DF}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
+		{40F35645-00EE-4DF2-B66E-7624546B66DF}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

src/ResourceManagement/Commerce/NuGet.Config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<settings>
+  <repositoryPath>..\..\..\packages</repositoryPath>
+</settings>