Skip to content

Commit 5819480

Browse files
unknownunknown
unknown
authored and
unknown
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev2
2 parents 5757972 + a89ec8b commit 5819480

39 files changed

+6891
-6660
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,9 @@
404404
<Component Id="cmpE16AC4B0282EF42385AFF81489538517" Guid="*">
405405
<File Id="fil501BC202C6E7D0F345365C993D0461C1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Newtonsoft.Json.dll" />
406406
</Component>
407+
<Component Id="cmpA911AB5888BFD5D6EB9B2F0226D3F2E2" Guid="*">
408+
<File Id="fil360D674BFE1536E2D6B34C390B87BBAB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\ResourceManagerStartup.ps1" />
409+
</Component>
407410
<Component Id="cmp763A6F92E7A6914C7E6E1D1550081C08" Guid="*">
408411
<File Id="filA98A1959E1D89408C77943B88EDE6754" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\ServiceManagementStartup.ps1" />
409412
</Component>
@@ -967,6 +970,9 @@
967970
<Component Id="cmp092B990A20E8B0B33D4450EBA12B9AB4" Guid="*">
968971
<File Id="fil4CCFA35C51816A35D00C8371811EDE94" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\KeyVault\Newtonsoft.Json.dll" />
969972
</Component>
973+
<Component Id="cmpBDC491FE3308C98A7A028C55735AF8FD" Guid="*">
974+
<File Id="filE4C00F637B89E3E6198BBFCAF1FA2C0A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\KeyVault\ResourceManagerStartup.ps1" />
975+
</Component>
970976
<Component Id="cmp5CDCB0785A318F614D9422554B3F4ED2" Guid="*">
971977
<File Id="fil273B7FB1C198C0F151940A2EAF215BD2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\KeyVault\System.Net.Http.Extensions.dll" />
972978
</Component>
@@ -1074,6 +1080,9 @@
10741080
<Component Id="cmp52954FF14988D0FF1E9D0569B4A8879E" Guid="*">
10751081
<File Id="fil594D8C042FC9A997CC2136045E69C3EC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Network\Newtonsoft.Json.dll" />
10761082
</Component>
1083+
<Component Id="cmp332BD7FBB67C08CE58DC0BE2A3A24303" Guid="*">
1084+
<File Id="fil1AB40AD8B4C2FC59379BD2E5C4B95CB9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Network\ResourceManagerStartup.ps1" />
1085+
</Component>
10771086
<Component Id="cmp3BE0A2D8A9F59780E10334BB032B5561" Guid="*">
10781087
<File Id="fil8F8010BFCF5A6371692CCF9ACE05E660" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Network\System.Net.Http.Extensions.dll" />
10791088
</Component>
@@ -1296,6 +1305,9 @@
12961305
<Component Id="cmp81ACE07255D539B22EAAE5C07BF9C6B7" Guid="*">
12971306
<File Id="fil20BBB718A749C1E485E5AAC0700CB59C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Newtonsoft.Json.dll" />
12981307
</Component>
1308+
<Component Id="cmpDFC57AA22185F7BE5A0D339D4F355546" Guid="*">
1309+
<File Id="filF75685E98A8F3C8E4F5DDEC6E8C70B65" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\ResourceManagerStartup.ps1" />
1310+
</Component>
12991311
<Component Id="cmp5B024A4E29BF400F1ED3DE2CE1F2E0DD" Guid="*">
13001312
<File Id="filBDA4AC7C21781E73732383C29552E770" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\System.Net.Http.Extensions.dll" />
13011313
</Component>
@@ -1569,6 +1581,9 @@
15691581
<Component Id="cmpEF3E47318D73A7FC3C949888F6CD595D" Guid="*">
15701582
<File Id="fil90F4A098BA3CC6997CC5CE037F2F1243" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StorageManagement\Newtonsoft.Json.dll" />
15711583
</Component>
1584+
<Component Id="cmp38B55B30C884DF044800357D11B02535" Guid="*">
1585+
<File Id="filE10A550ADE144FBFDC60F6BB49DD10C1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StorageManagement\ResourceManagerStartup.ps1" />
1586+
</Component>
15721587
<Component Id="cmp09AED3D479FDA1BAB8D088446C84BD57" Guid="*">
15731588
<File Id="filEC38535F0D1E6C94C3E31A2CF7A39BC9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StorageManagement\System.Net.Http.Extensions.dll" />
15741589
</Component>
@@ -2101,6 +2116,9 @@
21012116
<Component Id="cmp4AA539549D58FD2D5DD3C404556F3DBB" Guid="*">
21022117
<File Id="fil4D8DA0FB6E8B4E47BD5A37E758BFC156" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\PIR.psd1" />
21032118
</Component>
2119+
<Component Id="cmp59F8D1CCB66016CE9609297EA9DBF30D" Guid="*">
2120+
<File Id="fil13D170173EBE365CC4B615CD04B123C7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\ResourceManagerStartup.ps1" />
2121+
</Component>
21042122
<Component Id="cmp348131C92750A7166DCA75757E409378" Guid="*">
21052123
<File Id="fil4C89A8A3AA200315DD08D7FD6DA12286" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\ServiceManagementStartup.ps1" />
21062124
</Component>
@@ -2431,6 +2449,9 @@
24312449
<Component Id="cmp095AB0635AB59E44C60473C62E9B6C84" Guid="*">
24322450
<File Id="fil33488FAC074F25EED6834D4EBE031E46" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Newtonsoft.Json.dll" />
24332451
</Component>
2452+
<Component Id="cmp361542BC212F1EFD07C4EE7A6496E254" Guid="*">
2453+
<File Id="fil00D965BE7829E21453514860BF25A585" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\ResourceManagerStartup.ps1" />
2454+
</Component>
24342455
<Component Id="cmp1D09E2F4BC62197FC8C187ECF16B08D0" Guid="*">
24352456
<File Id="fil5ACE44A99790483ADE6DAD2FADE81F2D" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\ServiceManagementStartup.ps1" />
24362457
</Component>
@@ -3131,6 +3152,9 @@
31313152
<Component Id="cmpFA98ECC9A87BB49B7FC68AC0CDC89955" Guid="*">
31323153
<File Id="filB9E5BFA2050E0BE989D9A445514B2656" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Newtonsoft.Json.dll" />
31333154
</Component>
3155+
<Component Id="cmp35343F87E4C47BED5F3495E072870B4E" Guid="*">
3156+
<File Id="filBDFB3D4CFEEA4082BABD966E01309444" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\ResourceManagerStartup.ps1" />
3157+
</Component>
31343158
<Component Id="cmpD7030FC24236E343750765385BE1F3CD" Guid="*">
31353159
<File Id="fil74ACA8D2F975B318C5B14F4459395805" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\ServiceManagementStartup.ps1" />
31363160
</Component>
@@ -3538,6 +3562,9 @@
35383562
<Component Id="cmp8839023EABF68726F33F2E22907EE5CA" Guid="*">
35393563
<File Id="fil7E09EF4FC96DB53F9DCD865B90E854B6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\PostBuild.ps1" />
35403564
</Component>
3565+
<Component Id="cmp91F23AEF11B1513BE8D9605E0197AFD6" Guid="*">
3566+
<File Id="filA7E99FCBA6DD0FFF2BF0E74F1E1041BB" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\ResourceManagerStartup.ps1" />
3567+
</Component>
35413568
<Component Id="cmp0B5A5E6BA5861771073ED88DCAB35DCC" Guid="*">
35423569
<File Id="fil7399EB9870646ED4FE533B1842E6CE84" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\ServiceManagementStartup.ps1" />
35433570
</Component>
@@ -3928,6 +3955,7 @@
39283955
<ComponentRef Id="cmpBFCB1E992759555E524E0637A72EE14B" />
39293956
<ComponentRef Id="cmp02F11033E68D6FED58954A529B7DC8CC" />
39303957
<ComponentRef Id="cmpE16AC4B0282EF42385AFF81489538517" />
3958+
<ComponentRef Id="cmpA911AB5888BFD5D6EB9B2F0226D3F2E2" />
39313959
<ComponentRef Id="cmp763A6F92E7A6914C7E6E1D1550081C08" />
39323960
<ComponentRef Id="cmpC8911F605D0A03E9308F3B6F4C8004B6" />
39333961
<ComponentRef Id="cmpDFAA37232FF72FD87A83F2DCC6FA5A82" />
@@ -4103,6 +4131,7 @@
41034131
<ComponentRef Id="cmp6FB7367EB59366676B7060F0FD5FDAC3" />
41044132
<ComponentRef Id="cmp1496C1F7B5BF9E8A5598E8126F87355B" />
41054133
<ComponentRef Id="cmp092B990A20E8B0B33D4450EBA12B9AB4" />
4134+
<ComponentRef Id="cmpBDC491FE3308C98A7A028C55735AF8FD" />
41064135
<ComponentRef Id="cmp5CDCB0785A318F614D9422554B3F4ED2" />
41074136
<ComponentRef Id="cmpE90D51E3A3C747163C7F1D6DC5409800" />
41084137
<ComponentRef Id="cmpAD51B1C903B9CB0DB18004F97CD8ADBA" />
@@ -4138,6 +4167,7 @@
41384167
<ComponentRef Id="cmpBB669B8D821D971CA6F0426E2D30A7DF" />
41394168
<ComponentRef Id="cmp7182B595711C42F35606A19E3FA472AB" />
41404169
<ComponentRef Id="cmp52954FF14988D0FF1E9D0569B4A8879E" />
4170+
<ComponentRef Id="cmp332BD7FBB67C08CE58DC0BE2A3A24303" />
41414171
<ComponentRef Id="cmp3BE0A2D8A9F59780E10334BB032B5561" />
41424172
<ComponentRef Id="cmpABCB74E74D8A2A86538888C4B07D030B" />
41434173
<ComponentRef Id="cmp1F786D1771E02C0007F768794F3E10AB" />
@@ -4210,6 +4240,7 @@
42104240
<ComponentRef Id="cmpF750706356EAB58C8C81ED96B57288C8" />
42114241
<ComponentRef Id="cmp607260D321DBB6DC85249332ACCCDF1E" />
42124242
<ComponentRef Id="cmp81ACE07255D539B22EAAE5C07BF9C6B7" />
4243+
<ComponentRef Id="cmpDFC57AA22185F7BE5A0D339D4F355546" />
42134244
<ComponentRef Id="cmp5B024A4E29BF400F1ED3DE2CE1F2E0DD" />
42144245
<ComponentRef Id="cmp997A920A652163E94E56A412D2BEC28C" />
42154246
<ComponentRef Id="cmp353F25E254A7722E3CADF046790D3C4D" />
@@ -4299,6 +4330,7 @@
42994330
<ComponentRef Id="cmp4EC528690F259ADF968B0C0C9AE4B64E" />
43004331
<ComponentRef Id="cmp4F19A7D4965EA52930FACE952EEDDAEC" />
43014332
<ComponentRef Id="cmpEF3E47318D73A7FC3C949888F6CD595D" />
4333+
<ComponentRef Id="cmp38B55B30C884DF044800357D11B02535" />
43024334
<ComponentRef Id="cmp09AED3D479FDA1BAB8D088446C84BD57" />
43034335
<ComponentRef Id="cmpA55D0454E5F3FEE0A8CBAF32B3C8062A" />
43044336
<ComponentRef Id="cmp26F750578592FC98DB18AAB9B2B5A22A" />
@@ -4471,6 +4503,7 @@
44714503
<ComponentRef Id="cmpA7662EDC9DDCCFD0290DDB9350660A6B" />
44724504
<ComponentRef Id="cmp7F9F978DBE7D6715FA75FFB3BE40806E" />
44734505
<ComponentRef Id="cmp4AA539549D58FD2D5DD3C404556F3DBB" />
4506+
<ComponentRef Id="cmp59F8D1CCB66016CE9609297EA9DBF30D" />
44744507
<ComponentRef Id="cmp348131C92750A7166DCA75757E409378" />
44754508
<ComponentRef Id="cmp289352966E5E4647DF24D7FFCEA4200F" />
44764509
<ComponentRef Id="cmpA497DCDAF4262858EF7BF8F3E4A03F30" />
@@ -4579,6 +4612,7 @@
45794612
<ComponentRef Id="cmpBB94B2B2A45F7D437EB0237D9B292BFE" />
45804613
<ComponentRef Id="cmp4AE74E37B2A44D5890DBC4D86DDFDD40" />
45814614
<ComponentRef Id="cmp095AB0635AB59E44C60473C62E9B6C84" />
4615+
<ComponentRef Id="cmp361542BC212F1EFD07C4EE7A6496E254" />
45824616
<ComponentRef Id="cmp1D09E2F4BC62197FC8C187ECF16B08D0" />
45834617
<ComponentRef Id="cmp99AAC04E82A333BB124A68DC3223D23A" />
45844618
<ComponentRef Id="cmp778481F5B466AD6013B4210ED68B3172" />
@@ -4799,6 +4833,7 @@
47994833
<ComponentRef Id="cmpE1EAFD7E808AF4C192C5D45154BB2136" />
48004834
<ComponentRef Id="cmp0313F8F73743B761E3DC5BBE65D6FB04" />
48014835
<ComponentRef Id="cmpFA98ECC9A87BB49B7FC68AC0CDC89955" />
4836+
<ComponentRef Id="cmp35343F87E4C47BED5F3495E072870B4E" />
48024837
<ComponentRef Id="cmpD7030FC24236E343750765385BE1F3CD" />
48034838
<ComponentRef Id="cmpEA17278B9ACE7EA6B46B6A830432B689" />
48044839
<ComponentRef Id="cmpCD4BD720F4FB285B9F6E876D94880D64" />
@@ -4924,6 +4959,7 @@
49244959
<ComponentRef Id="cmp2DA9A48FC4B479D897435D7DCFA6DDE3" />
49254960
<ComponentRef Id="cmpA10291DA4F33CEBFB790A935E68C763C" />
49264961
<ComponentRef Id="cmp8839023EABF68726F33F2E22907EE5CA" />
4962+
<ComponentRef Id="cmp91F23AEF11B1513BE8D9605E0197AFD6" />
49274963
<ComponentRef Id="cmp0B5A5E6BA5861771073ED88DCAB35DCC" />
49284964
<ComponentRef Id="cmp8FDC59E62622D98C6BE19E68ABC2666F" />
49294965
<ComponentRef Id="cmpE8892E4AE524E10FC9808A04A8A7D4BE" />

