Skip to content

Sync tools folder generation #18976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wyunchi-ms merged 1 commit into from
Jul 19, 2022
Merged

Sync tools folder generation #18976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .azure-pipelines/util/analyze-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@ steps:

- pwsh: 'Install-Module "platyPS", "PSScriptAnalyzer" -Force -Confirm:$false -Scope CurrentUser'
displayName: 'Install PowerShell Dependencies'

- task: PowerShell@2
displayName: 'Install latest modules'
inputs:
targetType: 'inline'
script: |
New-Item -ItemType Directory -Path "Az-Cmdlets-latest"
Invoke-WebRequest -Uri "https://azpspackage.blob.core.windows.net/release/Az-Cmdlets-latest.tar.gz" -OutFile "Az-Cmdlets-latest/Az-Cmdlets-latest.tar.gz" -MaximumRetryCount 2 -RetryIntervalSec 1
tar -xvzf "Az-Cmdlets-latest/Az-Cmdlets-latest.tar.gz" -C "Az-Cmdlets-latest"
. Az-Cmdlets-latest/InstallModule.ps1
pwsh: true

- task: DotNetCoreCLI@2
displayName: 'Generate Help'
Expand Down
2 changes: 1 addition & 1 deletion build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@

<Target Name="StaticAnalysisExample" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build" AfterTargets="StaticAnalysisHelp">
<Message Importance="high" Text="Running static analysis for PowerShell examples..." />
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/StaticAnalysis/ExampleAnalyzer/Measure-MarkdownOrScript.ps1 -MarkdownPaths $(RepoArtifacts)/FilesChanged.txt -RulePaths $(RepoTools)/StaticAnalysis/ExampleAnalyzer/AnalyzeRules/*.psm1 -Recurse -AnalyzeScriptsInFile -OutputScriptsInFile -OutputResultsByModule &quot;"/>
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/StaticAnalysis/ExampleAnalyzer/Measure-MarkdownOrScript.ps1 -MarkdownPaths $(RepoArtifacts)/FilesChanged.txt -RulePaths $(RepoTools)/StaticAnalysis/ExampleAnalyzer/AnalyzeRules/*.psm1 -AnalyzeScriptsInFile -OutputScriptsInFile &quot;"/>
</Target>

<Target Name="StaticAnalysis" DependsOnTargets="StaticAnalysisBreakingChange;StaticAnalysisDependency;StaticAnalysisSignature;StaticAnalysisHelp;StaticAnalysisExample">
Expand Down
263 changes: 108 additions & 155 deletions tools/Az/Az.psd1
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 26 additions & 22 deletions tools/AzPreview/AzPreview.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '8.0.0'
ModuleVersion = '8.1.0'

# Supported PSEditions
CompatiblePSEditions = 'Core', 'Desktop'
Expand Down Expand Up @@ -52,44 +52,45 @@ DotNetFrameworkVersion = '4.7.2'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.8.0'; },
@{ModuleName = 'Az.ADDomainServices'; RequiredVersion = '0.1.0'; },
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.9.0'; },
@{ModuleName = 'Az.ADDomainServices'; RequiredVersion = '0.2.0'; },
@{ModuleName = 'Az.Advisor'; RequiredVersion = '1.1.2'; },
@{ModuleName = 'Az.Aks'; RequiredVersion = '4.1.0'; },
@{ModuleName = 'Az.Aks'; RequiredVersion = '4.2.0'; },
@{ModuleName = 'Az.AlertsManagement'; RequiredVersion = '0.4.1'; },
@{ModuleName = 'Az.AnalysisServices'; RequiredVersion = '1.1.4'; },
@{ModuleName = 'Az.ApiManagement'; RequiredVersion = '3.0.0'; },
@{ModuleName = 'Az.App'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.AppConfiguration'; RequiredVersion = '1.1.0'; },
@{ModuleName = 'Az.ApplicationInsights'; RequiredVersion = '2.0.0'; },
@{ModuleName = 'Az.ApplicationInsights'; RequiredVersion = '2.1.0'; },
@{ModuleName = 'Az.Attestation'; RequiredVersion = '1.0.0'; },
@{ModuleName = 'Az.Automation'; RequiredVersion = '1.7.3'; },
@{ModuleName = 'Az.BareMetal'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.Batch'; RequiredVersion = '3.2.0'; },
@{ModuleName = 'Az.Billing'; RequiredVersion = '2.0.0'; },
@{ModuleName = 'Az.Blueprint'; RequiredVersion = '0.4.0'; },
@{ModuleName = 'Az.BotService'; RequiredVersion = '0.3.2'; },
@{ModuleName = 'Az.BotService'; RequiredVersion = '0.4.0'; },
@{ModuleName = 'Az.Cdn'; RequiredVersion = '2.1.0'; },
@{ModuleName = 'Az.ChangeAnalysis'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.CloudService'; RequiredVersion = '1.1.0'; },
@{ModuleName = 'Az.CognitiveServices'; RequiredVersion = '1.11.0'; },
@{ModuleName = 'Az.Communication'; RequiredVersion = '0.2.0'; },
@{ModuleName = 'Az.Compute'; RequiredVersion = '4.27.0'; },
@{ModuleName = 'Az.ConfidentialLedger'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.Compute'; RequiredVersion = '4.30.0'; },
@{ModuleName = 'Az.ConfidentialLedger'; RequiredVersion = '0.1.1'; },
@{ModuleName = 'Az.Confluent'; RequiredVersion = '0.2.0'; },
@{ModuleName = 'Az.ConnectedKubernetes'; RequiredVersion = '0.3.0'; },
@{ModuleName = 'Az.ConnectedMachine'; RequiredVersion = '0.3.0'; },
@{ModuleName = 'Az.ConnectedMachine'; RequiredVersion = '0.4.0'; },
@{ModuleName = 'Az.ConnectedNetwork'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.ContainerInstance'; RequiredVersion = '3.1.0'; },
@{ModuleName = 'Az.ContainerRegistry'; RequiredVersion = '3.0.0'; },
@{ModuleName = 'Az.CosmosDB'; RequiredVersion = '1.8.0'; },
@{ModuleName = 'Az.CosmosDB'; RequiredVersion = '1.8.2'; },
@{ModuleName = 'Az.CostManagement'; RequiredVersion = '0.2.0'; },
@{ModuleName = 'Az.CustomLocation'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.CustomProviders'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.DataBox'; RequiredVersion = '0.2.0'; },
@{ModuleName = 'Az.DataBoxEdge'; RequiredVersion = '1.1.0'; },
@{ModuleName = 'Az.Databricks'; RequiredVersion = '1.2.0'; },
@{ModuleName = 'Az.Datadog'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.DataFactory'; RequiredVersion = '1.16.7'; },
@{ModuleName = 'Az.DataFactory'; RequiredVersion = '1.16.8'; },
@{ModuleName = 'Az.DataLakeAnalytics'; RequiredVersion = '1.0.2'; },
@{ModuleName = 'Az.DataLakeStore'; RequiredVersion = '1.3.0'; },
@{ModuleName = 'Az.DataMigration'; RequiredVersion = '0.11.0'; },
Expand All @@ -108,7 +109,8 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.8.0'; },
@{ModuleName = 'Az.EdgeOrder'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.Elastic'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.EventGrid'; RequiredVersion = '1.3.0'; },
@{ModuleName = 'Az.EventHub'; RequiredVersion = '2.0.0'; },
@{ModuleName = 'Az.EventHub'; RequiredVersion = '2.1.0'; },
@{ModuleName = 'Az.FluidRelay'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.FrontDoor'; RequiredVersion = '1.9.0'; },
@{ModuleName = 'Az.Functions'; RequiredVersion = '4.0.3'; },
@{ModuleName = 'Az.GuestConfiguration'; RequiredVersion = '0.11.0'; },
Expand All @@ -121,13 +123,14 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.8.0'; },
@{ModuleName = 'Az.ImportExport'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.IotCentral'; RequiredVersion = '0.10.0'; },
@{ModuleName = 'Az.IotHub'; RequiredVersion = '2.7.4'; },
@{ModuleName = 'Az.KeyVault'; RequiredVersion = '4.5.0'; },
@{ModuleName = 'Az.KeyVault'; RequiredVersion = '4.6.0'; },
@{ModuleName = 'Az.KubernetesConfiguration'; RequiredVersion = '0.6.0'; },
@{ModuleName = 'Az.Kusto'; RequiredVersion = '2.1.0'; },
@{ModuleName = 'Az.LabServices'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.LogicApp'; RequiredVersion = '1.5.0'; },
@{ModuleName = 'Az.Logz'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.MachineLearning'; RequiredVersion = '1.1.3'; },
@{ModuleName = 'Az.MachineLearningServices'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.Maintenance'; RequiredVersion = '1.2.0'; },
@{ModuleName = 'Az.ManagedServiceIdentity'; RequiredVersion = '1.0.0'; },
@{ModuleName = 'Az.ManagedServices'; RequiredVersion = '3.0.0'; },
Expand All @@ -143,38 +146,39 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.8.0'; },
@{ModuleName = 'Az.MonitoringSolutions'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.MySql'; RequiredVersion = '1.0.0'; },
@{ModuleName = 'Az.NetAppFiles'; RequiredVersion = '0.10.0'; },
@{ModuleName = 'Az.Network'; RequiredVersion = '4.17.0'; },
@{ModuleName = 'Az.Network'; RequiredVersion = '4.18.0'; },
@{ModuleName = 'Az.NetworkFunction'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.NotificationHubs'; RequiredVersion = '1.1.1'; },
@{ModuleName = 'Az.OperationalInsights'; RequiredVersion = '3.1.0'; },
@{ModuleName = 'Az.Peering'; RequiredVersion = '0.3.0'; },
@{ModuleName = 'Az.PolicyInsights'; RequiredVersion = '1.5.0'; },
@{ModuleName = 'Az.Portal'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.PostgreSql'; RequiredVersion = '1.1.0'; },
@{ModuleName = 'Az.PowerBIEmbedded'; RequiredVersion = '1.1.2'; },
@{ModuleName = 'Az.PowerBIEmbedded'; RequiredVersion = '1.2.0'; },
@{ModuleName = 'Az.PrivateDns'; RequiredVersion = '1.0.3'; },
@{ModuleName = 'Az.ProviderHub'; RequiredVersion = '0.2.0'; },
@{ModuleName = 'Az.Purview'; RequiredVersion = '0.2.0'; },
@{ModuleName = 'Az.Quota'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.RecoveryServices'; RequiredVersion = '5.4.0'; },
@{ModuleName = 'Az.RecoveryServices'; RequiredVersion = '5.4.1'; },
@{ModuleName = 'Az.RedisCache'; RequiredVersion = '1.6.0'; },
@{ModuleName = 'Az.RedisEnterpriseCache'; RequiredVersion = '1.0.0'; },
@{ModuleName = 'Az.Relay'; RequiredVersion = '1.0.3'; },
@{ModuleName = 'Az.Reservations'; RequiredVersion = '0.9.0'; },
@{ModuleName = 'Az.ResourceGraph'; RequiredVersion = '0.12.0'; },
@{ModuleName = 'Az.ResourceMover'; RequiredVersion = '1.1.0'; },
@{ModuleName = 'Az.Resources'; RequiredVersion = '6.0.0'; },
@{ModuleName = 'Az.Resources'; RequiredVersion = '6.0.1'; },
@{ModuleName = 'Az.Search'; RequiredVersion = '0.8.0'; },
@{ModuleName = 'Az.Security'; RequiredVersion = '1.3.0'; },
@{ModuleName = 'Az.SecurityInsights'; RequiredVersion = '1.1.0'; },
@{ModuleName = 'Az.ServiceBus'; RequiredVersion = '1.9.0'; },
@{ModuleName = 'Az.ServiceFabric'; RequiredVersion = '3.0.2'; },
@{ModuleName = 'Az.ServiceBus'; RequiredVersion = '1.10.0'; },
@{ModuleName = 'Az.ServiceFabric'; RequiredVersion = '3.1.0'; },
@{ModuleName = 'Az.ServiceLinker'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.SignalR'; RequiredVersion = '1.4.1'; },
@{ModuleName = 'Az.SpringCloud'; RequiredVersion = '0.2.0'; },
@{ModuleName = 'Az.Sql'; RequiredVersion = '3.9.0'; },
@{ModuleName = 'Az.Sql'; RequiredVersion = '3.10.0'; },
@{ModuleName = 'Az.SqlVirtualMachine'; RequiredVersion = '1.1.0'; },
@{ModuleName = 'Az.StackHCI'; RequiredVersion = '1.2.0'; },
@{ModuleName = 'Az.Storage'; RequiredVersion = '4.6.0'; },
@{ModuleName = 'Az.StackHCI'; RequiredVersion = '1.3.0'; },
@{ModuleName = 'Az.Storage'; RequiredVersion = '4.7.0'; },
@{ModuleName = 'Az.StorageSync'; RequiredVersion = '1.7.0'; },
@{ModuleName = 'Az.StreamAnalytics'; RequiredVersion = '2.0.0'; },
@{ModuleName = 'Az.Subscription'; RequiredVersion = '0.8.1'; },
Expand Down
14 changes: 2 additions & 12 deletions tools/BuildPackagesTask/Microsoft.Azure.Build.Tasks/CIFilterTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ private bool ProcessTargetModule(Dictionary<string, string[]> csprojMap)

private string ProcessSinglePattern(string pattern)
{
return pattern.Replace("**", ".*").Replace("{ModuleName}", "(?<ModuleName>[^/]+)");
return pattern.Replace(".", "\\.").Replace("*", ".*").Replace("{ModuleName}", "(?<ModuleName>[^/]+)");
}

private Dictionary<string, HashSet<string>> CalculateInfluencedModuleInfoForEachPhase(List<(Regex, List<string>)> ruleList, Dictionary<string, string[]> csprojMap)
Expand Down Expand Up @@ -462,17 +462,7 @@ public override bool Execute()
}
else
{
Dictionary<string, HashSet<string>> influencedModuleInfo = new Dictionary<string, HashSet<string>>
{
[BUILD_PHASE] = new HashSet<string>() { ACCOUNT_MODULE_NAME },
[ANALYSIS_BREAKING_CHANGE_PHASE] = new HashSet<string>() { ACCOUNT_MODULE_NAME },
[ANALYSIS_DEPENDENCY_PHASE] = new HashSet<string>() { ACCOUNT_MODULE_NAME },
[ANALYSIS_HELP_PHASE] = new HashSet<string>() { ACCOUNT_MODULE_NAME },
[ANALYSIS_SIGNATURE_PHASE] = new HashSet<string>() { ACCOUNT_MODULE_NAME },
[TEST_PHASE] = new HashSet<string>() { ACCOUNT_MODULE_NAME }
};
FilterTaskResult.PhaseInfo = CalculateCsprojForBuildAndTest(influencedModuleInfo, csprojMap);
return true;
return false;
}
}
return true;
Expand Down
34 changes: 17 additions & 17 deletions tools/Common.Netcore.Dependencies.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24"/>
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.19"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Aks" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Authentication.Abstractions" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Authorization" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Common" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Compute" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Graph.Rbac" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.KeyVault" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Monitor" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Network" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.PolicyInsights" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.ResourceManager" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Storage" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Storage.Management" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.58-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Aks" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Authentication.Abstractions" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Authorization" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Common" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Compute" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Graph.Rbac" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.KeyVault" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Monitor" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Network" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.PolicyInsights" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.ResourceManager" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Storage" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Storage.Management" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.3.59-preview"/>
<PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.59-preview"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Azure.Core" Version="1.24.0"/>
Expand All @@ -36,7 +36,7 @@
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
</ItemGroup>
<PropertyGroup>
<StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.58-preview\tools\</StorageToolsPath>
<StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.59-preview\tools\</StorageToolsPath>
</PropertyGroup>
<ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
<PackageReference Include="Newtonsoft.Json" Version="10.0.3"/>
Expand Down
19 changes: 15 additions & 4 deletions tools/CreateMappings_rules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
[
{
"alias": "Container Apps",
"module": "App"
},
{
"alias": "Confidential Ledger",
"module": "ConfidentialLedger"
Expand All @@ -8,14 +12,13 @@
"alias": "API Management"
},
{
"regex": "MachineLearning",
"module": "MachineLearning",
"group": "ML Studio (Classic)",
"alias": "ML Studio (Classic)"
},
{
"regex": "Ml",
"group": "ML Studio (Classic)",
"alias": "ML Studio (Classic)"
"module": "MachineLearningServices",
"alias": "Machine Learning"
},
{
"regex": "ImageBuilder",
Expand All @@ -34,6 +37,10 @@
"group": "Virtual Machines",
"alias": "VM Snapshots"
},
{
"regex": "FluidRelay",
"alias": "Fluid Relay"
},
{
"regex": "Image",
"group": "Virtual Machines",
Expand Down Expand Up @@ -734,5 +741,9 @@
{
"alias": "ServiceLinker",
"module": "ServiceLinker"
},
{
"alias": "NetworkFunction",
"module": "NetworkFunction"
}
]
Loading