Skip to content

Commit 9b661c6

Browse files
author
Maddie Clayton
authored
Merge pull request #7051 from bganapa/resources-2018
stack resources module for 2018-03-01-hybrid profile
2 parents 6aaeb97 + cd72719 commit 9b661c6

File tree

541 files changed

+217937
-57
lines changed

Some content is hidden

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

541 files changed

+217937
-57
lines changed

src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@
202202
<ItemGroup>
203203
<OutFiles Include="$(OutDir)\**\*.*" />
204204
</ItemGroup>
205-
<Copy SourceFiles="@(OutFiles)" DestinationFiles="@(OutFiles->'..\..\..\Stack\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Resources\%(RecursiveDir)%(Filename)%(Extension)')" />
206205
<Copy SourceFiles="@(MarkdownFiles)" DestinationFolder="$(OutputPath)\help\" ContinueOnError="false" />
207206
</Target>
208207
</Project>

src/StackAdmin/AzureRM/AzureRM.psd1

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
RootModule = "AzureRM.psm1"
1313

1414
# Version number of this module.
15-
ModuleVersion = '1.2.11'
15+
ModuleVersion = '2.3.0'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -33,7 +33,7 @@
3333
Description = 'Azure Resource Manager Module'
3434

3535
# Minimum version of the Windows PowerShell engine required by this module
36-
PowerShellVersion = '3.0'
36+
PowerShellVersion = '5.0'
3737

3838
# Name of the Windows PowerShell host required by this module
3939
# PowerShellHostName = ''
@@ -51,16 +51,8 @@
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '3.4.1'; },
55-
@{ModuleName = 'Azure.Storage'; RequiredVersion = '1.0.5.4'; },
56-
@{ModuleName = 'AzureRM.Compute'; RequiredVersion = '1.2.3.4'; },
57-
@{ModuleName = 'AzureRM.Dns'; RequiredVersion = '3.4.1'; },
58-
@{ModuleName = 'AzureRM.KeyVault'; RequiredVersion = '3.4.1'; },
59-
@{ModuleName = 'AzureRM.Network'; RequiredVersion = '1.0.5.4'; },
60-
@{ModuleName = 'AzureRM.Resources'; RequiredVersion = '4.4.1'; },
61-
@{ModuleName = 'AzureRM.Storage'; RequiredVersion = '1.0.5.4'; },
62-
@{ModuleName = 'AzureRM.Tags'; RequiredVersion = '3.4.1'; },
63-
@{ModuleName = 'AzureRM.UsageAggregates'; RequiredVersion = '3.4.1'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '5.5.1'; },
55+
@{ModuleName = 'AzureRM.Resources'; RequiredVersion = '6.0.2'; })
6456

6557
# Assemblies that must be loaded prior to importing this module
6658
# RequiredAssemblies = @()

src/StackAdmin/Resources/ChangeLog.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!--
2+
Please leave this section at the top of the change log.
3+
4+
Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
5+
6+
## Current Release
7+
* Overview of change #1
8+
- Additional information about change #1
9+
* Overview of change #2
10+
- Additional information about change #2
11+
- Additional information about change #2
12+
* Overview of change #3
13+
* Overview of change #4
14+
- Additional information about change #4
15+
16+
## YYYY.MM.DD - Version X.Y.Z (Previous Release)
17+
* Overview of change #1
18+
- Additional information about change #1
19+
-->
20+
## Current Release
21+
22+
AzureStack version of AzureRm.Resources module, Changes till Azure powershell version 6.0.0 are included in this module.
23+
24+
The authorization client has been modified to support the api-version 2017-07-01
25+
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Collections
16+
{
17+
using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Json;
18+
using System;
19+
using System.Collections.Generic;
20+
using Commands.Common.Authentication.Abstractions;
21+
22+
/// <summary>
23+
/// The insensitive version of dictionary.
24+
/// </summary>
25+
/// <typeparam name="TValue">The type of the value.</typeparam>
26+
[JsonPreserveCaseDictionary]
27+
public class InsensitiveDictionary<TValue> : Dictionary<string, TValue>
28+
{
29+
/// <summary>
30+
/// The empty dictionary.
31+
/// </summary>
32+
public static readonly InsensitiveDictionary<TValue> Empty = new InsensitiveDictionary<TValue>();
33+
34+
/// <summary>
35+
/// Initializes a new instance of the <see cref="InsensitiveDictionary{TValue}"/> class.
36+
/// </summary>
37+
public InsensitiveDictionary()
38+
: base(StringComparer.InvariantCultureIgnoreCase)
39+
{
40+
}
41+
42+
/// <summary>
43+
/// Initializes a new instance of the <see cref="InsensitiveDictionary{TValue}"/> class.
44+
/// </summary>
45+
/// <param name="capacity">The initial number of elements that the <see cref="T:System.Collections.Generic.Dictionary`2" /> can contain.</param>
46+
public InsensitiveDictionary(int capacity)
47+
: base(capacity, StringComparer.InvariantCultureIgnoreCase)
48+
{
49+
}
50+
51+
/// <summary>
52+
/// Initializes a new instance of the <see cref="InsensitiveDictionary{TValue}"/> class.
53+
/// </summary>
54+
/// <param name="dictionary">The dictionary.</param>
55+
public InsensitiveDictionary(IDictionary<string, TValue> dictionary)
56+
: base(dictionary, StringComparer.InvariantCultureIgnoreCase)
57+
{
58+
}
59+
}
60+
}

0 commit comments

Comments
 (0)