‎src/Common/Commands.Common/Properties/Resources.Designer.cs

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Common/Commands.Common/Properties/Resources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,4 +1358,7 @@ use and privacy statement at &lt;url&gt; and (c) agree to sharing my contact inf
13581358
<data name="AzureProfileMustNotBeNull" xml:space="preserve">
13591359
<value>Selected profile must not be null.</value>
13601360
</data>
1361+
<data name="SwitchAzureModeDeprecated" xml:space="preserve">
1362+
<value>The Switch-AzureMode cmdlet is deprecated and will be removed in a future release.</value>
1363+
</data>
13611364
</root>

‎src/Common/Commands.Profile/SwitchAzureMode.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
using System;
1616
using System.Management.Automation;
17+
using Microsoft.WindowsAzure.Commands.Common.Properties;
1718
using Microsoft.WindowsAzure.Commands.Utilities.Common;
1819
using Microsoft.Azure.Common.Authentication;
1920

@@ -34,6 +35,7 @@ public class SwitchAzureMode : AzurePSCmdlet
3435

3536
public override void ExecuteCmdlet()
3637
{
38+
WriteWarning(Resources.SwitchAzureModeDeprecated);
3739
AzureModule moduleToImport = (AzureModule)Enum.Parse(typeof(AzureModule), Name, false);
3840
AzureModule moduleToRemove = moduleToImport == AzureModule.AzureResourceManager ? AzureModule.AzureServiceManagement : AzureModule.AzureResourceManager;
3941
RemoveAzureModule(FileUtilities.GetModuleName(moduleToRemove), FileUtilities.GetPSModulePathForModule(moduleToRemove));

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public void TestOnPremDatasourceEncryptionSQLAuth()
3939
string linkedServiceType = "OnPremisesSqlLinkedService";
4040
string nonCredentialValue = "Driver=mydriver;server=myserver";
4141
string authenticationType = "Basic";
42+
string serverName = null;
43+
string databaseName = null;
4244

4345
var cmdlet = new NewAzureDataFactoryEncryptValueCommand
4446
{
@@ -50,17 +52,19 @@ public void TestOnPremDatasourceEncryptionSQLAuth()
5052
GatewayName = GatewayName,
5153
Type = linkedServiceType,
5254
NonCredentialValue = nonCredentialValue,
53-
AuthenticationType = authenticationType
55+
AuthenticationType = authenticationType,
56+
Server = serverName,
57+
Database = databaseName
5458
};
5559

5660
// Arrange
57-
this.dataFactoriesClientMock.Setup(f => f.OnPremisesEncryptString(secureString, ResourceGroupName, DataFactoryName, GatewayName, null, linkedServiceType, nonCredentialValue, authenticationType)).Returns(expectedOutput);
61+
this.dataFactoriesClientMock.Setup(f => f.OnPremisesEncryptString(secureString, ResourceGroupName, DataFactoryName, GatewayName, null, linkedServiceType, nonCredentialValue, authenticationType, serverName, databaseName)).Returns(expectedOutput);
5862

5963
// Action
6064
cmdlet.ExecuteCmdlet();
6165

6266
// Assert
63-
this.dataFactoriesClientMock.Verify(f => f.OnPremisesEncryptString(secureString, ResourceGroupName, DataFactoryName, GatewayName, null, linkedServiceType, nonCredentialValue, authenticationType), Times.Once());
67+
this.dataFactoriesClientMock.Verify(f => f.OnPremisesEncryptString(secureString, ResourceGroupName, DataFactoryName, GatewayName, null, linkedServiceType, nonCredentialValue, authenticationType, serverName, databaseName), Times.Once());
6468
this.commandRuntimeMock.Verify(f => f.WriteObject(expectedOutput), Times.Once());
6569
}
6670

