Skip to content

Commit bf82141

Browse files
Matt-WestphalMatt-Westphal
committed
added UsageAggregates to the installer
1 parent a1f7e78 commit bf82141

File tree

7 files changed

+2057
-95
lines changed

7 files changed

+2057
-95
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1881,6 +1881,35 @@
18811881
<File Id="fil2EE4D727387984593EACCF967C5A417A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\System.Net.Http.Formatting.dll" />
18821882
</Component>
18831883
</Directory>
1884+
<Directory Id="dir32BED972EE251F875EA4F09B134AEF5E" Name="UsageAggregates">
1885+
<Component Id="cmpD145D7FE09196101520B2C18061AB078" Guid="*">
1886+
<File Id="filED88890651AE0FC7F16E7E1B29193FA8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Hyak.Common.dll" />
1887+
</Component>
1888+
<Component Id="cmpEAB3189ED9B3FC06E3EE9DF31FB78FCD" Guid="*">
1889+
<File Id="fil95DC13FD8BAE2C8DC3424CE9146D21D7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commerce.UsageAggregates.dll" />
1890+
</Component>
1891+
<Component Id="cmp3048A284A67314ED7DD113C8A0E7AACC" Guid="*">
1892+
<File Id="fil4746A971C2BAF476C3EE30F134B538C4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Common.Authentication.dll" />
1893+
</Component>
1894+
<Component Id="cmpB75C2663276AF9B54A1956F617A490ED" Guid="*">
1895+
<File Id="filD08C015ACF7AD5B062BE3E3B1906E9B9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Common.dll" />
1896+
</Component>
1897+
<Component Id="cmp91D57F5419289E0EA1726AB996C48F89" Guid="*">
1898+
<File Id="filF2B7F2A291EA5AF0DD39901DB2165B29" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1899+
</Component>
1900+
<Component Id="cmp28587E28E63FB7DC33E7A706CE1A97F0" Guid="*">
1901+
<File Id="fil820DF2C4D93FFC063173B332ECCFFED8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1902+
</Component>
1903+
<Component Id="cmp284F2546DD1BE4D69C3B73E601610E2E" Guid="*">
1904+
<File Id="filC856466A045915F20513BA625F127ADF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.WindowsAzure.Commands.Common.dll" />
1905+
</Component>
1906+
<Component Id="cmp44560EFE13A1B5A47A0E2CB848ECF8C7" Guid="*">
1907+
<File Id="filF0B029A9140C07B215BA98335F090980" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Newtonsoft.Json.dll" />
1908+
</Component>
1909+
<Component Id="cmp84B6B5DFEFD61AD649BF4A22CFEF2C86" Guid="*">
1910+
<File Id="fil77C2AC985863AB51DD34CBFD1CE7034E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\System.Net.Http.Formatting.dll" />
1911+
</Component>
1912+
</Directory>
18841913
<Directory Id="dirC50ADFE5CD118426F389B9B2CD995BF6" Name="Websites">
18851914
<Component Id="cmpCB9C95BF2FE6D784EC47F78CEA8714FE" Guid="*">
18861915
<File Id="fil6C3554ACEEBC9EA8063C3E75065A9154" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Websites\Hyak.Common.dll" />
@@ -4507,6 +4536,15 @@
45074536
<ComponentRef Id="cmp2BC5CD3EEAB03215BAF80C8D91B316F1" />
45084537
<ComponentRef Id="cmp44E9CD59264367064398F4E0170F73B3" />
45094538
<ComponentRef Id="cmp166C9307AB9128CC171F02474EBC9F38" />
4539+
<ComponentRef Id="cmpD145D7FE09196101520B2C18061AB078" />
4540+
<ComponentRef Id="cmpEAB3189ED9B3FC06E3EE9DF31FB78FCD" />
4541+
<ComponentRef Id="cmp3048A284A67314ED7DD113C8A0E7AACC" />
4542+
<ComponentRef Id="cmpB75C2663276AF9B54A1956F617A490ED" />
4543+
<ComponentRef Id="cmp91D57F5419289E0EA1726AB996C48F89" />
4544+
<ComponentRef Id="cmp28587E28E63FB7DC33E7A706CE1A97F0" />
4545+
<ComponentRef Id="cmp284F2546DD1BE4D69C3B73E601610E2E" />
4546+
<ComponentRef Id="cmp44560EFE13A1B5A47A0E2CB848ECF8C7" />
4547+
<ComponentRef Id="cmp84B6B5DFEFD61AD649BF4A22CFEF2C86" />
45104548
<ComponentRef Id="cmpCB9C95BF2FE6D784EC47F78CEA8714FE" />
45114549
<ComponentRef Id="cmpAA3B522375D7F8190EF55B87EB1EB8D4" />
45124550
<ComponentRef Id="cmp1A3E551E9A3F632A9FF29E4347C0E07F" />

