Skip to content

Commit adf8770

Browse files
amarzaveryamarzavery
committed
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
2 parents cb9e821 + 304db8e commit adf8770

File tree

77 files changed

+3653
-2778
lines changed

Some content is hidden

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

77 files changed

+3653
-2778
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@
210210
<Component Id="cmp04F046DCD3C191FC98D9F1338855F823" Guid="*">
211211
<File Id="fil2726BF25C508F620D514549EED9C51DB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Azure.Insights.dll" />
212212
</Component>
213+
<Component Id="cmp3B09E1BDCA0B52F9EA656CCC45BD9719" Guid="*">
214+
<File Id="fil25472A8FA7FA8AD458FF3DD90F113F8A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Azure.ResourceManager.dll" />
215+
</Component>
213216
<Component Id="cmp2591E42374FAC2E1ECB763DEBCAD6CA6" Guid="*">
214217
<File Id="fil026AC17EB4E84AFA3C77F14CA14F4EF8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Data.Edm.dll" />
215218
</Component>
@@ -555,6 +558,9 @@
555558
<Component Id="cmp324B90D4B088D87E4F11B86F299C1C4A" Guid="*">
556559
<File Id="fil4258BBFD2F3134F91EC449D577FADD4F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Commands.StorSimple.dll-help.xml" />
557560
</Component>
561+
<Component Id="cmpC5EDAFBD54A26120BADCFFA83EFE4D8D" Guid="*">
562+
<File Id="filD898BD06855BCA3BC672942E6D234D27" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Commands.WebSites.format.ps1xml" />
563+
</Component>
558564
<Component Id="cmpA2D0B95472DAC9EEDEC0CC473F3138B6" Guid="*">
559565
<File Id="filBA8A6C454E13EDED5C76A72DF055C141" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Management.Compute.dll" />
560566
</Component>
@@ -893,6 +899,9 @@
893899
<Component Id="cmpD1207E6C71B252DEA35A0F21BD18C739" Guid="*">
894900
<File Id="filAB602D03DC2C505D7E6A30F218B1E357" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Websites\Microsoft.WindowsAzure.Commands.Common.dll" />
895901
</Component>
902+
<Component Id="cmpF1C3AE30B7D2067AD8CC88BBEAB4E9D6" Guid="*">
903+
<File Id="fil1E2F266347128635E44D533122EAB3B9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Websites\Microsoft.WindowsAzure.Commands.WebSites.format.ps1xml" />
904+
</Component>
896905
<Component Id="cmpEF310754D1C69EB41F0EA968BF00DBB9" Guid="*">
897906
<File Id="fil375767A5125510DB24B62A452A56A6B1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Websites\Microsoft.WindowsAzure.Management.dll" />
898907
</Component>
@@ -1283,6 +1292,9 @@
12831292
</Component>
12841293
</Directory>
12851294
<Directory Id="dir59C91A8ADAEBA190A387BD9805945B5D" Name="HDInsight">
1295+
<Component Id="cmpE649532D45F37D54928D095F9FA83399" Guid="*">
1296+
<File Id="fil8FB3B64E67BEECBD33C8362E7253C687" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\BouncyCastle.Crypto.dll" />
1297+
</Component>
12861298
<Component Id="cmp96153B9C1921EF93C9484B51120C392D" Guid="*">
12871299
<File Id="filEA0D0D08D5D99E96498236DC6A2E7DC1" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Hyak.Common.dll" />
12881300
</Component>
@@ -2619,6 +2631,9 @@
26192631
<Component Id="cmp3AC709C29C5C98FAE63EC5ACF073B2AF" Guid="*">
26202632
<File Id="filBD421847424CAE48F72C74C69770D8C0" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.Common.NetFramework.dll" />
26212633
</Component>
2634+
<Component Id="cmpF584FEE91889D98A4299209A1B9B1B94" Guid="*">
2635+
<File Id="fil1E84C52FC3BA4FCD7D38DF81574031BC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.ResourceManager.dll" />
2636+
</Component>
26222637
<Component Id="cmp9E03AAB684EA41B087D79346AE6C1073" Guid="*">
26232638
<File Id="fil501FE0FB963E03A9292BE5CC5A895CBB" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
26242639
</Component>
@@ -2812,6 +2827,7 @@
28122827
<ComponentRef Id="cmp3720A4CCA2E5F4D2EC35291198D4BEE3" />
28132828
<ComponentRef Id="cmpB6D50CCF3757EBDA9602AA570BCE0D1E" />
28142829
<ComponentRef Id="cmp04F046DCD3C191FC98D9F1338855F823" />
2830+
<ComponentRef Id="cmp3B09E1BDCA0B52F9EA656CCC45BD9719" />
28152831
<ComponentRef Id="cmp2591E42374FAC2E1ECB763DEBCAD6CA6" />
28162832
<ComponentRef Id="cmp32AF78F6912DCA522A0FFAC8FD603B2F" />
28172833
<ComponentRef Id="cmp27231928A2D67FBC8D981AB504BD21F1" />
@@ -2925,6 +2941,7 @@
29252941
<ComponentRef Id="cmpFC3EB6ABEC249B231E7692A65B39E121" />
29262942
<ComponentRef Id="cmp41DD99937FCAACD05C1E4E7BE3A04532" />
29272943
<ComponentRef Id="cmp324B90D4B088D87E4F11B86F299C1C4A" />
2944+
<ComponentRef Id="cmpC5EDAFBD54A26120BADCFFA83EFE4D8D" />
29282945
<ComponentRef Id="cmpA2D0B95472DAC9EEDEC0CC473F3138B6" />
29292946
<ComponentRef Id="cmp820458093C358621EA214A7362ACCE1D" />
29302947
<ComponentRef Id="cmpE231A51CC41F80C051BC0663E08339BC" />
@@ -3035,6 +3052,7 @@
30353052
<ComponentRef Id="cmpFFFCD58A5DB0E19A9E2609FBE2410C09" />
30363053
<ComponentRef Id="cmp4ABAE69FE7F32B747C276E27CBD08B11" />
30373054
<ComponentRef Id="cmpD1207E6C71B252DEA35A0F21BD18C739" />
3055+
<ComponentRef Id="cmpF1C3AE30B7D2067AD8CC88BBEAB4E9D6" />
30383056
<ComponentRef Id="cmpEF310754D1C69EB41F0EA968BF00DBB9" />
30393057
<ComponentRef Id="cmp4DA3B101B35F9FABD0EC784559AC44A2" />
30403058
<ComponentRef Id="cmpFE7DE66BD1CE262C145D66A0E7250779" />
@@ -3161,6 +3179,7 @@
31613179
<ComponentRef Id="cmpCCC5976D4AE7141FB6D3C6650AD0C40E" />
31623180
<ComponentRef Id="cmp1D3D3FE8D3C4513B1536EB8B0AACEBE1" />
31633181
<ComponentRef Id="cmpB0718E71D7A15CCA7375389A12F7D568" />
3182+
<ComponentRef Id="cmpE649532D45F37D54928D095F9FA83399" />
31643183
<ComponentRef Id="cmp96153B9C1921EF93C9484B51120C392D" />
31653184
<ComponentRef Id="cmp430193C6FCC710357C2AD0A4D74B05CB" />
31663185
<ComponentRef Id="cmp42B92586860E12CFF7E8A202F62CA257" />
@@ -3589,6 +3608,7 @@
35893608
<ComponentRef Id="cmp844CE71A108EFCC5B93A410D5205E6DB" />
35903609
<ComponentRef Id="cmp6A927AFF9D7CBE438F31603C59A5D1A6" />
35913610
<ComponentRef Id="cmp3AC709C29C5C98FAE63EC5ACF073B2AF" />
3611+
<ComponentRef Id="cmpF584FEE91889D98A4299209A1B9B1B94" />
35923612
<ComponentRef Id="cmp9E03AAB684EA41B087D79346AE6C1073" />
35933613
<ComponentRef Id="cmpEC794DBE4822765C546A06D80EAA3292" />
35943614
<ComponentRef Id="cmpB48F1BD4D2E8307615F7E22174FF4E6D" />

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.17.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Management.DataFactories">
66-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.5-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.6-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6969
<SpecificVersion>False</SpecificVersion>
@@ -147,7 +147,6 @@
147147
<Compile Include="ScenarioTests\NamingValidationTests.cs" />
148148
<Compile Include="ScenarioTests\HubTests.cs" />
149149
<Compile Include="UnitTests\GetHubTests.cs" />
150-
<Compile Include="UnitTests\NewDataFactoryEncryptValueTests.cs" />
151150
<Compile Include="ScenarioTests\DataFactoryGatewayTests.cs" />
152151
<Compile Include="ScenarioTests\LinkedServiceTests.cs" />
153152
<Compile Include="UnitTests\DataFactoryUnitTestBase.cs" />

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/NamingValidationTests.ps1

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ function Test-InvalidResourceGroupName
6262

