Skip to content

Commit 0ee0aed

Browse files
cormacpaynecormacpayne
authored
Merge branch 'preview' into enable-certs
2 parents cd1a8dd + 158fc10 commit 0ee0aed

37 files changed

+364
-375
lines changed

‎src/ResourceManager/Aks/Commands.Aks/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Update dependencies for type mapping issue
2122

2223
## Version 0.0.6
2324
* Update version of YamlDotNet.Signed used

‎src/ResourceManager/Aks/Commands.Aks/Commands.Aks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
</ProjectReference>
9696
</ItemGroup>
9797
<ItemGroup>
98-
<Reference Include="AutoMapper, Version=6.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
98+
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
9999
<SpecificVersion>False</SpecificVersion>
100-
<HintPath>..\..\..\packages\AutoMapper.6.2.1\lib\net45\AutoMapper.dll</HintPath>
100+
<HintPath>..\..\..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
101101
<Private>True</Private>
102102
</Reference>
103103
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

‎src/ResourceManager/Aks/Commands.Aks/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="6.2.1" targetFramework="net452" />
3+
<package id="AutoMapper" version="6.2.2" targetFramework="net452" />
44
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
55
<package id="System.Management.Automation_PowerShell_3.0" version="6.3.9600.17400" targetFramework="net452" />
66
<package id="YamlDotNet.Signed" version="5.2.1" targetFramework="net452" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<Prefer32Bit>false</Prefer32Bit>
4949
</PropertyGroup>
5050
<ItemGroup>
51-
<Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
52-
<HintPath>..\..\..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
51+
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
52+
<HintPath>..\..\..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="6.0.2" targetFramework="net452" />
3+
<package id="AutoMapper" version="6.2.2" targetFramework="net452" />
44
<package id="Microsoft.Azure.Management.ApiManagement" version="4.0.5-preview" targetFramework="net452" />
55
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" />
66
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Update dependencies for type mapping issue
2122

2223
## Version 6.1.5
2324
* Fixed issue with default resource groups not being set.

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<Prefer32Bit>false</Prefer32Bit>
4848
</PropertyGroup>
4949
<ItemGroup>
50-
<Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51-
<HintPath>..\..\..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
50+
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51+
<HintPath>..\..\..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
5454
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="6.0.2" targetFramework="net452" />
3+
<package id="AutoMapper" version="6.2.2" targetFramework="net452" />
44
<package id="Microsoft.Azure.Management.ApiManagement" version="4.0.5-preview" targetFramework="net452" />
55
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" />
66
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />

‎src/ResourceManager/Compute/Commands.Compute/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
-->
2121
## Current Release
2222
* Fixed identity issue for SystemAssigned identity
23+
* Update dependencies for type mapping issue
2324

2425
## Version 5.8.0
2526
* Add Add-AzureRmVmssVMDataDisk and Remove-AzureRmVmssVMDataDisk cmdlets

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<Prefer32Bit>false</Prefer32Bit>
5050
</PropertyGroup>
5151
<ItemGroup>
52-
<Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
53-
<HintPath>..\..\..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
52+
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
53+
<HintPath>..\..\..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
5656
<Reference Include="Microsoft.Azure.Management.Compute">

‎src/ResourceManager/Compute/Commands.Compute/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="6.0.2" targetFramework="net452" />
3+
<package id="AutoMapper" version="6.2.2" targetFramework="net452" />
44
<package id="Microsoft.Azure.Management.Compute" version="23.2.0" targetFramework="net452" />
55
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" />
66
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />

‎src/ResourceManager/ContainerInstance/Commands.ContainerInstance/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Update dependencies for type mapping issue
2122

2223
## Version 0.2.10
2324
* Fixed issue with default resource groups not being set.

‎src/ResourceManager/ContainerInstance/Commands.ContainerInstance/Commands.ContainerInstance.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
38-
<HintPath>..\..\..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
37+
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
38+
<HintPath>..\..\..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
4141
<Reference Include="Microsoft.Azure.Management.ContainerInstance, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/ContainerInstance/Commands.ContainerInstance/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="6.0.2" targetFramework="net452" />
3+
<package id="AutoMapper" version="6.2.2" targetFramework="net452" />
44
<package id="Microsoft.Azure.Management.ContainerInstance" version="1.0.3-preview" targetFramework="net452" />
55
</packages>

