Skip to content

Commit 2a82899

Browse files
author
xizha
committed
addressing requests for changes
1 parent aeefd48 commit 2a82899

File tree

6 files changed

+101
-106
lines changed

6 files changed

+101
-106
lines changed

‎src/ResourceManager/ContainerInstance/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Apply Azure Container Instance SDK 2018-02-01
22+
- Support DNS name label
2123

2224
## Version 0.2.2
2325
* Added Location Completer to -Location parameters allowing tab completion through valid Locations

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@
193193
<None Include="SessionRecords\Microsoft.Azure.Commands.ContainerInstance.Test.ScenarioTests.ContainerInstanceTests\TestCreateContainerGroup.json">
194194
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
195195
</None>
196+
<None Include="SessionRecords\Microsoft.Azure.Commands.ContainerInstance.Test.ScenarioTests.ContainerInstanceTests\TestCreateContainerGroupWithDnsNameLabel.json" >
197+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
198+
</None>
196199
<None Include="SessionRecords\Microsoft.Azure.Commands.ContainerInstance.Test.ScenarioTests.ContainerInstanceTests\TestCreateContainerGroupWithVolume.json">
197200
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
198201
</None>

‎src/StackAdmin/AzureRM/AzureRM.psd1

Lines changed: 96 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,100 @@
1-
#
2-
# Module manifest for module 'PSGet_AzureRM'
3-
#
4-
# Generated by: Microsoft Corporation
5-
#
6-
# Generated on: 2/7/2018
7-
#
8-
9-
@{
1+
#
2+
# Module manifest for module 'AzureRM.Installer'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
6+
# Generated on: 9/18/2015
7+
#
8+
9+
@{
1010

1111
# Script module or binary module file associated with this manifest.
12-
RootModule = 'AzureRM.psm1'
13-
14-
# Version number of this module.
15-
ModuleVersion = '1.2.11'
16-
17-
# Supported PSEditions
18-
# CompatiblePSEditions = @()
19-
20-
# ID used to uniquely identify this module
21-
GUID = 'b433e830-b479-4f7f-9c80-9cc6c28e1b51'
22-
23-
# Author of this module
24-
Author = 'Microsoft Corporation'
25-
26-
# Company or vendor of this module
27-
CompanyName = 'Microsoft Corporation'
28-
29-
# Copyright statement for this module
30-
Copyright = 'Microsoft Corporation. All rights reserved.'
31-
32-
# Description of the functionality provided by this module
33-
Description = 'Azure Resource Manager Module'
34-
35-
# Minimum version of the Windows PowerShell engine required by this module
36-
PowerShellVersion = '3.0'
37-
38-
# Name of the Windows PowerShell host required by this module
39-
# PowerShellHostName = ''
40-
41-
# Minimum version of the Windows PowerShell host required by this module
42-
# PowerShellHostVersion = ''
43-
44-
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
45-
DotNetFrameworkVersion = '4.0'
46-
47-
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
48-
CLRVersion = '4.0'
49-
50-
# Processor architecture (None, X86, Amd64) required by this module
51-
# ProcessorArchitecture = ''
52-
53-
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '4.2.0'; },
55-
@{ModuleName = 'Azure.Storage'; RequiredVersion = '1.0.5.4'; },
56-
@{ModuleName = 'AzureRM.Compute'; RequiredVersion = '1.2.3.4'; },
57-
@{ModuleName = 'AzureRM.Dns'; RequiredVersion = '4.0.1'; },
58-
@{ModuleName = 'AzureRM.KeyVault'; RequiredVersion = '4.1.0'; },
59-
@{ModuleName = 'AzureRM.Network'; RequiredVersion = '1.0.5.4'; },
60-
@{ModuleName = 'AzureRM.Resources'; RequiredVersion = '5.2.0'; },
61-
@{ModuleName = 'AzureRM.Storage'; RequiredVersion = '1.0.5.4'; },
62-
@{ModuleName = 'AzureRM.Tags'; RequiredVersion = '4.0.0'; },
63-
@{ModuleName = 'AzureRM.UsageAggregates'; RequiredVersion = '4.0.0'; })
64-
65-
# Assemblies that must be loaded prior to importing this module
66-
# RequiredAssemblies = @()
67-
68-
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
69-
# ScriptsToProcess = @()
70-
71-
# Type files (.ps1xml) to be loaded when importing this module
72-
# TypesToProcess = @()
73-
74-
# Format files (.ps1xml) to be loaded when importing this module
75-
# FormatsToProcess = @()
76-
77-
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
78-
# NestedModules = @()
79-
80-
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
81-
FunctionsToExport = @()
82-
83-
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
84-
CmdletsToExport = @()
85-
86-
# Variables to export from this module
87-
# VariablesToExport = @()
88-
89-
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
90-
AliasesToExport = @()
91-
92-
# DSC resources to export from this module
93-
# DscResourcesToExport = @()
94-
95-
# List of all modules packaged with this module
96-
# ModuleList = @()
97-
98-
# List of all files packaged with this module
99-
# FileList = @()
10012

