Skip to content

Commit 73ea56f

Browse files
DeepakRajendranMsftDeepakRajendranMsft
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents 10cb82c + 8ab912a commit 73ea56f

File tree

541 files changed

+94968
-112216
lines changed

Some content is hidden

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

541 files changed

+94968
-112216
lines changed

‎ChangeLog.md

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,44 @@
1-
* Azure Redis Cache
1+
##2016.08.03 version 2.0.0
2+
* Azure Redis Cache
23
* New cmdlet added for New-AzureRmRedisCacheScheduleEntry
34
* New cmdlet added for New-AzureRmRedisCachePatchSchedule
45
* New cmdlet added for Get-AzureRmRedisCachePatchSchedule
56
* New cmdlet added for Remove-AzureRmRedisCachePatchSchedule
7+
* Azure Storage
8+
* Change -Tag parameter type from HashTable[] to HashTable
9+
- New-AzureRmStorageAccount
10+
- Set-AzureRmStorageAccount
11+
* Normalize the ShouldProcess Confirmation, so when $ConfirmPreference is set lower than "High", user need to include the parameter: ‘-Confirm:$false’ in their PowerShell scripts to suspress ShouldProcess Conformation
12+
- Remove-AzureRmStorageAccount
13+
- Remove-AzureStorageBlob
14+
- Remove-AzureStorageContainer
15+
- Remove-AzureStorageTable
16+
- Remove-AzureStorageQueue
17+
- Remove-AzureStorageShare
18+
- Remove-AzureStorageDirectory
19+
- Remove-AzureStorageFile
20+
- Remove-AzureStorageContainerStoredAccessPolicy
21+
- Remove-AzureStorageShareStoredAccessPolicy
22+
- Remove-AzureStorageTableStoredAccessPolicy
23+
- Remove-AzureStorageQueueStoredAccessPolicy
24+
- Set-AzureStorageContainerStoredAccessPolicy
25+
- Set-AzureStorageShareStoredAccessPolicy
26+
- Set-AzureStorageTableStoredAccessPolicy
27+
- Set-AzureStorageQueueStoredAccessPolicy
28+
- Set-AzureRmStorageAccount
29+
* Add confirmation and -Force parameter to suspress ShouldContinue confirmation
30+
- Remove-AzureRmStorageAccount
31+
- Set-AzureRmStorageAccount
32+
* Use -Force parameter instead of -Confirm parameter to suspress ShouldContinue confirmaiton
33+
- Remove-AzureStorageShare
34+
* ShouldContinue confirmation needed (suspress with -Force) only when there's data in the Container/Table to delete
35+
- Remove-AzureStorageContainer
36+
- Remove-AzureStorageTable
37+
38+
39+
40+
41+
642
##2016.07.11 version 1.6.0
743
* **Behavioral change for -Force, –Confirm and $ConfirmPreference parameters for all cmdlets. We are changing this implementation to be in line with PowerShell guidelines. For most cmdlets, this means removing the Force parameter and to skip the ShouldProcess prompt, users will need to include the parameter: ‘-Confirm:$false’ in their PowerShell scripts.** This changes are addressing following issues:
844
* Correct implementation of –WhatIf functionality, allowing a user to determine the effects of a cmdlet or script without making any actual changes

