Skip to content

Commit aa67b0f

Browse files
authored
Merge pull request #6565 from praries880/Networking-AzureFirewall
Networking azure firewall : Versioning changes for preview module
2 parents 2a45514 + 362ccb2 commit aa67b0f

File tree

384 files changed

+280216
-159345
lines changed

Some content is hidden

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

384 files changed

+280216
-159345
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@ pingme.txt
218218
groupMapping*.json
219219
/tools/index.json
220220
/Package/index.json
221+
/tools/outputtypes.json
222+
/Package/outputtypes.json
221223

222224
*.msi
223225
*.wixpdb

ChangeLog.md

Lines changed: 216 additions & 141 deletions
Large diffs are not rendered by default.

build.proj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280

281281
<Exec ContinueOnError="false"
282282
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewHelpIndex.ps1 -OutputFile $(PackageDirectory)\index.json -BuildConfig $(Configuration) &quot;"
283-
Condition="'$(Latest)' == 'true' and $(CodeSign) == 'true'"/>
283+
Condition=" ('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'"/>
284284

285285
<!-- Copying modules to be signed -->
286286

@@ -314,6 +314,11 @@
314314
Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Stack' "/>
315315

316316
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
317+
318+
<Exec ContinueOnError="false"
319+
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewOutputTypeIndex.ps1 -OutputFile $(PackageDirectory)\outputtypes.json -BuildConfig $(Configuration) &quot;"
320+
Condition=" ('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'"/>
321+
317322
<!-- AzureRM -->
318323
<Copy SourceFiles="$(PackageDirectory)\$(Configuration)\AzureRM.psd1"
319324
DestinationFolder="$(LibraryToolsFolder)\AzureRM" Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Latest' "/>
@@ -582,9 +587,8 @@
582587

583588
<Message Importance="high" Text="Running dependency analysis..." />
584589

585-
<Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Package\$(Configuration) $(MSBuildProjectDirectory)\src\Package true $(SkipHelp)"
586-
Condition="'$(Scope)' != 'Stack'"
587-
ContinueOnError="True"/>
590+
<Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Package\$(Configuration) $(MSBuildProjectDirectory)\src\Package true $(SkipHelp) @(ModulesChanged)"
591+
Condition="'$(Scope)' != 'Stack'"/>
588592

589593
<Exec Command="$(PackageDirectory)\StaticAnalysis.exe $(StackPackageFolder)\$(Configuration) $(StackPackageFolder)"
590594
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
@@ -601,7 +605,7 @@
601605
<Target Name="ChangeLogCheck">
602606
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckChangeLog.ps1 -FilesChanged '@(FilesChanged)' &quot;"
603607
ContinueOnError="false"
604-
Condition="'$(Latest)' == 'true'"/>
608+
Condition=" '$(Scope)' == 'All' or '$(Scope)' == 'Latest' "/>
605609
<OnError ExecuteTargets="ChangeLogErrorMessage"/>
606610
</Target>
607611

src/Common/Commands.Common/AzurePowerShell.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class AzurePowerShell
2626

2727
public const string AssemblyCopyright = "Copyright © Microsoft";
2828

29-
public const string AssemblyVersion = "6.3.0";
29+
public const string AssemblyVersion = "6.4.0";
3030

31-
public const string AssemblyFileVersion = "6.3.0";
31+
public const string AssemblyFileVersion = "6.4.0";
3232

3333
public const string ProfileFile = "AzureProfile.json";
3434

src/ResourceManager/Aks/Commands.Aks/AzureRM.Aks.psd1

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 3/20/2018
6+
# Generated on: 6/26/2018
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.0.2'
15+
ModuleVersion = '0.0.3'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -51,12 +51,12 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.0'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.1'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
RequiredAssemblies = '.\YamlDotNet.dll',
58-
'.\Microsoft.Azure.Commands.Common.Graph.RBAC.dll',
59-
'.\AutoMapper.dll', '.\System.Management.Automation.dll'
58+
'.\Microsoft.Azure.Commands.Common.Graph.RBAC.dll',
59+
'.\AutoMapper.dll', '.\System.Management.Automation.dll'
6060

