Merge pull request #8014 from MiYanni/az-cleanup-9-mermod

9: Merges several modules together

Author: markcowl

src/ResourceManager/Billing/Billing.sln

@@ -10,6 +10,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Billing.Test.Netco
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Profile.Netcore", "..\Profile\Commands.Profile\Commands.Profile.Netcore.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Consumption.Netcore", "Commands.Consumption\Commands.Consumption.Netcore.csproj", "{91E87DBE-3946-4A11-B8DD-84C6FC60181E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.UsageAggregates.Netcore", "Commands.UsageAggregates\Commands.UsageAggregates.Netcore.csproj", "{EE4A7A8F-D8BB-420C-A135-10CCF6FAEA54}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Consumption.Test.Netcore", "Commands.Consumption.Test\Commands.Consumption.Test.Netcore.csproj", "{6F8F77FD-4505-40DE-8CF4-E6C4C8509210}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.UsageAggregates.Test.Netcore", "Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.Netcore.csproj", "{87F7A1CA-3292-4DD8-904F-0685DBC6CDB5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -28,12 +36,30 @@ Global
 		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91E87DBE-3946-4A11-B8DD-84C6FC60181E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91E87DBE-3946-4A11-B8DD-84C6FC60181E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91E87DBE-3946-4A11-B8DD-84C6FC60181E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91E87DBE-3946-4A11-B8DD-84C6FC60181E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE4A7A8F-D8BB-420C-A135-10CCF6FAEA54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE4A7A8F-D8BB-420C-A135-10CCF6FAEA54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE4A7A8F-D8BB-420C-A135-10CCF6FAEA54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE4A7A8F-D8BB-420C-A135-10CCF6FAEA54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F8F77FD-4505-40DE-8CF4-E6C4C8509210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F8F77FD-4505-40DE-8CF4-E6C4C8509210}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F8F77FD-4505-40DE-8CF4-E6C4C8509210}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F8F77FD-4505-40DE-8CF4-E6C4C8509210}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87F7A1CA-3292-4DD8-904F-0685DBC6CDB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87F7A1CA-3292-4DD8-904F-0685DBC6CDB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87F7A1CA-3292-4DD8-904F-0685DBC6CDB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87F7A1CA-3292-4DD8-904F-0685DBC6CDB5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{9A685061-0EF3-4963-AC60-88610F6D309E} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{6F8F77FD-4505-40DE-8CF4-E6C4C8509210} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{87F7A1CA-3292-4DD8-904F-0685DBC6CDB5} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {777688CD-FAC7-4964-B41E-6647EBB5C6D1}

src/ResourceManager/Billing/Commands.Billing/Az.Billing.psd1

@@ -54,7 +54,9 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Profile'; ModuleVersion = '0.6.0'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = '.\Microsoft.Azure.Management.Billing.dll'
+RequiredAssemblies = '.\Microsoft.Azure.Management.Billing.dll',
+    '.\Microsoft.Azure.Management.Consumption.dll',
+    '.\Microsoft.Azure.Commerce.UsageAggregates.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()
@@ -63,17 +65,27 @@ RequiredAssemblies = '.\Microsoft.Azure.Management.Billing.dll'
 # TypesToProcess = @()
 
 # Format files (.ps1xml) to be loaded when importing this module
-FormatsToProcess = '.\Microsoft.Azure.Commands.Billing.Format.ps1xml'
+FormatsToProcess = '.\Microsoft.Azure.Commands.Billing.Format.ps1xml',
+    '.\Microsoft.Azure.Commands.Consumption.Format.ps1xml',
+    '.\Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml'
 
 # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
-NestedModules = @('.\Microsoft.Azure.Commands.Billing.dll')
+NestedModules = @('.\Microsoft.Azure.Commands.Billing.dll',
+    '.\Microsoft.Azure.Commands.Consumption.dll',
+    '.\Microsoft.Azure.Commands.UsageAggregates.dll')
 
 # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
 FunctionsToExport = @()
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
 CmdletsToExport = 'Get-AzBillingInvoice', 'Get-AzBillingPeriod', 
