Skip to content

Commit 66f1e58

Browse files
author
azurepowershell
committed
Sync tools folder from main branch to generation branch
1 parent c1f3222 commit 66f1e58

File tree

15 files changed

+433
-537
lines changed

15 files changed

+433
-537
lines changed

‎tools/CreateMappings_rules.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -799,5 +799,9 @@
799799
{
800800
"module": "LoadTesting",
801801
"alias": "LoadTesting"
802+
},
803+
{
804+
"alias": "MobileNetwork",
805+
"module": "MobileNetwork"
802806
}
803807
]

‎tools/ExecuteCIStep.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ If ($StaticAnalysisUX)
327327
If ("" -Ne $UXModuleList)
328328
{
329329
Write-Host "Running static analysis for UX metadata..."
330-
.("$PSScriptRoot/StaticAnalysis/UXMetadataAnalyzer/PrepareUXMetadata.ps1") -RepoArtifacts $RepoArtifacts -Configuration $Configuration
331330
dotnet $RepoArtifacts/StaticAnalysis/StaticAnalysis.Netcore.dll -p $RepoArtifacts/$Configuration -r $StaticAnalysisOutputDirectory --analyzers ux -u -m $UXModuleList
332331
}
333332
Return

‎tools/Gen2Master/MoveFromGeneration2Master.ps1

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,12 @@ Function Move-Generation2MasterHybrid {
259259
}
260260

261261
#copy generated docs to help folder
262-
Copy-Item -Path ("$SourcePath\{0}\docs\*" -f $submoduleDir.Name) -Destination "$DestPath\$ModuleName\help" -Filter *-*
262+
#Assume psd1 and help are in the same folder.
263+
$Psd1FolderPostfix = '';
264+
if (-not (Test-Path (Join-Path -Path (Join-Path -Path $DestPath -ChildPath $ModuleName) -ChildPath "Az.$ModuleName.psd1"))) {
265+
$Psd1FolderPostfix = '.Management'
266+
}
267+
Copy-Item -Path ("$SourcePath\{0}\docs\*" -f $submoduleDir.Name) -Destination "$DestPath\$ModuleName$Psd1FolderPostfix\help" -Filter *-*
263268

264269
#Region generate-info.json Here have a issue that user may not use latest version to generate the code.
265270
$generateInfo = @{}
@@ -299,10 +304,6 @@ Function Move-Generation2MasterHybrid {
299304
dotnet sln $SolutionPath add (Join-Path -Path (Join-Path -Path $DestPath -ChildPath $submoduleDir.Name) -ChildPath Az.$submoduleName.csproj)
300305

301306
# Update psd1
302-
$Psd1FolderPostfix = '';
303-
if (-not (Test-Path (Join-Path -Path (Join-Path -Path $DestPath -ChildPath $ModuleName) -ChildPath "Az.$ModuleName.psd1"))) {
304-
$Psd1FolderPostfix = '.Management'
305-
}
306307
$DestPsd1Path = Join-Path -Path (Join-Path -Path $DestPath -ChildPath $ModuleName$Psd1FolderPostfix) -ChildPath "Az.$ModuleName.psd1"
307308
$Psd1Metadata = Import-LocalizedData -BaseDirectory (Join-Path -Path $DestPath -ChildPath $ModuleName$Psd1FolderPostfix) -FileName "Az.$ModuleName.psd1"
308309
$SubModulePsd1MetaData = Import-LocalizedData -BaseDirectory (Join-Path -Path $SourcePath -ChildPath $submoduleDir.Name) -FileName "Az.$submoduleName.psd1"

‎tools/Modules/TestFx-Tasks.psd1

Lines changed: 87 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,130 @@
1-
#
2-
# Module manifest for module 'TestFx-Tasks'
3-
#
4-
# Generated by: ShahAbhijeet
5-
#
6-
# Generated on: 11/18/2016
7-
#
1+
# ----------------------------------------------------------------------------------
2+
# Copyright Microsoft Corporation
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
# http://www.apache.org/licenses/LICENSE-2.0
7+
# Unless required by applicable law or agreed to in writing, software
8+
# distributed under the License is distributed on an "AS IS" BASIS,
9+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
# See the License for the specific language governing permissions and
11+
# limitations under the License.
12+
# ----------------------------------------------------------------------------------
813

914
@{
1015

11-
# Script module or binary module file associated with this manifest.
12-
RootModule = 'TestFx-Tasks.psm1'
16+
# Script module or binary module file associated with this manifest.
17+
RootModule = 'TestFx-Tasks.psm1'
1318

14-
# Version number of this module.
15-
ModuleVersion = '1.0'
19+
# Version number of this module.
20+
ModuleVersion = '1.0'
1621

17-
# Supported PSEditions
18-
# CompatiblePSEditions = @()
22+
# Supported PSEditions
23+
# CompatiblePSEditions = @()
1924

20-
# ID used to uniquely identify this module
21-
GUID = '676f988a-1745-4263-bb86-5887d6b1f9f3'
25+
# ID used to uniquely identify this module
26+
GUID = '676f988a-1745-4263-bb86-5887d6b1f9f3'
2227

23-
# Author of this module
24-
Author = 'ShahAbhijeet'
28+
# Author of this module
29+
Author = 'Azure PowerShell'
2530

26-
# Company or vendor of this module
27-
CompanyName = 'Microsoft'
31+
# Company or vendor of this module
32+
CompanyName = 'Microsoft Corporation'
2833

29-
# Copyright statement for this module
30-
Copyright = '(c) 2016 ShahAbhijeet. All rights reserved.'
34+
# Copyright statement for this module
35+
Copyright = 'Microsoft Corporation. All rights reserved.'
3136

32-
# Description of the functionality provided by this module
33-
# Description = ''
37+
# Description of the functionality provided by this module
38+
# Description = ''
3439

35-
# Minimum version of the Windows PowerShell engine required by this module
36-
# PowerShellVersion = ''
40+
# Minimum version of the Windows PowerShell engine required by this module
41+
# PowerShellVersion = ''
3742

38-
# Name of the Windows PowerShell host required by this module
39-
# PowerShellHostName = ''
43+
# Name of the Windows PowerShell host required by this module
44+
# PowerShellHostName = ''
4045

41-
# Minimum version of the Windows PowerShell host required by this module
42-
# PowerShellHostVersion = ''
46+
# Minimum version of the Windows PowerShell host required by this module
47+
# PowerShellHostVersion = ''
4348

44-
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
45-
# DotNetFrameworkVersion = ''
49+
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
50+
# DotNetFrameworkVersion = ''
4651

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 = ''
52+
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
53+
# CLRVersion = ''
4954

50-
# Processor architecture (None, X86, Amd64) required by this module
51-
# ProcessorArchitecture = ''
55+
# Processor architecture (None, X86, Amd64) required by this module
56+
# ProcessorArchitecture = ''
5257

53-
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'Az.Resources'; ModuleVersion = '1.0.0'; })
58+
# Modules that must be imported into the global environment prior to importing this module
59+
RequiredModules = @(@{ModuleName = 'Az.Resources'; ModuleVersion = '1.0.0'; })
5560

