Skip to content

Commit c69f932

Browse files
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents 1d0ac42 + f119641 commit c69f932

File tree

376 files changed

+51897
-34037
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

376 files changed

+51897
-34037
lines changed

AzurePowershell.Test.targets

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<ScenarioTestDebug>.\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll</ScenarioTestDebug>
99
<CommonTestDebug>.\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll</CommonTestDebug>
1010
<SqlTestDebug>.\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll</SqlTestDebug>
11+
<ComputeDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.dll</ComputeDebug>
1112
<ComputeTestDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll</ComputeTestDebug>
1213
<NetworkTestDebug>.\src\ResourceManager\Network\Commands.Network.Test\bin\Debug\Microsoft.Azure.Commands.Network.Test.dll</NetworkTestDebug>
1314
<AzureRTTestSettings>.\src\AzureRT.testsettings</AzureRTTestSettings>
@@ -28,6 +29,7 @@
2829
<HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
2930
<StorageTestDebug>.\src\ServiceManagement\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
3031
<KeyVaultTestDebug>.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll</KeyVaultTestDebug>
32+
<UsageAggregationTestDebug>.\src\ResourceManager\Commerce\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll</UsageAggregationTestDebug>
3133
<TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain&#x26;!Network&#x26;!AzureRTUpload&#x26;!AzureRTCleanUp"</TestFilter>
3234
<ScenarioTestFilter>All</ScenarioTestFilter>
3335
<OneSDKCITFilter>"OneSDK&#x26;CIT"</OneSDKCITFilter>
@@ -54,13 +56,14 @@
5456
<XUnitTests Include=".\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
5557
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
5658
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
59+
<XUnitTests Include=".\src\ResourceManager\Commerce\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll"/>
5760
<XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>
5861
<XUnitTests Include=".\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll"/>
5962
<XUnitTests Include=".\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
6063
<XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
6164
<XUnitTests Include=".\src\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
6265
<XUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
63-
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
66+
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
6467
</ItemGroup>
6568

6669
<Target Name="InvokeMSTest">
@@ -241,6 +244,13 @@
241244
<Xunit.Runner.MSBuild.xunit Assemblies="$(KeyVaultTestDebug)" Html="$(TestOutputDirectory)\KeyVaultTests.xunit.dll.html" Verbose="true"
242245
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
243246
</Target>
247+
248+
<!-- run the UsageAggregationTests -->
249+
<Target Name="UsageAggregationTests">
250+
<Message Importance="high" Text="Running UsageAggregates tests" />
251+
<Xunit.Runner.MSBuild.xunit Assemblies="$(UsageAggregationTestDebug)" Html="$(TestOutputDirectory)\UsageAggregationTests.xunit.dll.html" Verbose="true"
252+
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
253+
</Target>
244254

245255
<!-- Run the scenario tests with Mocks -->
246256
<Target Name="MockedScenarioTests">
@@ -393,6 +403,14 @@
393403
ContinueOnError="false" />
394404
</Target>
395405

406+
<Target Name="ComputeCodeCoverage" DependsOnTargets="ForceRestorePackages;Clean;BuildDebug">
407+
<Message Importance="high" Text="Gathering Code Coverage data from Compute tests..." />
408+
<Delete Files="Project.covarage" />
409+
<Exec
410+
Command="C:\cc\ComputeCodeCoverage.cmd $(ComputeDebug) $(ComputeTestDebug)"
411+
ContinueOnError="false" />
412+
</Target>
413+
396414
<!-- DSC extension related targets -->
397415
<Target Name="TestDSCExtension_x64">
398416
<Message Importance="high" Text="Running DSC extension BVT x64 tests..." />

