Skip to content

Commit e2c0fe0

Browse files
huangpfhuangpf
committed
Merge branch 'vmss' of https://github.com/AzureRT/azure-powershell into vmss
Conflicts: src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx
2 parents eddb2d2 + da0a236 commit e2c0fe0

File tree

561 files changed

+188456
-84802
lines changed

Some content is hidden

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

561 files changed

+188456
-84802
lines changed

‎AzurePowershell.Test.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
8383
<XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
8484
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
85+
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
8586
<XUnitTests Include="@(AsmXUnitTests)"/>
8687
</ItemGroup>
8788
<ItemGroup Condition=" '$(scope)' == 'ServiceManagement' ">

‎ChangeLog.md

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,38 @@
1-
* Azure Redis Cache
1+
## 2015.11.09 version 1.0.1
2+
* Azure Compute
3+
* Added cmdlets for managing VM DiskEncryption extension
4+
* Azure KeyVault
5+
* Added EnabledForDiskEncryption and EnabledForTemplateDeployment flags to Azure Key Vault access policy
6+
* Azure Websites
7+
* Fixed issues with website management client creation
8+
9+
## 2015.11.05 version 1.0
10+
* Azure Compute
11+
* AzureRmVM cmdlet bug fixes
12+
* Fixes for DSC Extension cmdlets
13+
* Azure DataLake
14+
* First release of Azure DataLake Store and Azure DataLake Analytics cmdlets
15+
* Azure Network
16+
* Fixes to ExpressRoute cmdlets in Azure Resource Manager
17+
* Changes to BGP cmdlets
18+
* Azure Notification Hubs
19+
* First release of Azure Notification Hubs cmdlets
20+
* Azure Profile
21+
* Enable Certificate login for AD Applications
22+
* Get-AzureRmSubscription, Set-AzureRmContext search all tenants by default when no tenant is specified
23+
* Azure Redis Cache
224
* Set-AzureRedisCache - Premium and vNet support for redis cache
325
* New-AzureRedisCache - Premium and vNet support for redis cache
4-
26+
* Azure Resource Manager
27+
* Automatic RP Registration
28+
* Updates for Find-Resource, Authorization cmdlets, and AzureAD cmdlets
29+
* Azure Sql
30+
* Changes to Data Masking cmdlets
31+
* Azure Storage
32+
* Added support for storage file and usage metrics in Azure Resource Manager cmdlets
33+
* Azure Websites
34+
* New and rewritten cmdlets for Azure Web Application management
35+
536
## 2015.10.09 version 1.0 preview
637
* Azure Resource Manager Management Cmdlets
738
* New-AzureRmResourceGroup - Removed the template deployment parameters from this cmdlet. Template deployment will now be

‎setup/azurecmd.wxs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33

4-
<?define productName="Microsoft Azure PowerShell - October 23, 2015" ?>
4+
<?define productName="Microsoft Azure PowerShell - November 2015" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

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

@@ -47,10 +47,20 @@
4747
</DirectorySearch>
4848
</Property>
4949

50+
<Property Id="POWERSHELLGETAZUREINSTALLED" >
51+
<DirectorySearch Id="AZURECONTAINER" Path="[BaseModulesFolder]">
52+
<DirectorySearch Id= "AZUREMODULE" Path="Azure"/>
53+
</DirectorySearch>
54+
</Property>
55+
5056
<Condition Message="Azure Modules from the PowerShell Gallery are installed on this machine. Please remove these modules before installing this MSI.">
5157
<![CDATA[Installed or NOT(POWERSHELLGETMODULESINSTALLED >< "AzureRM.Profile")]]>
5258
</Condition>
5359

60+
<Condition Message="Azure Modules from the PowerShell Gallery are installed on this machine. Please remove these modules before installing this MSI.">
61+
<![CDATA[Installed or NOT(POWERSHELLGETAZUREINSTALLED >< "Azure")]]>
62+
</Condition>
63+
5464

5565
<Condition Message="This setup requires the Windows PowerShell 3.0 or compatible version to be installed.">
5666
<!-- This condition will break if PowerShell has version x3.0 and it is not compatible with 3.0 -->

‎setup/azurecmdfiles.wxi

Lines changed: 155 additions & 11 deletions
Large diffs are not rendered by default.

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5757
</Reference>
5858
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.5-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
59+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.4.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
6262
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -67,9 +67,9 @@
6767
<HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
70-
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
72-
<Private>True</Private>
70+
<Reference Include="Microsoft.Azure.Management.Storage, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71+
<SpecificVersion>False</SpecificVersion>
72+
<HintPath>..\..\packages\Microsoft.Azure.Management.Storage.3.0.0\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
7373
</Reference>
7474
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7575
<SpecificVersion>False</SpecificVersion>
@@ -118,20 +118,20 @@
118118
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
119119
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
120120
</Reference>
121-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122122
<SpecificVersion>False</SpecificVersion>
123-
<HintPath>..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
123+
<HintPath>..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
124124
</Reference>
125125
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
126126
<SpecificVersion>False</SpecificVersion>
127127
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
128128
</Reference>
129129
<Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.2.0\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
130+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.3.0\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
131131
<Private>True</Private>
132132
</Reference>
133-
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.0.9.3\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
133+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.0.11.0\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
135135
<Private>True</Private>
136136
</Reference>
137137
<Reference Include="System" />
@@ -185,7 +185,9 @@
185185
</EmbeddedResource>
186186
</ItemGroup>
187187
<ItemGroup>
188-
<None Include="packages.config" />
188+
<None Include="packages.config">
189+
<SubType>Designer</SubType>
190+
</None>
189191
</ItemGroup>
190192
<ItemGroup>
191193
<ProjectReference Include="..\Commands.Common\Commands.Common.csproj">