56-
# Assemblies that must be loaded prior to importing this module
57-
# RequiredAssemblies = @()
61+
# Assemblies that must be loaded prior to importing this module
62+
# RequiredAssemblies = @()
5863

59-
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
60-
# ScriptsToProcess = @()
64+
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
65+
# ScriptsToProcess = @()
6166

62-
# Type files (.ps1xml) to be loaded when importing this module
63-
# TypesToProcess = @()
67+
# Type files (.ps1xml) to be loaded when importing this module
68+
# TypesToProcess = @()
6469

65-
# Format files (.ps1xml) to be loaded when importing this module
66-
# FormatsToProcess = @()
70+
# Format files (.ps1xml) to be loaded when importing this module
71+
# FormatsToProcess = @()
6772

68-
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69-
# NestedModules = @()
73+
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
74+
# NestedModules = @()
7075

71-
# 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.
72-
FunctionsToExport = 'Set-TestEnvironment', 'Remove-ServicePrincipal', 'New-ServicePrincipal', 'Set-SPNRole', 'New-TestCredential'
76+
# 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.
77+
FunctionsToExport = 'Get-TestFxEnvironment', 'Set-TestFxEnvironment'
7378

74-
# 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.
75-
CmdletsToExport = @()
79+
# 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.
80+
CmdletsToExport = @()
7681

77-
# Variables to export from this module
78-
# VariablesToExport = @()
82+
# Variables to export from this module
83+
# VariablesToExport = @()
7984

80-
# 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.
81-
AliasesToExport = @()
85+
# 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.
86+
AliasesToExport = @()
8287

83-
# DSC resources to export from this module
84-
# DscResourcesToExport = @()
88+
# DSC resources to export from this module
89+
# DscResourcesToExport = @()
8590

86-
# List of all modules packaged with this module
87-
# ModuleList = @()
91+
# List of all modules packaged with this module
92+
# ModuleList = @()
8893

89-
# List of all files packaged with this module
90-
# FileList = @()
94+
# List of all files packaged with this module
95+
# FileList = @()
9196

92-
# 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.
93-
PrivateData = @{
97+
# 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.
98+
PrivateData = @{
9499

95-
PSData = @{
100+
PSData = @{
96101

97-
# Tags applied to this module. These help with module discovery in online galleries.
98-
# Tags = @()
102+
# Tags applied to this module. These help with module discovery in online galleries.
103+
# Tags = @()
99104

100-
# A URL to the license for this module.
101-
# LicenseUri = ''
105+
# A URL to the license for this module.
106+
# LicenseUri = ''
102107

103-
# A URL to the main website for this project.
104-
# ProjectUri = ''
108+
# A URL to the main website for this project.
109+
# ProjectUri = ''
105110

106-
# A URL to an icon representing this module.
107-
# IconUri = ''
111+
# A URL to an icon representing this module.
112+
# IconUri = ''
108113

109-
# ReleaseNotes of this module
110-
# ReleaseNotes = ''
114+
# ReleaseNotes of this module
115+
# ReleaseNotes = ''
111116

112-
# External dependent modules of this module
113-
# ExternalModuleDependencies = ''
117+
# External dependent modules of this module
118+
# ExternalModuleDependencies = ''
114119

115-
} # End of PSData hashtable
120+
} # End of PSData hashtable
116121

117-
} # End of PrivateData hashtable
122+
} # End of PrivateData hashtable
118123

119-
# HelpInfo URI of this module
120-
# HelpInfoURI = ''
124+
# HelpInfo URI of this module
125+
# HelpInfoURI = ''
121126

122-
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
123-
# DefaultCommandPrefix = ''
127+
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
128+
# DefaultCommandPrefix = ''
124129

125130
}
126-

0 commit comments

Comments
 (0)