@@ -76,6 +80,8 @@ public void TestOnPremDatasourceEncryptionWinAuth()
7680
string linkedServiceType = "OnPremisesFileSystemLinkedService";
7781
string nonCredentialValue = "Driver=mydriver;server=myserver";
7882
string authenticationType = "Basic";
83+
string serverName = null;
84+
string databaseName = null;
7985

8086
var cmdlet = new NewAzureDataFactoryEncryptValueCommand
8187
{
@@ -88,17 +94,19 @@ public void TestOnPremDatasourceEncryptionWinAuth()
8894
Credential = credential,
8995
Type = linkedServiceType,
9096
NonCredentialValue = nonCredentialValue,
91-
AuthenticationType = authenticationType
97+
AuthenticationType = authenticationType,
98+
Server = serverName,
99+
Database = databaseName
92100
};
93101

94102
// Arrange
95-
this.dataFactoriesClientMock.Setup(f => f.OnPremisesEncryptString(secureString, ResourceGroupName, DataFactoryName, GatewayName, credential, linkedServiceType, nonCredentialValue, authenticationType)).Returns(expectedOutput);
103+
this.dataFactoriesClientMock.Setup(f => f.OnPremisesEncryptString(secureString, ResourceGroupName, DataFactoryName, GatewayName, credential, linkedServiceType, nonCredentialValue, authenticationType, serverName, databaseName)).Returns(expectedOutput);
96104