ChangeLog.txt

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,40 @@
1-
2015.06.25 version 0.9.4
2-
* Added Batch cmdlets
3-
* Start-AzureBatchPoolResize
4-
* Stop-AzureBatchPoolResize
1+
2015.06.26 version 0.9.4
2+
* Azure Compute cmdlets
3+
* Warning message for deprecation Name parameter in New-AzureVM. The guidance is to use –Name parameter in New-AzureVMConfig cmdlet.
4+
* Save-AzureVMImgage has new paramter -Path to save the JSON template returned from the server.
5+
* Add-AzureVMNetworkInterface has new paramter -NetworkInterface which accepts a list of NIC object returned by Get-AzureNetworkInterface cmdlet.
6+
* Deprecated “-Name” parameter in Set-AzureVMSourceImage. The guidance is to use the Pub, Offer, SKU, Version method to specify the VM Images for the VM.
7+
* Fixed the formatting of the output of VM Image cmdlets.
8+
* Fixed issues in New/Set-AzureDeployment & other service extension related cmdlets.
9+
* Azure Batch cmdlets
10+
* Added Start-AzureBatchPoolResize
11+
* Added Stop-AzureBatchPoolResize
12+
* Azure Key Vault cmdlets
13+
* Updated Key Vault package versions
14+
* Fixed bugs related to secrets
15+
* Azure Network Resource Provider cmdlets
16+
* New-AzureLocalNetworkGateway parameter name change
17+
* Reset-AzureLocalNetworkGateway renamed to Set-AzureLocalNetworkGateway, added new parameter
18+
* VirtualNetworkGateway parameter changes
19+
* New-AzureVirtualNetworkGateway parameter changes
20+
* Removed command Resize-AzureVirtualNetworkGateway
21+
* Reset-AzureVirtualNetworkGatewayConnection renamed to Set-AzureVirtualNetworkGatewayConnection8
22+
* Azure RedisCache cmdlets
23+
* Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513
24+
* New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513
25+
* Azure Resource Manager cmdlets
26+
* Added Get-UsageAggregates
27+
* Added Get-AzureProviderOperation cmdlet
28+
* Added Test-AzureResourceGroup and Test-AzureResource cmdlets
29+
* Refactored Resource Lock cmdlets
30+
* Removed unnecessary code when getting a resource
31+
* Azure SQL Database
32+
* Added cmdlets for pause/resume functionality and retrieving restore points for restoring backups:
33+
* Suspend-AzureSqlDatabase
34+
* Resume-AzureSqlDatabase
35+
* Get-AzureSqlDatabaseRestorePoints
36+
* Changed cmdlets:
37+
* New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
538

639
2015.06.05 version 0.9.3
740
* Fixed bug in Websites cmdlets related to slots #454

setup/azurecmd.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="0.9.3" ?>
8+
<?define version="0.9.4" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