‎setup/azurecmdfiles.wxi

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,6 +1763,59 @@
17631763
<File Id="filD6D42F626E72D9E9389F18E941D176C8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.MachineLearning\Newtonsoft.Json.dll" />
17641764
</Component>
17651765
</Directory>
1766+
<Directory Id="dirCB0C047DD4181DECD8246B00896D9DEB" Name="AzureRM.Media">
1767+
<Component Id="cmp6FD3249008BE1CA9554B0CF205468ECC" Guid="*">
1768+
<File Id="filC9AF0C225F606A630DAE236D5A762C79" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\AzureRM.Media.psd1" />
1769+
</Component>
1770+
<Component Id="cmp990FBAE4CED884C255B3B411FE048F5C" Guid="*">
1771+
<File Id="filD9EEA290A23062913C238C8663ADA9FD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Hyak.Common.dll" />
1772+
</Component>
1773+
<Component Id="cmp02D09ECD86BB8DDA4C92B0E3FCDD29B4" Guid="*">
1774+
<File Id="filB9074FD81FCC53C3D27A283D8CD9B246" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.ApplicationInsights.dll" />
1775+
</Component>
1776+
<Component Id="cmpBB2F6E7F99D800F69FE77397AFFF6494" Guid="*">
1777+
<File Id="fil187A2D762F2546B8F644E43513445AB9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.Azure.Commands.Common.Authentication.dll" />
1778+
</Component>
1779+
<Component Id="cmp3C3A70621EDD9E921588895963830D1F" Guid="*">
1780+
<File Id="filC8ECF5BBBD4F9CC7CF4A849BFD0A6354" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.Azure.Commands.Media.dll" />
1781+
</Component>
1782+
<Component Id="cmpFA8D9E28E23E26CA494D20C7C66574F1" Guid="*">
1783+
<File Id="filC23CB14F7B2B017DFD96489CB9E4A416" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.Azure.Commands.Media.dll-help.xml" />
1784+
</Component>
1785+
<Component Id="cmp5F8362262B03770E1D6E83AC1198F42C" Guid="*">
1786+
<File Id="fil09E539E76A147FCAECF13AED8BB5EE0C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
1787+
</Component>
1788+
<Component Id="cmpA429913D176DB5A7AA29059081E6E096" Guid="*">
1789+
<File Id="filBBE47E3274C4CBEB2BE130E2FB49954C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.Azure.Common.dll" />
1790+
</Component>
1791+
<Component Id="cmp2ED1190C997FFCF5E5017285C394EBF1" Guid="*">
1792+
<File Id="fil0BDE38322FA23EDCBDF52DCA33D9D542" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.Azure.Common.NetFramework.dll" />
1793+
</Component>
1794+
<Component Id="cmpF40F2EBA5E18B5A3EA805204D93429B3" Guid="*">
1795+
<File Id="fil1BF4A4A0C8033DEBF6A8397642FEA7BB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.Azure.Management.Media.dll" />
1796+
</Component>
1797+
<Component Id="cmpA785584DD3F030586DCFAFC7FB79FBBB" Guid="*">
1798+
<File Id="fil7EB16EA1F60C516BA17A9E334BDDD1DD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1799+
</Component>
1800+
<Component Id="cmp0556E8A6E176708B75C2D413A35F07AA" Guid="*">
1801+
<File Id="fil66E3063CA1F91BCC8248936B9BC61F59" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
1802+
</Component>
1803+
<Component Id="cmp51AFCB3DF092922C6DF37BD25EB2F0C9" Guid="*">
1804+
<File Id="fil9BADD4578D830B3B7BAB485B9E80D4C4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.Rest.ClientRuntime.Azure.dll" />
1805+
</Component>
1806+
<Component Id="cmp70C44CD009443D32B868EAF8DFD9B81C" Guid="*">
1807+
<File Id="filFD0CC67D319611C447C1F9BEC4F1DC61" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.Rest.ClientRuntime.dll" />
1808+
</Component>
1809+
<Component Id="cmpC0F104660B8BF03BCF989733DF929BB8" Guid="*">
1810+
<File Id="fil10E37119CC588282DAF7A1E3BA47340E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.Threading.Tasks.dll" />
1811+
</Component>
1812+
<Component Id="cmpA1F900208D425C287DFB0320A0F48DB5" Guid="*">
1813+
<File Id="fil5045D4F0EBBCB6B8C3B6B9536C85D183" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Microsoft.WindowsAzure.Commands.Common.dll" />
1814+
</Component>
1815+
<Component Id="cmpA67A6B341C686CD4986B23EBEF40B6FD" Guid="*">
1816+
<File Id="fil7BBF883E236D371FE1BD642C9BB2F73D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Media\Newtonsoft.Json.dll" />
1817+
</Component>
1818+
</Directory>
17661819
<Directory Id="dir76147B1D381C34B7638F2A844B5685DC" Name="AzureRM.Network">
17671820
<Component Id="cmp33F39A22183184A6B41F85DF085BAD29" Guid="*">
17681821
<File Id="fil55AEBBBFEF03FD95E26F163516FF2E54" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AutoMapper.dll" />
@@ -6030,6 +6083,23 @@
60306083
<ComponentRef Id="cmpCE57E791762E3631B8C38599B6593102" />
60316084
<ComponentRef Id="cmp3410AB0438048C3EBA9AED8ED25EA043" />
60326085
<ComponentRef Id="cmp5786485F44089C42878CE439EB85D475" />
6086+
<ComponentRef Id="cmp6FD3249008BE1CA9554B0CF205468ECC" />
6087+
<ComponentRef Id="cmp990FBAE4CED884C255B3B411FE048F5C" />
6088+
<ComponentRef Id="cmp02D09ECD86BB8DDA4C92B0E3FCDD29B4" />
6089+
<ComponentRef Id="cmpBB2F6E7F99D800F69FE77397AFFF6494" />
6090+
<ComponentRef Id="cmp3C3A70621EDD9E921588895963830D1F" />
6091+
<ComponentRef Id="cmpFA8D9E28E23E26CA494D20C7C66574F1" />
6092+
<ComponentRef Id="cmp5F8362262B03770E1D6E83AC1198F42C" />
6093+
<ComponentRef Id="cmpA429913D176DB5A7AA29059081E6E096" />
6094+
<ComponentRef Id="cmp2ED1190C997FFCF5E5017285C394EBF1" />
6095+
<ComponentRef Id="cmpF40F2EBA5E18B5A3EA805204D93429B3" />
6096+
<ComponentRef Id="cmpA785584DD3F030586DCFAFC7FB79FBBB" />
6097+
<ComponentRef Id="cmp0556E8A6E176708B75C2D413A35F07AA" />
6098+
<ComponentRef Id="cmp51AFCB3DF092922C6DF37BD25EB2F0C9" />
6099+
<ComponentRef Id="cmp70C44CD009443D32B868EAF8DFD9B81C" />
6100+
<ComponentRef Id="cmpC0F104660B8BF03BCF989733DF929BB8" />
6101+
<ComponentRef Id="cmpA1F900208D425C287DFB0320A0F48DB5" />
6102+
<ComponentRef Id="cmpA67A6B341C686CD4986B23EBEF40B6FD" />
60336103
<ComponentRef Id="cmp33F39A22183184A6B41F85DF085BAD29" />
60346104
<ComponentRef Id="cmp70B60DBD32D61BCA5715AB2D64131358" />
60356105
<ComponentRef Id="cmp6E3EAD7F12BD99ACB19E0249804739D9" />

