Skip to content

Commit 39684ef

Browse files
author
Pooneh
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell-pr into vault
Conflicts: src/Common/Commands.Common/Common/ManagementConstants.cs
2 parents a7ba5b2 + 6731e94 commit 39684ef

File tree

400 files changed

+7686
-591
lines changed

Some content is hidden

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

400 files changed

+7686
-591
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,15 @@
319319
<Component Id="cmp2D4903DFD9808EC073684DBE490CDCA6" Guid="*">
320320
<File Id="fil8CEC7F377D72364450A45C1489D795CA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Commands.Sql.dll-Help.xml" />
321321
</Component>
322+
<Component Id="cmp38E0EF8681E335666800EB19BAAA2536" Guid="*">
323+
<File Id="filCC49C1E829B78BB7FAA3D9842054C321" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Commands.StreamAnalytics.dll" />
324+
</Component>
325+
<Component Id="cmp45A71B619D79898B664D4A5FA00D2661" Guid="*">
326+
<File Id="fil6BB198A23E415356DEB5A09DC4BD780B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Commands.StreamAnalytics.dll-Help.xml" />
327+
</Component>
328+
<Component Id="cmpB8D13C9F81CA1BE2887AC1A76BD20A1F" Guid="*">
329+
<File Id="fil311F8FEE1C6613CEA97AF6B3E203F655" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Commands.StreamAnalytics.format.ps1xml" />
330+
</Component>
322331
<Component Id="cmp39A9BF8F58FB19C317032EAC52A3ADC5" Guid="*">
323332
<File Id="fil11A51B8EC65D16A67EADE116CF3715D2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Commands.Tags.dll" />
324333
</Component>
@@ -346,6 +355,9 @@
346355
<Component Id="cmp1E110B3A62CD167B9B41556BD0F2CD6F" Guid="*">
347356
<File Id="fil4653A5682BB54F2C6DCEA81F1A9E76A6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Management.Sql.dll" />
348357
</Component>
358+
<Component Id="cmpE1BF6EAEEB822D9D73DBCFAB13791982" Guid="*">
359+
<File Id="fil47DD93EC96872BF4DB0787041BBDFCF9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Management.StreamAnalytics.dll" />
360+
</Component>
349361
<Component Id="cmpE663F01DCBA794BF32541E268FA26640" Guid="*">
350362
<File Id="fil9278A1EB2FD4403777102262C0FD5C7D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Monitoring.dll" />
351363
</Component>
@@ -735,6 +747,12 @@
735747
<Component Id="cmp958759CE2C3C0A31E905D81FB0A84070" Guid="*">
736748
<File Id="fil9AA6AD59D67F1A8A7549DFAB3856116A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Commands.Sql.dll-Help.xml" />
737749
</Component>
750+
<Component Id="cmpEA0824393A8B3E7304F785D01FA6A52B" Guid="*">
751+
<File Id="fil8AFEBFE451536D83C2047F73F9BE450C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Commands.StreamAnalytics.dll-Help.xml" />
752+
</Component>
753+
<Component Id="cmp95B26B03ABE9C794BA62FCACA3B1B24D" Guid="*">
754+
<File Id="fil18D8A7976F2F2EC78027C9FB84A54EE4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Commands.StreamAnalytics.format.ps1xml" />
755+
</Component>
738756
<Component Id="cmpB79894F1F10C9E75B06623A1684E361C" Guid="*">
739757
<File Id="fil224075C67491010C766CA82390D19E11" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Commands.Tags.dll-help.xml" />
740758
</Component>
@@ -1083,6 +1101,12 @@
10831101
<Component Id="cmp01E6F666668B5C3F5A8C540ABB183964" Guid="*">
10841102
<File Id="filCC4335B08BACEB2F90976960B034E9F0" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Microsoft.Azure.Commands.Sql.dll-Help.xml" />
10851103
</Component>
1104+
<Component Id="cmpB9FB62AE52BCE48021626EC7F1176A56" Guid="*">
1105+
<File Id="filBF4C137B03EBB4C149D930C7E2275B71" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Microsoft.Azure.Commands.StreamAnalytics.dll-Help.xml" />
1106+
</Component>
1107+
<Component Id="cmpE23FE35F366EAD336DBBD9FD223C917A" Guid="*">
1108+
<File Id="filACA0EA37A5956FA35ACECE32E516BD40" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Microsoft.Azure.Commands.StreamAnalytics.format.ps1xml" />
1109+
</Component>
10861110
<Component Id="cmp7A8E1732499353A52688C5B4A70B23C4" Guid="*">
10871111
<File Id="fil2B2336C6CFB31A4E24BA28C611279537" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Microsoft.Azure.Commands.Tags.dll-help.xml" />
10881112
</Component>
@@ -1259,6 +1283,9 @@
12591283
<Component Id="cmp1C992F609F0E3E895F924EB4DDA1872C" Guid="*">
12601284
<File Id="filF409ED28B951574DB5A63607CF42D46D" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Network\Microsoft.WindowsAzure.Common.NetFramework.dll" />
12611285
</Component>
1286+
<Component Id="cmpEAC985CC1EB6CFFC89C3C4A800A62377" Guid="*">
1287+
<File Id="fil86B9F68A304F8E6DBF1655BA0FAD2080" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Network\Microsoft.WindowsAzure.Configuration.dll" />
1288+
</Component>
12621289
<Component Id="cmp2DC40B144472AD010779DC6F0D263C32" Guid="*">
12631290
<File Id="filCE356D3E7AEFA4E68193B74286DC5A41" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Network\Microsoft.WindowsAzure.Management.dll" />
12641291
</Component>
@@ -1377,6 +1404,12 @@
13771404
<Component Id="cmp7DE7895664CEA231D675C1AB05326146" Guid="*">
13781405
<File Id="fil9662A336D73130D723C07D72A6F8802C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Microsoft.Azure.Commands.Sql.dll-Help.xml" />
13791406
</Component>
1407+
<Component Id="cmpC700A080181D86D876C04F6F020896B0" Guid="*">
1408+
<File Id="filE0091F499C4143708D8D58AAC13F995E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Microsoft.Azure.Commands.StreamAnalytics.dll-Help.xml" />
1409+
</Component>
1410+
<Component Id="cmpA4B9D257757E75A16536C1A3C6354562" Guid="*">
1411+
<File Id="fil9BA7BBDF6FC86C5B5896D0E0AB0825BD" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Microsoft.Azure.Commands.StreamAnalytics.format.ps1xml" />
1412+
</Component>
13801413
<Component Id="cmp88EA8041FA59DB7004CDA790EE0B2636" Guid="*">
13811414
<File Id="fil595B6579F00A6AC14AE66AF0F584570E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Microsoft.Azure.Commands.Tags.dll-help.xml" />
13821415
</Component>
@@ -1470,9 +1503,6 @@
14701503
<Component Id="cmpC991E1830F969A9E01A219FA59C15555" Guid="*">
14711504
<File Id="fil6E8B352C3B92B8EDA1DCD40AB01E2F01" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Microsoft.WindowsAzure.Management.dll" />
14721505
</Component>
1473-
<Component Id="cmpD293B320B2787F774A07989003AE6DC9" Guid="*">
1474-
<File Id="filA3BFBEA9B0212F1988CBF41973AEB241" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Microsoft.WindowsAzure.Management.ExpressRoute.dll" />
1475-
</Component>
14761506
<Component Id="cmp4861D6E897FD00852565187F855E80A0" Guid="*">
14771507
<File Id="fil9AD7471CEA88432C94E4D86714ECFF19" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Microsoft.WindowsAzure.Management.MediaServices.dll" />
14781508
</Component>
@@ -1847,6 +1877,12 @@
18471877
<Component Id="cmpAB5C120DE3A82B09A13FD1F816D360E6" Guid="*">
18481878
<File Id="fil43D704183C7A3A29B7DE4D45A6970F3C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.Azure.Commands.Sql.dll-Help.xml" />
18491879
</Component>
1880+
<Component Id="cmpADB987328CEC92F5655A68BFAAD1C826" Guid="*">
1881+
<File Id="fil4CB564857DD521B75CF35DB984BEF284" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.Azure.Commands.StreamAnalytics.dll-Help.xml" />
1882+
</Component>
1883+
<Component Id="cmpB9CDD2E71A9B5E1459416F01D512C5DB" Guid="*">
1884+
<File Id="fil5CCE65FEAD260654A53F1B256F07E86E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.Azure.Commands.StreamAnalytics.format.ps1xml" />
1885+
</Component>
18501886
<Component Id="cmp6E83A57EBA942EA617B2ED58538068D7" Guid="*">
18511887
<File Id="fil6429B7419C42CD803712DB1799CA4EFC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.Azure.Commands.Tags.dll-help.xml" />
18521888
</Component>
@@ -2260,6 +2296,9 @@
22602296
<ComponentRef Id="cmpF723A612E44FEF81A6FD35D6F83156E4" />
22612297
<ComponentRef Id="cmp22C4CFD61DF234A2D32CF6255ED9022F" />
22622298
<ComponentRef Id="cmp2D4903DFD9808EC073684DBE490CDCA6" />
2299+
<ComponentRef Id="cmp38E0EF8681E335666800EB19BAAA2536" />
2300+
<ComponentRef Id="cmp45A71B619D79898B664D4A5FA00D2661" />
2301+
<ComponentRef Id="cmpB8D13C9F81CA1BE2887AC1A76BD20A1F" />
22632302
<ComponentRef Id="cmp39A9BF8F58FB19C317032EAC52A3ADC5" />
22642303
<ComponentRef Id="cmp94FBFFF5E19FFFAE995EDD8FD6E47BDB" />
22652304
<ComponentRef Id="cmp106E84D49572C18BADC96B258C409E0E" />
@@ -2269,6 +2308,7 @@
22692308
<ComponentRef Id="cmp42A50186F4AFE110F82ED0DBF18A271E" />
22702309
<ComponentRef Id="cmp7513A156C71ECD5FD6BE7BEBC3DB024B" />
22712310
<ComponentRef Id="cmp1E110B3A62CD167B9B41556BD0F2CD6F" />
2311+
<ComponentRef Id="cmpE1BF6EAEEB822D9D73DBCFAB13791982" />
22722312
<ComponentRef Id="cmpE663F01DCBA794BF32541E268FA26640" />
22732313
<ComponentRef Id="cmpBF4C7868DB8CE8B4B50CAF51B647E2B1" />
22742314
<ComponentRef Id="cmp3F61F18D6C072A4C001EB2E9AC4DA285" />
@@ -2394,6 +2434,8 @@
23942434
<ComponentRef Id="cmp5ACBDDEE7EBFF87A502B9FCF53520122" />
23952435
<ComponentRef Id="cmpB496235CB74DCC1B3E4B9B0A4A99DB7E" />
23962436
<ComponentRef Id="cmp958759CE2C3C0A31E905D81FB0A84070" />
2437+
<ComponentRef Id="cmpEA0824393A8B3E7304F785D01FA6A52B" />
2438+
<ComponentRef Id="cmp95B26B03ABE9C794BA62FCACA3B1B24D" />
23972439
<ComponentRef Id="cmpB79894F1F10C9E75B06623A1684E361C" />
23982440
<ComponentRef Id="cmpFE4978FF7C3A65969F45E2D05C8B81EA" />
23992441
<ComponentRef Id="cmp9BE4A14F2E050EFD14F849753F4D0C80" />
@@ -2508,6 +2550,8 @@
25082550
<ComponentRef Id="cmp5525BBDC2AFA16BA65885B77260D8AC6" />
25092551
<ComponentRef Id="cmp3B73CDB3665598A0F364C5C9F64897C5" />
25102552
<ComponentRef Id="cmp01E6F666668B5C3F5A8C540ABB183964" />
2553+
<ComponentRef Id="cmpB9FB62AE52BCE48021626EC7F1176A56" />
2554+
<ComponentRef Id="cmpE23FE35F366EAD336DBBD9FD223C917A" />
25112555
<ComponentRef Id="cmp7A8E1732499353A52688C5B4A70B23C4" />
25122556
<ComponentRef Id="cmpA5A395D3B2EB73E521ED6B14EEBF5313" />
25132557
<ComponentRef Id="cmpF337D07C78C9EA8AF46D4FBA46E2B659" />
@@ -2566,6 +2610,7 @@
25662610
<ComponentRef Id="cmpAD101287B1EF8B771D333A9FF29C30C8" />
25672611
<ComponentRef Id="cmp3B09B2514E3E788BBE5D44BC3022E8B1" />
25682612
<ComponentRef Id="cmp1C992F609F0E3E895F924EB4DDA1872C" />
2613+
<ComponentRef Id="cmpEAC985CC1EB6CFFC89C3C4A800A62377" />
25692614
<ComponentRef Id="cmp2DC40B144472AD010779DC6F0D263C32" />
25702615
<ComponentRef Id="cmpD8BCF6F87A66E2BF3DA331CCDCE9525D" />
25712616
<ComponentRef Id="cmpB382FB922425C1C446A732BD66BBEEE0" />
@@ -2604,6 +2649,8 @@
26042649
<ComponentRef Id="cmp5348A71B0B8AB94A5F1E9886459B2BB5" />
26052650
<ComponentRef Id="cmp893FEE56B28C885AB3353AAF55D63AC2" />
26062651
<ComponentRef Id="cmp7DE7895664CEA231D675C1AB05326146" />
2652+
<ComponentRef Id="cmpC700A080181D86D876C04F6F020896B0" />
2653+
<ComponentRef Id="cmpA4B9D257757E75A16536C1A3C6354562" />
26072654
<ComponentRef Id="cmp88EA8041FA59DB7004CDA790EE0B2636" />
26082655
<ComponentRef Id="cmpC51B25C4B3E5561AB67CBA27677BB290" />
26092656
<ComponentRef Id="cmpA0D584195279B4D66D7B42152BE83B46" />
@@ -2635,7 +2682,6 @@
26352682
<ComponentRef Id="cmpAB88A6754839602E1323B92AF593A44C" />
26362683
<ComponentRef Id="cmp93E55086B9A2EB83BDB19653C23F2003" />
26372684
<ComponentRef Id="cmpC991E1830F969A9E01A219FA59C15555" />
2638-
<ComponentRef Id="cmpD293B320B2787F774A07989003AE6DC9" />
26392685
<ComponentRef Id="cmp4861D6E897FD00852565187F855E80A0" />
26402686
<ComponentRef Id="cmpA2470D39CF7C4333D0382E5AE1937FBF" />
26412687
<ComponentRef Id="cmp7B46CB7989E3DBF46E2F8DECFBD8D407" />
@@ -2746,6 +2792,8 @@
27462792
<ComponentRef Id="cmp8073B9AB5328ACDB45711FB0F9099B9E" />
27472793
<ComponentRef Id="cmp55EA66AEDADDF121EA69ED386F2305D8" />
27482794
<ComponentRef Id="cmpAB5C120DE3A82B09A13FD1F816D360E6" />
2795+
<ComponentRef Id="cmpADB987328CEC92F5655A68BFAAD1C826" />
2796+
<ComponentRef Id="cmpB9CDD2E71A9B5E1459416F01D512C5DB" />
27492797
<ComponentRef Id="cmp6E83A57EBA942EA617B2ED58538068D7" />
27502798
<ComponentRef Id="cmp4EC2A18BEE6FA33131454FC4123337E8" />
27512799
<ComponentRef Id="cmp940CE83AD0420A4BB3435E2A8DC13E30" />