‎src/ResourceManager/Network/Commands.Network/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* Added cmdlet New-AzureRmApplicationGatewayCustomError, Add-AzureRmApplicationGatewayCustomError, Get-AzureRmApplicationGatewayCustomError, Set-AzureRmApplicationGatewayCustomError, Remove-AzureRmApplicationGatewayCustomError, Add-AzureRmApplicationGatewayHttpListenerCustomError, Get-AzureRmApplicationGatewayHttpListenerCustomError, Set-AzureRmApplicationGatewayHttpListenerCustomError, Remove-AzureRmApplicationGatewayHttpListenerCustomError
2222
* Added ICMP back to supported AzureFirewall Network Protocols
2323
* Update cmdlet Test-AzureRmNetworkWatcherConnectivity, add validation on destination id, address and port.
24+
* Fix issues with memory usage in VirtualNetwork map
2425

2526
## Version 6.9.1
2627
* Update cmdlet Test-AzureRmNetworkWatcherConnectivity, pass the protocol value to backend.

‎src/ResourceManager/Network/Commands.Network/Commands.Network.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<Prefer32Bit>false</Prefer32Bit>
5151
</PropertyGroup>
5252
<ItemGroup>
53-
<Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
54-
<HintPath>..\..\..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
53+
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
54+
<HintPath>..\..\..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
5757
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/Network/Commands.Network/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="6.0.2" targetFramework="net452" />
3+
<package id="AutoMapper" version="6.2.2" targetFramework="net452" />
44
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Management.Network" version="19.6.1-preview" targetFramework="net452" />
66
</packages>

‎src/ResourceManager/Profile/Commands.Profile/Az.Profile.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RequiredAssemblies = '.\Microsoft.Azure.PowerShell.Authentication.Abstractions.d
8484
TypesToProcess = '.\Microsoft.Azure.Commands.Profile.types.ps1xml'
8585

8686
# Format files (.ps1xml) to be loaded when importing this module
87-
FormatsToProcess = '.\Microsoft.Azure.Commands.Profile.format.ps1xml'
87+
FormatsToProcess = @('.\Microsoft.Azure.Commands.Profile.format.ps1xml', '.\Microsoft.Azure.Commands.Profile.generated.format.ps1xml')
8888

8989
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
9090
NestedModules = @('.\Microsoft.Azure.Commands.Profile.dll')

‎src/ResourceManager/Profile/Commands.Profile/AzureRM.Profile.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ RequiredAssemblies =
9292
TypesToProcess = '.\Microsoft.Azure.Commands.Profile.types.ps1xml'
9393

9494
# Format files (.ps1xml) to be loaded when importing this module
95-
FormatsToProcess = '.\Microsoft.Azure.Commands.Profile.format.ps1xml'
95+
FormatsToProcess = @('.\Microsoft.Azure.Commands.Profile.format.ps1xml', '.\Microsoft.Azure.Commands.Profile.generated.format.ps1xml')
9696

9797
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
9898
NestedModules = @('.\Microsoft.Azure.Commands.Profile.dll')

‎src/ResourceManager/Profile/Commands.Profile/Commands.Profile.Netcore.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@
7373
<None Update="Microsoft.Azure.Commands.Profile.format.ps1xml">
7474
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7575
</None>
76+
<None Update="Microsoft.Azure.Commands.Profile.generated.format.ps1xml">
77+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
78+
</None>
7679
<None Update="Microsoft.Azure.Commands.Profile.types.ps1xml">
7780
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7881
</None>

‎src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@
104104
<SubType>Designer</SubType>
105105
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
106106
</Content>
107+
<Content Include="Microsoft.Azure.Commands.Profile.generated.format.ps1xml">
108+
<SubType>Designer</SubType>
109+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
110+
</Content>
107111
<None Include="AzureRM.Profile.psd1">
108112
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
109113
</None>

‎src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.format.ps1xml