‎src/Common/Commands.ScenarioTests.Common/Assert.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function Assert-ThrowsContains
6767
}
6868
catch
6969
{
70-
if ($message -ne "")
70+
if ($compare -ne "")
7171
{
7272
$actualMessage = $_.Exception.Message
7373
Write-Output ("Caught exception: '$actualMessage'")
@@ -105,7 +105,7 @@ function Assert-ThrowsLike
105105
}
106106
catch
107107
{
108-
if ($message -ne "")
108+
if ($compare -ne "")
109109
{
110110
$actualMessage = $_.Exception.Message
111111
Write-Output ("Caught exception: '$actualMessage'")

‎src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<HintPath>..\..\packages\Microsoft.Azure.Test.Framework.1.0.6047.28041-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Microsoft.Azure.Test.HttpRecorder">
60-
<HintPath>..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.6-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
60+
<HintPath>..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
6161
</Reference>
6262
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.0.725, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6363
<SpecificVersion>False</SpecificVersion>

‎src/Common/Commands.ScenarioTests.Common/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Test.Framework" version="1.0.6047.28041-prerelease" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.6-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
</Reference>
7575
<Reference Include="Microsoft.Azure.Test.HttpRecorder">
7676
<SpecificVersion>False</SpecificVersion>
77-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.6-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
77+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
7878
</Reference>
7979
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.0.725, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8080
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Test.Framework" version="1.0.6047.28041-prerelease" targetFramework="net45" />
11-
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.6-preview" targetFramework="net45" />
11+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
1212
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1313
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1414
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
</Reference>
7575
<Reference Include="Microsoft.Azure.Test.HttpRecorder">
7676
<SpecificVersion>False</SpecificVersion>
77-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.6-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
77+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
7878
</Reference>
7979
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.0.725, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8080
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.6047.28041-prerelease" targetFramework="net45" />
12-
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.6-preview" targetFramework="net45" />
12+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
1313
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1414
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1515
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

‎src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</Reference>
7474
<Reference Include="Microsoft.Azure.Test.HttpRecorder">
7575
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.6-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
76+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
7777
</Reference>
7878
<Reference Include="Microsoft.CSharp" />
7979
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.0.725, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/Automation/Commands.Automation.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Management.Automation" version="2.0.1" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Test.Framework" version="1.0.6047.28041-prerelease" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.6-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1212
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.6047.28041-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Microsoft.Azure.Test.HttpRecorder">
60-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.6-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
60+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
6161
</Reference>
6262
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.0.725, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6363
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Management.BackupServices" version="1.0.5-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Test.Framework" version="1.0.6047.28041-prerelease" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.6-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1212
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

‎src/ResourceManager/AzureBatch/BatchModelGenerator/BatchModelGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@
4949
<Target Name="AfterBuild">
5050
</Target>
5151
-->
52-
</Project>
52+
</Project>

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/BatchTestHelpers.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
using System.Reflection;
2828
using System.Threading.Tasks;
2929
using Microsoft.Azure.Commands.Batch.Models;
30+
using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
3031
using Xunit;
3132
using ProxyModels = Microsoft.Azure.Batch.Protocol.Models;
3233

@@ -69,7 +70,7 @@ public static AccountResource CreateAccountResource(string accountName, string r
6970

7071
if (tags != null)
7172
{
72-
resource.Tags = Microsoft.Azure.Commands.Batch.Helpers.CreateTagDictionary(tags, true);
73+
resource.Tags = TagsConversionHelper.CreateTagDictionary(tags, true);
7374
}
7475

7576
return resource;

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.6047.28041-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
7777
</Reference>
7878
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.6-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
79+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
8080
<Private>True</Private>
8181
</Reference>
8282
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

0 commit comments

Comments
 (0)