Skip to content

Commit 160243b

Browse files
felixwafelixwa
committed
Merge branch 'preview' into felixwa/Fixes-Paging
2 parents d595c9d + 0a0dd87 commit 160243b

File tree

2,989 files changed

+4857820
-92524
lines changed

Some content is hidden

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

2,989 files changed

+4857820
-92524
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Azure PowerShell specific
22
src/Publish/
33
src/Package/
4+
src/Stack/
45

56
obj
67
TestResults
@@ -12,6 +13,7 @@ msbuild.log
1213
# app.config is not useful for PowerShell.
1314
# please do not commit any app.config files.
1415
app.config
16+
!src/ResourceManager/Profile/Commands.Profile.Test/App.config
1517
## Ignore Visual Studio temporary files, build results, and
1618
## files generated by popular Visual Studio add-ons.
1719

‎NuGet.config

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
44
<add key="local-feed" value="tools/LocalFeed" />
5-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
66
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
77
<add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
88
</packageSources>
9+
<disabledPackageSources>
10+
<add key="dotnet-core" value="true" />
11+
<add key="powershell-core" value="true" />
12+
</disabledPackageSources>
913
</configuration>

‎build.proj

Lines changed: 82 additions & 31 deletions
Large diffs are not rendered by default.

‎setup/azurecmd.wxs

Lines changed: 2 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" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
33

4-
<?define productName="Microsoft Azure PowerShell - August 2017" ?>
4+
<?define productName="Microsoft Azure PowerShell - September 2017" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="4.3.1" ?>
8+
<?define version="4.3.2" ?>
99

1010
<Product Id="*"
1111
Name="$(var.productName)"

‎setup/azurecmdfiles.wxi