setup/azurecmdfiles.wxi

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1868,6 +1868,9 @@
18681868
<Component Id="cmp99392DCBDE8044C2016FF93700B983EB" Guid="*">
18691869
<File Id="fil9A36FC098B4DD67347F5599B2C6E0B49" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\Microsoft.Azure.Management.TrafficManager.dll" />
18701870
</Component>
1871+
<Component Id="cmpA6A5BC25D7FEE2BDD4FE342605A5C6D6" Guid="*">
1872+
<File Id="fil6C584E0E8CB073F8A95DA33E731E9FB9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\Microsoft.Azure.ResourceManager.dll" />
1873+
</Component>
18711874
<Component Id="cmpF7B36B0AC5A53D62F461D739E7A0CD7F" Guid="*">
18721875
<File Id="filC265B633228818419FDBE0FDD7C0EB31" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
18731876
</Component>
@@ -1881,6 +1884,41 @@
18811884
<File Id="fil2EE4D727387984593EACCF967C5A417A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\System.Net.Http.Formatting.dll" />
18821885
</Component>
18831886
</Directory>
1887+
<Directory Id="dir32BED972EE251F875EA4F09B134AEF5E" Name="UsageAggregates">
1888+
<Component Id="cmpD145D7FE09196101520B2C18061AB078" Guid="*">
1889+
<File Id="filED88890651AE0FC7F16E7E1B29193FA8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Hyak.Common.dll" />
1890+
</Component>
1891+
<Component Id="cmp5A40221EF4E95DD5D56060852B14EE3B" Guid="*">
1892+
<File Id="filC04C275D2B8B5AAB929381709BDC19BF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.dll" />
1893+
</Component>
1894+
<Component Id="cmp4B165777C6CE008CFEE446ACB2A7B9AC" Guid="*">
1895+
<File Id="fil6BEF4AE37C0AABC1B6EBEACFDFB23EBF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.dll-help.xml" />
1896+
</Component>
1897+
<Component Id="cmpEAB3189ED9B3FC06E3EE9DF31FB78FCD" Guid="*">
1898+
<File Id="fil95DC13FD8BAE2C8DC3424CE9146D21D7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commerce.UsageAggregates.dll" />
1899+
</Component>
1900+
<Component Id="cmp3048A284A67314ED7DD113C8A0E7AACC" Guid="*">
1901+
<File Id="fil4746A971C2BAF476C3EE30F134B538C4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Common.Authentication.dll" />
1902+
</Component>
1903+
<Component Id="cmpB75C2663276AF9B54A1956F617A490ED" Guid="*">
1904+
<File Id="filD08C015ACF7AD5B062BE3E3B1906E9B9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Common.dll" />
1905+
</Component>
1906+
<Component Id="cmp91D57F5419289E0EA1726AB996C48F89" Guid="*">
1907+
<File Id="filF2B7F2A291EA5AF0DD39901DB2165B29" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1908+
</Component>
1909+
<Component Id="cmp28587E28E63FB7DC33E7A706CE1A97F0" Guid="*">
1910+
<File Id="fil820DF2C4D93FFC063173B332ECCFFED8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1911+
</Component>
1912+
<Component Id="cmp284F2546DD1BE4D69C3B73E601610E2E" Guid="*">
1913+
<File Id="filC856466A045915F20513BA625F127ADF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.WindowsAzure.Commands.Common.dll" />
1914+
</Component>
1915+
<Component Id="cmp44560EFE13A1B5A47A0E2CB848ECF8C7" Guid="*">
1916+
<File Id="filF0B029A9140C07B215BA98335F090980" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Newtonsoft.Json.dll" />
1917+
</Component>
1918+
<Component Id="cmp84B6B5DFEFD61AD649BF4A22CFEF2C86" Guid="*">
1919+
<File Id="fil77C2AC985863AB51DD34CBFD1CE7034E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\System.Net.Http.Formatting.dll" />
1920+
</Component>
1921+
</Directory>
18841922
<Directory Id="dirC50ADFE5CD118426F389B9B2CD995BF6" Name="Websites">
18851923
<Component Id="cmpCB9C95BF2FE6D784EC47F78CEA8714FE" Guid="*">
18861924
<File Id="fil6C3554ACEEBC9EA8063C3E75065A9154" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Websites\Hyak.Common.dll" />
@@ -4503,10 +4541,22 @@
45034541
<ComponentRef Id="cmpD2BE076C47F8E3FBE7F08523A849CE97" />
45044542
<ComponentRef Id="cmpA3BD6FFFE2A4A8906122B0CFCDD774A6" />
45054543
<ComponentRef Id="cmp99392DCBDE8044C2016FF93700B983EB" />
4544+
<ComponentRef Id="cmpA6A5BC25D7FEE2BDD4FE342605A5C6D6" />
45064545
<ComponentRef Id="cmpF7B36B0AC5A53D62F461D739E7A0CD7F" />
45074546
<ComponentRef Id="cmp2BC5CD3EEAB03215BAF80C8D91B316F1" />
45084547
<ComponentRef Id="cmp44E9CD59264367064398F4E0170F73B3" />
45094548
<ComponentRef Id="cmp166C9307AB9128CC171F02474EBC9F38" />
4549+
<ComponentRef Id="cmpD145D7FE09196101520B2C18061AB078" />
4550+
<ComponentRef Id="cmp5A40221EF4E95DD5D56060852B14EE3B" />
4551+
<ComponentRef Id="cmp4B165777C6CE008CFEE446ACB2A7B9AC" />
4552+
<ComponentRef Id="cmpEAB3189ED9B3FC06E3EE9DF31FB78FCD" />
4553+
<ComponentRef Id="cmp3048A284A67314ED7DD113C8A0E7AACC" />
4554+
<ComponentRef Id="cmpB75C2663276AF9B54A1956F617A490ED" />
4555+
<ComponentRef Id="cmp91D57F5419289E0EA1726AB996C48F89" />
4556+
<ComponentRef Id="cmp28587E28E63FB7DC33E7A706CE1A97F0" />
4557+
<ComponentRef Id="cmp284F2546DD1BE4D69C3B73E601610E2E" />
4558+
<ComponentRef Id="cmp44560EFE13A1B5A47A0E2CB848ECF8C7" />
4559+
<ComponentRef Id="cmp84B6B5DFEFD61AD649BF4A22CFEF2C86" />
45104560
<ComponentRef Id="cmpCB9C95BF2FE6D784EC47F78CEA8714FE" />
45114561
<ComponentRef Id="cmpAA3B522375D7F8190EF55B87EB1EB8D4" />
45124562
<ComponentRef Id="cmp1A3E551E9A3F632A9FF29E4347C0E07F" />