‎src/Common/Commands.Common.Storage/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
[assembly: ComVisible(false)]
2525
[assembly: CLSCompliant(false)]
2626
[assembly: Guid("c565107e-98a9-4703-85cd-a7efc3d8da7b")]
27-
[assembly: AssemblyVersion("0.9.9")]
28-
[assembly: AssemblyFileVersion("0.9.9")]
27+
[assembly: AssemblyVersion("1.0.0")]
28+
[assembly: AssemblyFileVersion("1.0.0")]

‎src/Common/Commands.Common.Storage/StorageUtilities.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,14 @@ public static CloudStorageAccount GenerateCloudStorageAccount(Arm.IStorageManage
4848
Uri blobEndpoint = storageServiceResponse.StorageAccount.PrimaryEndpoints.Blob;
4949
Uri queueEndpoint = storageServiceResponse.StorageAccount.PrimaryEndpoints.Queue;
5050
Uri tableEndpoint = storageServiceResponse.StorageAccount.PrimaryEndpoints.Table;
51+
Uri fileEndpoint = storageServiceResponse.StorageAccount.PrimaryEndpoints.File;
52+
5153
return new CloudStorageAccount(
5254
GenerateStorageCredentials(storageClient, resourceGroupName, accountName),
5355
blobEndpoint,
5456
queueEndpoint,
55-
tableEndpoint, null);
57+
tableEndpoint,
58+
fileEndpoint);
5659
}
5760
else
5861
{
@@ -61,8 +64,8 @@ public static CloudStorageAccount GenerateCloudStorageAccount(Arm.IStorageManage
6164
Convert.ToBase64String(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString()))),
6265
new Uri(string.Format("https://{0}.blob.core.windows.net", accountName)),
6366
new Uri(string.Format("https://{0}.queue.core.windows.net", accountName)),
64-
new Uri(string.Format("https://{0}.table.core.windows.net", accountName)),
65-
null);
67+
new Uri(string.Format("https://{0}.table.core.windows.net", accountName)),
68+
new Uri(string.Format("https://{0}.file.core.windows.net", accountName)));
6669
}
6770
}
6871

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.3.5-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.4.0-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" 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" />
@@ -15,12 +15,12 @@
1515
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
1616
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1717
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
18-
<package id="Microsoft.Rest.ClientRuntime" version="1.2.0" targetFramework="net45" />
19-
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
18+
<package id="Microsoft.Rest.ClientRuntime" version="1.3.0" targetFramework="net45" />
19+
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2222
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2323
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2424
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
25-
<package id="WindowsAzure.Storage" version="5.0.0" targetFramework="net45" />
25+
<package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
2626
</packages>

‎src/Common/Commands.Common/AzurePowerShell.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public class AzurePowerShell
2727

2828
public const string AssemblyCopyright = "Copyright © Microsoft";
2929

30-
public const string AssemblyVersion = "0.9.9";
30+
public const string AssemblyVersion = "1.0.0";
3131

32-
public const string AssemblyFileVersion = "0.9.9";
32+
public const string AssemblyFileVersion = "1.0.1";
3333

3434
public const string ProfileFile = "AzureProfile.json";
3535

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.5-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
67+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.4.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Common.NetFramework">
7070
<SpecificVersion>False</SpecificVersion>
@@ -103,11 +103,11 @@
103103
<Private>True</Private>
104104
</Reference>
105105
<Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.2.0\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
106+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.3.0\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
107107
<Private>True</Private>
108108
</Reference>
109-
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.0.9.3\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
109+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.0.11.0\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
111111
<Private>True</Private>
112112
</Reference>
113113
<Reference Include="System" />

‎src/Common/Commands.Common/ProfileClient.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,8 @@ public AzureEnvironment AddOrSetEnvironment(AzureEnvironment environment)
11441144

11451145
if (AzureEnvironment.PublicEnvironments.ContainsKey(environment.Name))
11461146
{
1147-
throw new ArgumentException(Resources.ChangingDefaultEnvironmentNotSupported, "environment");
1147+
throw new InvalidOperationException(
1148+
string.Format(Resources.ChangingDefaultEnvironmentNotSupported, "environment"));
11481149
}
11491150

11501151
if (Profile.Environments.ContainsKey(environment.Name))

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
<package id="Microsoft.ApplicationInsights" version="1.1.1-beta" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Common.Authentication" version="1.3.5-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Common.Authentication" version="1.4.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.18.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" />
1313
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1414
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
15-
<package id="Microsoft.Rest.ClientRuntime" version="1.2.0" targetFramework="net45" />
16-
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
15+
<package id="Microsoft.Rest.ClientRuntime" version="1.3.0" targetFramework="net45" />
16+
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
1818
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1919
</packages>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</Reference>
4848
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4949
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.5-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
50+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.4.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.Azure.Common.NetFramework">
5353
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
@@ -95,7 +95,7 @@
9595
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
9696
</Reference>
9797
<Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.2.0\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
98+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.3.0\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
9999
<Private>True</Private>
100100
</Reference>
101101
<Reference Include="System" />

‎src/Common/Commands.ScenarioTests.Common/Mocks/MockAccessTokenProvider.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,10 @@ public IAccessToken GetAccessToken(AdalConfiguration config, ShowDialog promptBe
4141
{
4242
return this.accessToken;
4343
}
44+
45+
public IAccessToken GetAccessTokenWithCertificate(AdalConfiguration config, string principalId, string certificateThumbprint, AzureAccount.AccountType credentialType)
46+
{
47+
return this.accessToken;
48+
}
4449
}
4550
}

0 commit comments

Comments
 (0)