6363
Assert-ThrowsContains { Set-AzureDataFactoryPipelineActivePeriod -ResourceGroupName $rgName -DataFactoryName $rgName -PipelineName "pipeline" -StartDateTime "2015-01-01" -Force } $invalidNameError
6464

65-
$password = ConvertTo-SecureString "password" -AsPlainText -Force
66-
Assert-ThrowsContains { New-AzureDataFactoryEncryptValue -ResourceGroupName $rgName -DataFactoryName $dfName -Value $password } $invalidNameError
67-
6865
Assert-ThrowsContains { Save-AzureDataFactoryLog -ResourceGroupName $rgName -DataFactoryName $dfName -Id "id" } $invalidNameError
6966
}
7067

@@ -80,9 +77,6 @@ function Test-InvalidDataFactoryName
8077

8178
Assert-ThrowsContains { New-AzureDataFactory -ResourceGroupName "adf" -Name "adf+invalidname" -Location "westus" -Force } $invalidNameError
8279

83-
$password = ConvertTo-SecureString "password" -AsPlainText -Force
84-
Assert-ThrowsContains { New-AzureDataFactoryEncryptValue -ResourceGroupName "adf" -DataFactoryName "adf+invalidname" -Value $password } $invalidNameError
85-
8680
Assert-ThrowsContains { Save-AzureDataFactoryLog -ResourceGroupName "adf" -DataFactoryName "adf+invalidname" -Id "id" } $invalidNameError
8781
}
8882

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDataFactoryEncryptValueTests.cs

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