src/AzurePowershell.sln

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.OperationalInsight
218218
EndProject
219219
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.OperationalInsights.Test", "ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\Commands.OperationalInsights.Test.csproj", "{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}"
220220
EndProject
221+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates", "ResourceManager\Commerce\Commands.UsageAggregates\Commands.UsageAggregates.csproj", "{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}"
222+
EndProject
223+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates.Test", "ResourceManager\Commerce\Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.csproj", "{F220C306-29A3-4511-8518-A58A55C60D07}"
224+
EndProject
221225
Global
222226
GlobalSection(SolutionConfigurationPlatforms) = preSolution
223227
Debug|Any CPU = Debug|Any CPU
@@ -536,6 +540,14 @@ Global
536540
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Debug|Any CPU.Build.0 = Debug|Any CPU
537541
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Release|Any CPU.ActiveCfg = Release|Any CPU
538542
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Release|Any CPU.Build.0 = Release|Any CPU
543+
{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
544+
{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Debug|Any CPU.Build.0 = Debug|Any CPU
545+
{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Release|Any CPU.ActiveCfg = Release|Any CPU
546+
{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Release|Any CPU.Build.0 = Release|Any CPU
547+
{F220C306-29A3-4511-8518-A58A55C60D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
548+
{F220C306-29A3-4511-8518-A58A55C60D07}.Debug|Any CPU.Build.0 = Debug|Any CPU
549+
{F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.ActiveCfg = Release|Any CPU
550+
{F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.Build.0 = Release|Any CPU
539551
EndGlobalSection
540552
GlobalSection(SolutionProperties) = preSolution
541553
HideSolutionNode = FALSE
@@ -579,5 +591,6 @@ Global
579591
{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
580592
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
581593
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
594+
{F220C306-29A3-4511-8518-A58A55C60D07} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
582595
EndGlobalSection
583596
EndGlobal

src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@
6464
<SpecificVersion>False</SpecificVersion>
6565
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6666
</Reference>
67-
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
67+
<Reference Include="Microsoft.Azure.ResourceManager">
68+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7069
</Reference>
7170
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7271
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>

src/Common/Commands.Common.Storage/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.0.26-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
88
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
99
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@
6363
<Reference Include="Microsoft.Azure.Common.NetFramework">
6464
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6565
</Reference>
66-
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
66+
<Reference Include="Microsoft.Azure.ResourceManager">
67+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
6968
</Reference>
7069
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7170
<SpecificVersion>False</SpecificVersion>

0 commit comments

Comments
 (0)