97105
// Action
98106
cmdlet.ExecuteCmdlet();
99107

100108
// Assert
101-
this.dataFactoriesClientMock.Verify(f => f.OnPremisesEncryptString(secureString, ResourceGroupName, DataFactoryName, GatewayName, credential, linkedServiceType, nonCredentialValue, authenticationType), Times.Once());
109+
this.dataFactoriesClientMock.Verify(f => f.OnPremisesEncryptString(secureString, ResourceGroupName, DataFactoryName, GatewayName, credential, linkedServiceType, nonCredentialValue, authenticationType, serverName, databaseName), Times.Once());
102110
this.commandRuntimeMock.Verify(f => f.WriteObject(expectedOutput), Times.Once());
103111
}
104112
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
<HintPath>..\..\..\packages\Microsoft.DataFactories.Runtime.0.11.1-preview\lib\net45\Microsoft.DataFactories.Runtime.dll</HintPath>
7474
</Reference>
7575
<Reference Include="Microsoft.DataTransfer.Gateway.Encryption">
76-
<HintPath>..\..\..\packages\Microsoft.DataTransfer.Gateway.Encryption.1.4.0-preview\lib\net45\Microsoft.DataTransfer.Gateway.Encryption.dll</HintPath>
76+
<HintPath>..\..\..\packages\Microsoft.DataTransfer.Gateway.Encryption.1.5.0-preview\lib\net45\Microsoft.DataTransfer.Gateway.Encryption.dll</HintPath>
77+
<Private>True</Private>
7778
</Reference>
7879
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
7980
<SpecificVersion>False</SpecificVersion>

0 commit comments

Comments
 (0)