‎src/ResourceManager/DataFactories/Commands.DataFactories.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.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="0.17.0-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.DataFactories" version="0.15.5-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.DataFactories" version="0.15.6-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.14.1-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.5513.27084-prerelease" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5513.27084-prerelease" targetFramework="net45" />

‎src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</Reference>
6464
<Reference Include="Microsoft.Azure.Management.DataFactories, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6565
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.5-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.6-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6969
<SpecificVersion>False</SpecificVersion>
@@ -197,7 +197,6 @@
197197
<Compile Include="Pipelines\ResumeAzureDataFactoryPipelineCommand.cs" />
198198
<Compile Include="Pipelines\SetAzureDataFactoryPipelineActivePeriodCommand.cs" />
199199
<Compile Include="Pipelines\SuspendAzureDataFactoryPipelineCommand.cs" />
200-
<Compile Include="Encrypt\NewAzureDataFactoryEncryptValueCommand.cs" />
201200
<Compile Include="Properties\AssemblyInfo.cs" />
202201
<Compile Include="Properties\Resources.Designer.cs">
203202
<AutoGen>True</AutoGen>

‎src/ResourceManager/DataFactories/Commands.DataFactories/Constants.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ internal static class Constants
2828

2929
public const string GatewayKey = "AzureDataFactoryGatewayKey";
3030

31-
public const string EncryptString = "AzureDataFactoryEncryptValue";
32-
3331
public const string Table = "AzureDataFactoryTable";
3432

3533
public const string Pipeline = "AzureDataFactoryPipeline";

0 commit comments

Comments
 (0)