Skip to content

Commit a03a3a7

Browse files
unknownunknown
authored andcommitted
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents c1ccc04 + 7732569 commit a03a3a7

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="Microsoft.Azure.Commerce.UsageAggregates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43-
<HintPath>..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.0-preview\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll</HintPath>
43+
<HintPath>..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.1-preview\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -116,7 +116,9 @@
116116
</ProjectReference>
117117
</ItemGroup>
118118
<ItemGroup>
119-
<None Include="packages.config" />
119+
<None Include="packages.config">
120+
<SubType>Designer</SubType>
121+
</None>
120122
<None Include="ScenarioTests\UsageAggregatesTests.ps1">
121123
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
122124
</None>

src/ResourceManager/Commerce/Commands.UsageAggregates.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
4-
<package id="Microsoft.Azure.Commerce.UsageAggregates" version="1.1.0-preview" targetFramework="net45" />
4+
<package id="Microsoft.Azure.Commerce.UsageAggregates" version="1.1.1-preview" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Authentication" version="1.0.26-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\net45\Hyak.Common.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Microsoft.Azure.Commerce.UsageAggregates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
41-
<HintPath>..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.0-preview\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll</HintPath>
40+
<Reference Include="Microsoft.Azure.Commerce.UsageAggregates">
41+
<HintPath>..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.1-preview\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
4444
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

src/ResourceManager/Commerce/Commands.UsageAggregates/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
4-
<package id="Microsoft.Azure.Commerce.UsageAggregates" version="1.1.0-preview" targetFramework="net45" />
4+
<package id="Microsoft.Azure.Commerce.UsageAggregates" version="1.1.1-preview" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Authentication" version="1.0.26-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />

0 commit comments

Comments
 (0)