13+
14+
# Version number of this module.
15+
ModuleVersion = '1.2.11'
16+
17+
# ID used to uniquely identify this module
18+
GUID = 'B433E830-B479-4F7F-9C80-9CC6C28E1B51'
19+
20+
# Author of this module
21+
Author = 'Microsoft Corporation'
22+
23+
# Company or vendor of this module
24+
CompanyName = 'Microsoft Corporation'
25+
26+
# Copyright statement for this module
27+
Copyright = 'Microsoft Corporation. All rights reserved.'
28+
29+
# Description of the functionality provided by this module
30+
Description = 'Azure Resource Manager Module'
31+
32+
# Minimum version of the Windows PowerShell engine required by this module
33+
PowerShellVersion = '3.0'
34+
35+
# Name of the Windows PowerShell host required by this module
36+
PowerShellHostName = ''
37+
38+
# Minimum version of the Windows PowerShell host required by this module
39+
PowerShellHostVersion = ''
40+
41+
# Minimum version of the .NET Framework required by this module
42+
DotNetFrameworkVersion = '4.0'
43+
44+
# Minimum version of the common language runtime (CLR) required by this module
45+
CLRVersion='4.0'
46+
47+
# Processor architecture (None, X86, Amd64, IA64) required by this module
48+
ProcessorArchitecture = 'None'
49+
50+
# Modules that must be imported into the global environment prior to importing this module
51+
RequiredModules = @(@{ModuleName="AzureRM.Profile"; RequiredVersion="4.2.0"},
52+
@{ModuleName="Azure.Storage"; RequiredVersion="1.0.5.4"}
53+
@{ModuleName="AzureRM.Compute"; RequiredVersion="1.2.3.4"},
54+
@{ModuleName="AzureRM.Dns"; RequiredVersion="4.0.1"},
55+
@{ModuleName="AzureRM.KeyVault"; RequiredVersion="4.1.0"},
56+
@{ModuleName="AzureRM.Network"; RequiredVersion="1.0.5.4"},
57+
@{ModuleName="AzureRM.Resources"; RequiredVersion="5.2.0"},
58+
@{ModuleName="AzureRM.Storage"; RequiredVersion="1.0.5.4"},
59+
@{ModuleName="AzureRM.Tags"; RequiredVersion="4.0.0"},
60+
@{ModuleName="AzureRM.UsageAggregates"; RequiredVersion="4.0.0"})
61+
62+
# Assemblies that must be loaded prior to importing this module
63+
RequiredAssemblies = @()
64+
65+
# Script files (.ps1) that are run in the caller's environment prior to importing this module
66+
ScriptsToProcess = @()
67+
68+
# Type files (.ps1xml) to be loaded when importing this module
69+
TypesToProcess = @(
70+
)
71+
72+
# Format files (.ps1xml) to be loaded when importing this module
73+
FormatsToProcess = @(
74+
)
75+
76+
# Modules to import as nested modules of the module specified in ModuleToProcess
77+
NestedModules = @(
78+
)
79+
80+
# Functions to export from this module
81+
FunctionsToExport = '*'
82+
83+
# Cmdlets to export from this module
84+
CmdletsToExport = '*'
85+
86+
# Variables to export from this module
87+
VariablesToExport = '*'
88+
89+
# Aliases to export from this module
90+
AliasesToExport = @()
91+
92+
# List of all modules packaged with this module
93+
ModuleList = @()
94+
95+
# List of all files packaged with this module
96+
FileList = @()
97+
10198
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
10299
PrivateData = @{
103100

@@ -163,13 +160,6 @@ PrivateData = @{
163160

164161
} # End of PSData hashtable
165162

166-
} # End of PrivateData hashtable
167-
168-
# HelpInfo URI of this module
169-
# HelpInfoURI = ''
170-
171-
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
172-
# DefaultCommandPrefix = ''
173-
174-
}
163+
} # End of PrivateData hashtable
175164

165+
}

‎src/StackAdmin/AzureRM/AzureRM.psm1

-4.57 KB
Binary file not shown.

‎src/StackAdmin/AzureStack/AzureStack.psm1

-3.86 KB
Binary file not shown.

‎tools/AzureRM/AzureRM.psm1

-9.76 KB
Binary file not shown.

0 commit comments

Comments
 (0)