Lines changed: 0 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -11,131 +11,6 @@
1111
</SelectionSet>
1212
</SelectionSets>
1313
<ViewDefinitions>
14-
<View>
15-
<Name>Microsoft.Azure.Commands.Profile.Models.PSAzureProfile</Name>
16-
<ViewSelectedBy>
17-
<TypeName>Microsoft.Azure.Commands.Profile.Models.PSAzureProfile</TypeName>
18-
</ViewSelectedBy>
19-
<ListControl>
20-
<ListEntries>
21-
<ListEntry>
22-
<ListItems>
23-
<ListItem>
24-
<Label>Account</Label>
25-
<ScriptBlock>$_.Context.Account.ToString()</ScriptBlock>
26-
</ListItem>
27-
<ListItem>
28-
<Label>SubscriptionName</Label>
29-
<ScriptBlock>$_.Context.Subscription.Name</ScriptBlock>
30-
</ListItem>
31-
<ListItem>
32-
<Label>SubscriptionId</Label>
33-
<ScriptBlock>$_.Context.Subscription.ToString()</ScriptBlock>
34-
</ListItem>
35-
<ListItem>
36-
<ItemSelectionCondition>
37-
<ScriptBlock>$_.Context.Subscription -ne $null -and $_.Context.Subscription.CurrentStorageAccountName -ne $null</ScriptBlock>
38-
</ItemSelectionCondition>
39-
<Label>CurrentStorageAccount</Label>
40-
<ScriptBlock>$_.Context.Subscription.CurrentStorageAccountName</ScriptBlock>
41-
</ListItem>
42-
<ListItem>
43-
<Label>TenantId</Label>
44-
<ScriptBlock>$_.Context.Tenant.ToString()</ScriptBlock>
45-
</ListItem>
46-
<ListItem>
47-
<Label>Environment</Label>
48-
<ScriptBlock>$_.Context.Environment.ToString()</ScriptBlock>
49-
</ListItem>
50-
</ListItems>
51-
</ListEntry>
52-
</ListEntries>
53-
</ListControl>
54-
</View>
55-
<View>
56-
<Name>Microsoft.Azure.Commands.Profile.Models.PSAzureContext</Name>
57-
<ViewSelectedBy>
58-
<TypeName>Microsoft.Azure.Commands.Profile.Models.PSAzureContext</TypeName>
59-
</ViewSelectedBy>
60-
<ListControl>
61-
<ListEntries>
62-
<ListEntry>
63-
<ListItems>
64-
<ListItem>
65-
<PropertyName>Name</PropertyName>
66-
</ListItem>
67-
<ListItem>
68-
<PropertyName>Account</PropertyName>
69-
</ListItem>
70-
<ListItem>
71-
<Label>SubscriptionName</Label>
72-
<ScriptBlock>$_.Subscription.Name</ScriptBlock>
73-
</ListItem>
74-
<ListItem>
75-
<ItemSelectionCondition>
76-
<ScriptBlock>$_.Subscription -ne $null -and $_.Subscription.CurrentStorageAccountName -ne $null</ScriptBlock>
77-
</ItemSelectionCondition>
78-
<Label>CurrentStorageAccount</Label>
79-
<ScriptBlock>$_.Subscription.CurrentStorageAccountName</ScriptBlock>
80-
</ListItem>
81-
<ListItem>
82-
<Label>TenantId</Label>
83-
<ScriptBlock>$_.Tenant.ToString()</ScriptBlock>
84-
</ListItem>
85-
<ListItem>
86-
<PropertyName>Environment</PropertyName>
87-
</ListItem>
88-
</ListItems>
89-
</ListEntry>
90-
</ListEntries>
91-
</ListControl>
92-
</View>
93-
<View>
94-
<Name>Microsoft.Azure.Commands.Profile.Models.PSAzureSubscription</Name>
95-
<ViewSelectedBy>
96-
<TypeName>Microsoft.Azure.Commands.Profile.Models.PSAzureSubscription</TypeName>
97-
</ViewSelectedBy>
98-
<ListControl>
99-
<ListEntries>
100-
<ListEntry>
101-
<ListItems>
102-
<ListItem>
103-
<PropertyName>Name</PropertyName>
104-
</ListItem>
105-
<ListItem>
106-
<PropertyName>Id</PropertyName>
107-
</ListItem>
108-
<ListItem>
109-
<PropertyName>TenantId</PropertyName>
110-
</ListItem>
111-
<ListItem>
112-
<PropertyName>State</PropertyName>
113-
</ListItem>
114-
</ListItems>
115-
</ListEntry>
116-
</ListEntries>
117-
</ListControl>
118-
</View>
119-
<View>
120-
<Name>Microsoft.Azure.Commands.Profile.Models.PSAzureTenant</Name>
121-
<ViewSelectedBy>
122-
<TypeName>Microsoft.Azure.Commands.Profile.Models.PSAzureTenant</TypeName>
123-
</ViewSelectedBy>
124-
<ListControl>
125-
<ListEntries>
126-
<ListEntry>
127-
<ListItems>
128-
<ListItem>
129-
<PropertyName>Id</PropertyName>
130-
</ListItem>
131-
<ListItem>
132-
<PropertyName>Directory</PropertyName>
133-
</ListItem>
134-
</ListItems>
135-
</ListEntry>
136-
</ListEntries>
137-
</ListControl>
138-
</View>
13914
<View>
14015
<Name>Microsoft.Azure.Commands.Profile.Errors.AzureRestExceptionRecord</Name>
14116
<ViewSelectedBy>

0 commit comments

Comments
 (0)