‎setup/azurepowershell.sln

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.30110.0
3+
VisualStudioVersion = 12.0.31101.0
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
65
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "azurepowershell", "azurepowershell.wixproj", "{36D6E303-E057-4963-A093-C7AAE0FD92B3}"
76
ProjectSection(ProjectDependencies) = postProject
87
{EA5BD11B-10B3-433D-A250-92AE76669D8D} = {EA5BD11B-10B3-433D-A250-92AE76669D8D}
@@ -16,10 +15,8 @@ Global
1615
Release|Any CPU = Release|Any CPU
1716
EndGlobalSection
1817
GlobalSection(ProjectConfigurationPlatforms) = postSolution
19-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
21-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
22-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.Build.0 = Release|Any CPU
18+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|x86
19+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|x86
2320
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2421
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
2522
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@
9999
<ItemGroup>
100100
<Compile Include="Common\UsageAggregatesTestController.cs" />
101101
<Compile Include="Properties\AssemblyInfo.cs" />
102-
<Compile Include="ScenarioTests\UsageAggregatesTestBase.cs" />
103102
<Compile Include="ScenarioTests\UsageAggregatesTests.cs" />
104103
</ItemGroup>
105104
<ItemGroup>

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTestBase.cs

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1516
using Xunit;
1617

1718
namespace Microsoft.Azure.Commands.UsageAggregates.Test.ScenarioTests
1819
{
1920
public class UsageAggregatesTests
2021
{
2122
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2224
public void TestGetUsageAggregatesWithDefaultParameters()
2325
{
2426
UsageAggregatesTestController.NewInstance.RunPsTest("Test-GetUsageAggregatesWithDefaultParameters");

‎src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@
4949
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.26-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
52-
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
54-
<Private>True</Private>
55-
</Reference>
5652
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5753
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
5854
<Private>True</Private>
@@ -61,18 +57,6 @@
6157
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
6258
<Private>True</Private>
6359
</Reference>
64-
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
65-
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
66-
<Private>True</Private>
67-
</Reference>
68-
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
69-
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
70-
<Private>True</Private>
71-
</Reference>
72-
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
73-
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
74-
<Private>True</Private>
75-
</Reference>
7660
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
7761
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
7862
<Private>True</Private>
@@ -81,19 +65,9 @@
8165
<Reference Include="System.Core" />
8266
<Reference Include="System.Net" />
8367
<Reference Include="System.Net.Http" />
84-
<Reference Include="System.Net.Http.Extensions, Version=2.2.22.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
85-
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.22\lib\net45\System.Net.Http.Extensions.dll</HintPath>
86-
<Private>True</Private>
87-
</Reference>
88-
<Reference Include="System.Net.Http.Primitives, Version=4.2.22.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
89-
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.22\lib\net45\System.Net.Http.Primitives.dll</HintPath>
90-
<Private>True</Private>
91-
</Reference>
9268
<Reference Include="System.Net.Http.WebRequest" />
9369
<Reference Include="System.Xml.Linq" />
94-
<Reference Include="System.Data.DataSetExtensions" />
9570
<Reference Include="Microsoft.CSharp" />
96-
<Reference Include="System.Data" />
9771
<Reference Include="System.Xml" />
9872
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
9973
</ItemGroup>
@@ -111,6 +85,11 @@
11185
<None Include="packages.config" />
11286
<None Include="TestTheCmdLet.ps1" />
11387
</ItemGroup>
88+
<ItemGroup>
89+
<Content Include="Microsoft.WindowsAzure.Commands.UsageAggregates.dll-help.xml">
90+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
91+
</Content>
92+
</ItemGroup>
11493
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
11594
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
11695
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

0 commit comments

Comments
 (0)