6161
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
6262
# ScriptsToProcess = @()
@@ -74,8 +74,8 @@ NestedModules = @('.\Microsoft.Azure.Commands.Aks.dll')
7474
FunctionsToExport = @()
7575

7676
# 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.
77-
CmdletsToExport = 'Get-AzureRmAks', 'New-AzureRmAks', 'Remove-AzureRmAks',
78-
'Import-AzureRmAksCredential', 'Start-AzureRmAksDashboard',
77+
CmdletsToExport = 'Get-AzureRmAks', 'New-AzureRmAks', 'Remove-AzureRmAks',
78+
'Import-AzureRmAksCredential', 'Start-AzureRmAksDashboard',
7979
'Stop-AzureRmAksDashboard', 'Set-AzureRmAks'
8080

8181
# Variables to export from this module
@@ -111,8 +111,7 @@ PrivateData = @{
111111
# IconUri = ''
112112

113113
# ReleaseNotes of this module
114-
ReleaseNotes = '* Updated to the latest version of the Azure ClientRuntime
115-
* Set minimum dependency of module to PowerShell 5.0'
114+
ReleaseNotes = '* No version update. Extracted AKS sdk to common for reuse in DevSpaces.'
116115

117116
# Prerelease string of this module
118117
Prerelease = 'preview'
@@ -124,7 +123,7 @@ PrivateData = @{
124123
# ExternalModuleDependencies = @()
125124

126125
} # End of PSData hashtable
127-
126+
128127
} # End of PrivateData hashtable
129128

130129
# HelpInfo URI of this module

src/ResourceManager/Aks/Commands.Aks/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+
22+
## Version 0.0.3
2123
* No version update. Extracted AKS sdk to common for reuse in DevSpaces.
2224

2325
## Version 0.0.2