-    'Get-AzEnrollmentAccount'
+    'Get-AzEnrollmentAccount', 'Get-AzConsumptionBudget', 'Get-AzConsumptionMarketplace', 
+    'Get-AzConsumptionPriceSheet', 
+    'Get-AzConsumptionReservationDetail', 
+    'Get-AzConsumptionReservationSummary', 
+    'Get-AzConsumptionUsageDetail', 'New-AzConsumptionBudget', 
+    'Remove-AzConsumptionBudget', 'Set-AzConsumptionBudget', 
+    'Get-UsageAggregates'
 
 # Variables to export from this module
 # VariablesToExport = @()
@@ -96,7 +108,7 @@ PrivateData = @{
     PSData = @{
 
         # Tags applied to this module. These help with module discovery in online galleries.
-        Tags = 'Azure', 'ResourceManager', 'ARM', 'Billing'
+        Tags = 'Azure', 'ResourceManager', 'ARM', 'Billing', 'Consumption', 'UsageAggregates'
 
         # A URL to the license for this module.
         LicenseUri = 'https://aka.ms/azps-license'

src/ResourceManager/Consumption/Commands.Consumption.Test/Commands.Consumption.Test.Netcore.csproj renamed to src/ResourceManager/Billing/Commands.Consumption.Test/Commands.Consumption.Test.Netcore.csproj

@@ -99,7 +99,7 @@ public void RunPsTestWorkflow(
                 var callingClassName = callingClassType.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries).Last();
                 _helper.SetupModules(AzureModule.AzureResourceManager,
                     _helper.RMProfileModule,
-                    _helper.GetRMModulePath("AzureRM.Consumption.psd1"),
+                    _helper.GetRMModulePath("AzureRM.Billing.psd1"),
                     "ScenarioTests\\" + callingClassName + ".ps1",
                     "AzureRM.Resources.ps1");
                 try

src/ResourceManager/Consumption/Commands.Consumption.Test/MSSharedLibKey.snk renamed to src/ResourceManager/Billing/Commands.Consumption.Test/MSSharedLibKey.snk

@@ -10,7 +10,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <OutputPath>$(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Consumption\</OutputPath>
+    <OutputPath>$(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Billing\</OutputPath>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>
@@ -31,12 +31,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Consumption" Version="3.0.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="Az.Consumption.psd1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>true</DesignTime>

src/ResourceManager/Consumption/Commands.Consumption.Test/Properties/AssemblyInfo.cs renamed to src/ResourceManager/Billing/Commands.Consumption.Test/Properties/AssemblyInfo.cs

@@ -53,7 +53,7 @@ public void RunPsTest(XunitTracingInterceptor logger, params string[] scripts)
                 _helper.SetupModules(AzureModule.AzureResourceManager,
                     "ScenarioTests\\" + callingClassName + ".ps1",
                     _helper.RMProfileModule,
-                    _helper.GetRMModulePath(@"AzureRM.UsageAggregates.psd1"));
+                    _helper.GetRMModulePath(@"AzureRM.Billing.psd1"));
 
                 _helper.RunPowerShellTest(scripts);
             }

src/ResourceManager/Consumption/Commands.Consumption.Test/ScenarioTests/BudgetTests.cs renamed to src/ResourceManager/Billing/Commands.Consumption.Test/ScenarioTests/BudgetTests.cs

@@ -10,7 +10,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <OutputPath>$(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.UsageAggregates\</OutputPath>
+    <OutputPath>$(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Billing\</OutputPath>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>
@@ -31,12 +31,6 @@
     <PackageReference Include="Microsoft.Azure.Commerce.UsageAggregates" Version="1.5.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="Az.UsageAggregates.psd1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>true</DesignTime>