‎src/AzurePowershell.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics",
155155
EndProject
156156
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Test", "ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\Commands.StreamAnalytics.Test.csproj", "{7E6683BE-ECFF-4709-89EB-1325E9E70512}"
157157
EndProject
158+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Extensions", "Common\Azure.Common.Extensions\Common.Extensions.csproj", "{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}"
159+
EndProject
158160
Global
159161
GlobalSection(SolutionConfigurationPlatforms) = preSolution
160162
Debug|Any CPU = Debug|Any CPU
@@ -373,6 +375,10 @@ Global
373375
{7E6683BE-ECFF-4709-89EB-1325E9E70512}.Debug|Any CPU.Build.0 = Debug|Any CPU
374376
{7E6683BE-ECFF-4709-89EB-1325E9E70512}.Release|Any CPU.ActiveCfg = Release|Any CPU
375377
{7E6683BE-ECFF-4709-89EB-1325E9E70512}.Release|Any CPU.Build.0 = Release|Any CPU
378+
{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
379+
{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}.Debug|Any CPU.Build.0 = Debug|Any CPU
380+
{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}.Release|Any CPU.ActiveCfg = Release|Any CPU
381+
{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}.Release|Any CPU.Build.0 = Release|Any CPU
376382
EndGlobalSection
377383
GlobalSection(SolutionProperties) = preSolution
378384
HideSolutionNode = FALSE

‎src/Common/Commands.Common/Authentication/AadAuthenticationException.cs renamed to ‎src/Common/Azure.Common.Extensions/Authentication/AadAuthenticationException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
using System;
1616

17-
namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
17+
namespace Microsoft.Azure.Common.Extensions.Authentication
1818
{
1919
/// <summary>
2020
/// Base class representing an exception that occurs when

‎src/Common/Commands.Common/Authentication/AccessTokenCredential.cs renamed to ‎src/Common/Azure.Common.Extensions/Authentication/AccessTokenCredential.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using Microsoft.WindowsAzure;
1516
using System;
1617
using System.Net.Http;
1718
using System.Net.Http.Headers;
1819
using System.Threading;
1920
using System.Threading.Tasks;
2021

21-
namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
22+
namespace Microsoft.Azure.Common.Extensions.Authentication
2223
{
2324
public class AccessTokenCredential : SubscriptionCloudCredentials
2425
{

‎src/Common/Commands.Common/Authentication/AdalConfiguration.cs renamed to ‎src/Common/Azure.Common.Extensions/Authentication/AdalConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using System;
1616
using System.Linq;
1717

18-
namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
18+
namespace Microsoft.Azure.Common.Extensions.Authentication
1919
{
2020
/// <summary>
2121
/// Class storing the configuration information needed

‎src/Common/Commands.Common/Authentication/AdalTokenProvider.cs renamed to ‎src/Common/Azure.Common.Extensions/Authentication/AdalTokenProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using Microsoft.Azure.Common.Extensions.Models;
16+
using Microsoft.Azure.Common.Extensions.Properties;
1517
using System;
1618
using System.Security;
1719
using System.Windows.Forms;
18-
using Microsoft.WindowsAzure.Commands.Common.Models;
19-
using Microsoft.WindowsAzure.Commands.Common.Properties;
2020

21-
namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
21+
namespace Microsoft.Azure.Common.Extensions.Authentication
2222
{
2323
/// <summary>
2424
/// A token provider that uses ADAL to retrieve

‎src/Common/Commands.Common/Authentication/ConsoleParentWindow.cs renamed to ‎src/Common/Azure.Common.Extensions/Authentication/ConsoleParentWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
using System.Runtime.InteropServices;
1717
using System.Windows.Forms;
1818

19-
namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
19+
namespace Microsoft.Azure.Common.Extensions.Authentication
2020
{
2121
/// <summary>
2222
/// An implementation of <see cref="IWin32Window"/> that gives the

‎src/Common/Commands.Common/Authentication/CredStore.cs renamed to ‎src/Common/Azure.Common.Extensions/Authentication/CredStore.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
using System.Runtime.ConstrainedExecution;
1717
using System.Runtime.InteropServices;
1818

19-
namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
19+
namespace Microsoft.Azure.Common.Extensions.Authentication
2020
{
2121
/// <summary>
2222
/// Class wrapping PInvoke signatures for Windows Credential store

‎src/Common/Commands.Common/Authentication/IAccessToken.cs renamed to ‎src/Common/Azure.Common.Extensions/Authentication/IAccessToken.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
using System;
1616

17-
namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
17+
namespace Microsoft.Azure.Common.Extensions.Authentication
1818
{
1919
public interface IAccessToken
2020
{

‎src/Common/Commands.Common/Authentication/ITokenProvider.cs renamed to ‎src/Common/Azure.Common.Extensions/Authentication/ITokenProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using Microsoft.Azure.Common.Extensions.Models;
1516
using System.Security;
16-
using Microsoft.WindowsAzure.Commands.Common.Models;
1717

18-
namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
18+
namespace Microsoft.Azure.Common.Extensions.Authentication
1919
{
2020
/// <summary>
2121
/// This interface represents objects that can be used

‎src/Common/Commands.Common/Authentication/LoginType.cs renamed to ‎src/Common/Azure.Common.Extensions/Authentication/LoginType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
15+
namespace Microsoft.Azure.Common.Extensions.Authentication
1616
{
1717
public enum LoginType
1818
{

‎src/Common/Commands.Common/Authentication/ProtectedFileTokenCache.cs renamed to ‎src/Common/Azure.Common.Extensions/Authentication/ProtectedFileTokenCache.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,20 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using Microsoft.IdentityModel.Clients.ActiveDirectory;
1516
using System;
1617
using System.IO;
1718
using System.Security.Cryptography;
18-
using Microsoft.IdentityModel.Clients.ActiveDirectory;
19-
using Microsoft.WindowsAzure.Commands.Common;
2019

21-
namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
20+
namespace Microsoft.Azure.Common.Extensions.Authentication
2221
{
2322
/// <summary>
2423
/// An implementation of the Adal token cache that stores the cache items
2524
/// in the DPAPI-protected file.
2625
/// </summary>
2726
public class ProtectedFileTokenCache : TokenCache
2827
{
29-
private static readonly string CacheFileName = Path.Combine(AzurePowerShell.ProfileDirectory, "TokenCache.dat");
28+
private static readonly string CacheFileName = Path.Combine(AzureSession.ProfileDirectory, AzureSession.TokenCacheFile);
3029

3130
private static readonly object fileLock = new object();
3231

0 commit comments

Comments
 (0)