src/ResourceManager/Aks/Commands.Aks/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
[assembly: ComVisible(false)]
2424
[assembly: CLSCompliant(false)]
2525
[assembly: Guid("a97e0c3e-e389-46a6-b73d-2b9bd6909bdb")]
26-
[assembly: AssemblyVersion("0.0.2")]
27-
[assembly: AssemblyFileVersion("0.0.2")]
26+
[assembly: AssemblyVersion("0.0.3")]
27+
[assembly: AssemblyFileVersion("0.0.3")]
Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,92 @@
1-
#
2-
# Module manifest for module 'Microsoft.Azure.Commands.AnalysisServices.Dataplane'
3-
#
4-
# Generated by: Microsoft Corporation
5-
#
1+
#
2+
# Module manifest for module 'Microsoft.Azure.Commands.AnalysisServices.Dataplane'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
66
# Generated on: 12/02/2016
7-
#
8-
7+
#
8+
99
@{
1010

1111
# Script module or binary module file associated with this manifest.
1212
# RootModule = ''
13-
14-
# Version number of this module.
15-
ModuleVersion = '0.5.1'
16-
17-
# ID used to uniquely identify this module
18-
GUID = 'c717b5a4-1f1b-4a2f-8aa1-bfd09934626e'
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
13+
14+
# Version number of this module.
15+
ModuleVersion = '0.5.2'
16+
17+
# ID used to uniquely identify this module
18+
GUID = 'c717b5a4-1f1b-4a2f-8aa1-bfd09934626e'
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
3030
Description = 'Microsoft Azure PowerShell - Analysis Services server management'
31-
32-
# Minimum version of the Windows PowerShell engine required by this module
33-
PowerShellVersion = '5.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.5.2'
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'
31+
32+
# Minimum version of the Windows PowerShell engine required by this module
33+
PowerShellVersion = '5.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.5.2'
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'
4949

5050
# Modules that must be imported into the global environment prior to importing this module
51-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.0'; })
51+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.1'; })
5252

53-
# Assemblies that must be loaded prior to importing this module
53+
# Assemblies that must be loaded prior to importing this module
5454
RequiredAssemblies = @()
55-
56-
# Script files (.ps1) that are run in the caller's environment prior to importing this module
57-
ScriptsToProcess = @()
58-
59-
# Type files (.ps1xml) to be loaded when importing this module
55+
56+
# Script files (.ps1) that are run in the caller's environment prior to importing this module
57+
ScriptsToProcess = @()
58+
59+
# Type files (.ps1xml) to be loaded when importing this module
6060
TypesToProcess = @()
61-
62-
# Format files (.ps1xml) to be loaded when importing this module
61+
62+
# Format files (.ps1xml) to be loaded when importing this module
6363
FormatsToProcess = @()
64-
65-
# Modules to import as nested modules of the module specified in ModuleToProcess
64+
65+
# Modules to import as nested modules of the module specified in ModuleToProcess
6666
NestedModules = @('.\Microsoft.Azure.Commands.AnalysisServices.Dataplane.dll')
67-
68-
# Functions to export from this module
69-
FunctionsToExport = '*'
70-
71-
# Cmdlets to export from this module
67+
68+
# Functions to export from this module
69+
FunctionsToExport = '*'
70+
71+
# Cmdlets to export from this module
7272
CmdletsToExport = 'Add-AzureAnalysisServicesAccount',
7373
'Restart-AzureAnalysisServicesInstance',
7474
'Export-AzureAnalysisServicesInstanceLog',
7575
'Sync-AzureAnalysisServicesInstance'
76-
77-
# Variables to export from this module
78-
VariablesToExport = '*'
79-
80-
# Aliases to export from this module
76+
77+
# Variables to export from this module
78+
VariablesToExport = '*'
79+
80+
# Aliases to export from this module
8181
AliasesToExport = '*'
82-
83-
# List of all modules packaged with this module
84-
ModuleList = @()
85-
86-
# List of all files packaged with this module
87-
FileList = @()
88-
89-
# Private data to pass to the module specified in ModuleToProcess
82+
83+
# List of all modules packaged with this module
84+
ModuleList = @()
85+
86+
# List of all files packaged with this module
87+
FileList = @()
88+
89+
# Private data to pass to the module specified in ModuleToProcess
9090
PrivateData = @{
9191

9292
PSData = @{
@@ -104,10 +104,10 @@ PrivateData = @{
104104
# IconUri = ''
105105

106106
# ReleaseNotes of this module
107-
ReleaseNotes = '* Set minimum dependency of module to PowerShell 5.0'
107+
ReleaseNotes = '* Fixed formatting of OutputTypes in help files'
108108

109109
} # End of PSData hashtable
110110

111-
} # End of PrivateData hashtable
111+
} # End of PrivateData hashtable
112112

113-
}
113+
}

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/ChangeLog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
-->
2020
## Current Release
2121

22+
## Version 0.5.2
23+
* Fixed formatting of OutputTypes in help files
24+
2225
## Version 0.5.1
2326
* Set minimum dependency of module to PowerShell 5.0

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands/Synchronize-AzureASInstance.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace Microsoft.Azure.Commands.AnalysisServices.Dataplane
3737
/// </summary>
3838
[Cmdlet(VerbsData.Sync, "AzureAnalysisServicesInstance", SupportsShouldProcess = true)]
3939
[Alias("Sync-AzureAsInstance")]
40-
[OutputType(typeof(ScaleOutServerDatabaseSyncDetails[]))]
40+
[OutputType(typeof(ScaleOutServerDatabaseSyncDetails))]
4141
public class SynchronizeAzureAzureAnalysisServer : AzurePSCmdlet
4242
{
4343
private static TimeSpan DefaultPollingInterval = TimeSpan.FromSeconds(30);

0 commit comments

Comments
 (0)