Lines changed: 94 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,77 @@
850850
<File Id="fil43E7D73F6ECD4DDE822875DD34FA9D18" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\System.Net.Http.Primitives.dll" />
851851
</Component>
852852
</Directory>
853+
<Directory Id="dir47A2B39B0611B6E373E033267EB15BCF" Name="AzureRM.ContainerInstance">
854+
<Component Id="cmpF014F858B00AE0B720A7FE08B30B3EB1" Guid="*">
855+
<File Id="filA3480B87C156A4B5C660366228905B48" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\AutoMapper.dll" />
856+
</Component>
857+
<Component Id="cmpEAD7343C628BB6448D8B9C23FEED2670" Guid="*">
858+
<File Id="fil4C1875FFDC2574CDEF54CD6706765B30" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\AzureRM.ContainerInstance.psd1" />
859+
</Component>
860+
<Component Id="cmp9C5A7356715B6922CF2C6EF6678E5438" Guid="*">
861+
<File Id="fil17D0ED50A53E62367F3286ABD14DDEC2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Hyak.Common.dll" />
862+
</Component>
863+
<Component Id="cmpFB234DD31894792E945113104A74B825" Guid="*">
864+
<File Id="filBF689F649386FDA6CD3F22A1CD1BB06C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.ApplicationInsights.dll" />
865+
</Component>
866+
<Component Id="cmp713E95E10701AE42E677F85985EF5EFD" Guid="*">
867+
<File Id="filEB670CA530978EB77CA8657A94F7212E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll" />
868+
</Component>
869+
<Component Id="cmp290EA0EFCA235BE56E601E04CD55529C" Guid="*">
870+
<File Id="fil4CF74C3BA5429133456D18D7895E422E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Azure.Commands.ContainerInstance.dll" />
871+
</Component>
872+
<Component Id="cmp9DF62AE934C12CD1C2509F5CBC7ACCC2" Guid="*">
873+
<File Id="filCD73415FDBD8F38F74623E2DC0F1758B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Azure.Commands.ContainerInstance.dll-Help.xml" />
874+
</Component>
875+
<Component Id="cmpBD05C950174A0082397685E34790466C" Guid="*">
876+
<File Id="fil687FC6362D3733DF54D19745F6898B46" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Azure.Commands.ContainerInstance.format.ps1xml" />
877+
</Component>
878+
<Component Id="cmp0839FD185FCF6A5CB3FD2D5B60F3F7F9" Guid="*">
879+
<File Id="filD5406DCF89D3C5A76D9EA77005684213" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
880+
</Component>
881+
<Component Id="cmpEEDB2B1FAA819BCCB82AACA4DBB55454" Guid="*">
882+
<File Id="filEB24599000D85A431C894221C6F4ABF0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Azure.Common.dll" />
883+
</Component>
884+
<Component Id="cmpEA35AAE5DB03CF2BDF02C837A44F245E" Guid="*">
885+
<File Id="fil9B44C5476D525617574E913FA6E99686" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Azure.Common.NetFramework.dll" />
886+
</Component>
887+
<Component Id="cmpD1FC76E65489062469C50C713650E4DA" Guid="*">
888+
<File Id="fil2BF3EA7D7A52A62039B2AF8AFE8623CE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Azure.KeyVault.Core.dll" />
889+
</Component>
890+
<Component Id="cmp8B109EB15D9BB6477BF9438D6CE54F36" Guid="*">
891+
<File Id="filA188F1FF463167665B7A961607A69DA0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Azure.Management.ContainerInstance.dll" />
892+
</Component>
893+
<Component Id="cmpC67DEF5E50A9AC7AD357BBD3E42D17F0" Guid="*">
894+
<File Id="fil5E1F1EAEC87906893C3456C40A4B9A66" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Rest.ClientRuntime.Azure.dll" />
895+
</Component>
896+
<Component Id="cmp85D9C31F44298BF955EC36A6CF524A23" Guid="*">
897+
<File Id="filC73C1847AA3E2151FF8C4C7F78D064C3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Rest.ClientRuntime.dll" />
898+
</Component>
899+
<Component Id="cmp1386DCAB186033CD6702183584069933" Guid="*">
900+
<File Id="fil9DA46CF5EAEEAECB23C52D6060EA45EC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Threading.Tasks.dll" />
901+
</Component>
902+
<Component Id="cmp5F18344CC8AB2D812EB3916ADE3F495D" Guid="*">
903+
<File Id="fil85D7D9A30921923B5F5C93CBA45AD222" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
904+
</Component>
905+
<Component Id="cmpC2EE61265356949E676F1A497AC0DE81" Guid="*">
906+
<File Id="fil0501D3D13A3ABC6CACED297A83834C60" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.Threading.Tasks.Extensions.dll" />
907+
</Component>
908+
<Component Id="cmpC2C9E25520A28FDDCB431F0388998F5C" Guid="*">
909+
<File Id="fil3D758CBAD5B24EFB59A567E6173F622B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.WindowsAzure.Commands.Common.dll" />
910+
</Component>
911+
<Component Id="cmp0F08B96A6FF8A3A0A48A28BA2EB965F1" Guid="*">
912+
<File Id="filCE22D9182723076A891431081DCDEA93" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Microsoft.WindowsAzure.Management.dll" />
913+
</Component>
914+
<Component Id="cmp4001D1BFC966874B8BC51BE05E07CFC2" Guid="*">
915+
<File Id="fil503F12C964F560A02C60BD8871978D28" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\Newtonsoft.Json.dll" />
916+
</Component>
917+
<Component Id="cmp95D2D9407E5DE8CF2C557678B0A4C8FD" Guid="*">
918+
<File Id="filADF98961A4980BB7051AA3B0619B262B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\System.Net.Http.Extensions.dll" />
919+
</Component>
920+
<Component Id="cmp90E88367AB3AF00FB328850E89F31F3F" Guid="*">
921+
<File Id="filD8804EFBBEC402CD4E328C4D1039C7A9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerInstance\System.Net.Http.Primitives.dll" />
922+
</Component>
923+
</Directory>
853924
<Directory Id="dir78B1ED8DBB1AADB6D8A971F20091A708" Name="AzureRM.ContainerRegistry">
854925
<Component Id="cmp70A64104F3BC8D22E626DD19299FC6D6" Guid="*">
855926
<File Id="filD282EDCE8F330B66F678059D8DAF1650" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerRegistry\AzureRM.ContainerRegistry.psd1" />
@@ -1556,9 +1627,6 @@
15561627
<Component Id="cmpC67F14F377421F1BCD74EC5A579D43CB" Guid="*">
15571628
<File Id="filE9553CEC1D67AB3D4B77759239D60B18" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.IotHub.dll-Help.xml" />
15581629
</Component>
1559-
<Component Id="cmpD844DA64698210481D550B5CD8799D26" Guid="*">
1560-
<File Id="filA23D9B350E9B87D17B90B2181AE71E4B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.IotHub.format.ps1xml" />
1561-
</Component>
15621630
<Component Id="cmp31610C192ED2776279BBDA3D9905552E" Guid="*">
15631631
<File Id="filB571C170B96736E7EE17BBF869A203A8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.IotHub\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
15641632
</Component>
@@ -5613,6 +5681,29 @@
56135681
<ComponentRef Id="cmp7E5FC780611F3C956F9AB6247B7ED1C5" />
56145682
<ComponentRef Id="cmp70BCD0155B7651BB65B36D61A0B86C88" />
56155683
<ComponentRef Id="cmpF7A00EAE5F90CF43F0CFB2C84DD981B1" />
5684+
<ComponentRef Id="cmpF014F858B00AE0B720A7FE08B30B3EB1" />
5685+
<ComponentRef Id="cmpEAD7343C628BB6448D8B9C23FEED2670" />
5686+
<ComponentRef Id="cmp9C5A7356715B6922CF2C6EF6678E5438" />
5687+
<ComponentRef Id="cmpFB234DD31894792E945113104A74B825" />
5688+
<ComponentRef Id="cmp713E95E10701AE42E677F85985EF5EFD" />
5689+
<ComponentRef Id="cmp290EA0EFCA235BE56E601E04CD55529C" />
5690+
<ComponentRef Id="cmp9DF62AE934C12CD1C2509F5CBC7ACCC2" />
5691+
<ComponentRef Id="cmpBD05C950174A0082397685E34790466C" />
5692+
<ComponentRef Id="cmp0839FD185FCF6A5CB3FD2D5B60F3F7F9" />
5693+
<ComponentRef Id="cmpEEDB2B1FAA819BCCB82AACA4DBB55454" />
5694+
<ComponentRef Id="cmpEA35AAE5DB03CF2BDF02C837A44F245E" />
5695+
<ComponentRef Id="cmpD1FC76E65489062469C50C713650E4DA" />
5696+
<ComponentRef Id="cmp8B109EB15D9BB6477BF9438D6CE54F36" />
5697+
<ComponentRef Id="cmpC67DEF5E50A9AC7AD357BBD3E42D17F0" />
5698+
<ComponentRef Id="cmp85D9C31F44298BF955EC36A6CF524A23" />
5699+
<ComponentRef Id="cmp1386DCAB186033CD6702183584069933" />
5700+
<ComponentRef Id="cmp5F18344CC8AB2D812EB3916ADE3F495D" />
5701+
<ComponentRef Id="cmpC2EE61265356949E676F1A497AC0DE81" />
5702+
<ComponentRef Id="cmpC2C9E25520A28FDDCB431F0388998F5C" />
5703+
<ComponentRef Id="cmp0F08B96A6FF8A3A0A48A28BA2EB965F1" />
5704+
<ComponentRef Id="cmp4001D1BFC966874B8BC51BE05E07CFC2" />
5705+
<ComponentRef Id="cmp95D2D9407E5DE8CF2C557678B0A4C8FD" />
5706+
<ComponentRef Id="cmp90E88367AB3AF00FB328850E89F31F3F" />
56165707
<ComponentRef Id="cmp70A64104F3BC8D22E626DD19299FC6D6" />
56175708
<ComponentRef Id="cmp557D6FF644755BCB1B0DFE0484A5D177" />
56185709
<ComponentRef Id="cmpBE0E3E756638CA19D98E7AF1B3F91F4C" />
@@ -5842,7 +5933,6 @@
58425933
<ComponentRef Id="cmp9DFE8C2688F7DF1A3DFF20EFA59BF3B5" />
58435934
<ComponentRef Id="cmpE29D513714759F365A7C0A2A7F2B5DC6" />
58445935
<ComponentRef Id="cmpC67F14F377421F1BCD74EC5A579D43CB" />
5845-
<ComponentRef Id="cmpD844DA64698210481D550B5CD8799D26" />
58465936
<ComponentRef Id="cmp31610C192ED2776279BBDA3D9905552E" />
58475937
<ComponentRef Id="cmpB0A6B8E083FEAEC29D41F54189DC6605" />
58485938
<ComponentRef Id="cmpB2620706D83DB49D3434BB39A5495055" />

‎src/Common/Commands.Common.Authentication.Abstractions/AzureAccount.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,22 @@ public static class Property
104104
/// </summary>
105105
AccessToken = "AccessToken",
106106

107+
/// <summary>
108+
/// Access token for AD Graph service.
109+
/// </summary>
110+
GraphAccessToken = "GraphAccessToken",
111+
112+
/// <summary>
113+
/// Access token for KeyVault service.
114+
/// </summary>
115+
KeyVaultAccessToken = "KeyVault",
116+
107117
/// <summary>
108118
/// Thumbprint for associated certificate
109119
/// </summary>
110120
CertificateThumbprint = "CertificateThumbprint";
111121

122+
112123
}
113124
}
114125
}

0 commit comments

Comments
 (0)