From a1eff1c301141fbd67ba157f62cc2bd7d9a69813 Mon Sep 17 00:00:00 2001 From: azure-powershell-bot <65331932+azure-powershell-bot@users.noreply.github.com> Date: Fri, 11 Oct 2024 07:34:19 +0000 Subject: [PATCH] Move Resources to main --- .../Az.Authorization.psd1 | 2 +- .../help/Az.Authorization.md | 2 +- src/Resources/MSGraph.Autorest/README.md | 2 +- .../MSGraph.Autorest/build-module.ps1 | 1 - .../custom/New-AzADAppCredential.ps1 | 18 +++++++++--------- .../exports/New-AzADAppCredential.ps1 | 2 ++ .../exports/ProxyCmdletDefinitions.ps1 | 2 ++ .../help/New-AzADAppCredential.md | 3 ++- src/Resources/Policy.Autorest/build-module.ps1 | 7 ++++--- src/Resources/Resources/Az.Resources.psd1 | 2 +- .../Resources/help/New-AzADAppCredential.md | 2 ++ 11 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/Resources/Authorization.Autorest/Az.Authorization.psd1 b/src/Resources/Authorization.Autorest/Az.Authorization.psd1 index 0953aedfb1c0..ae5e44450e99 100644 --- a/src/Resources/Authorization.Autorest/Az.Authorization.psd1 +++ b/src/Resources/Authorization.Autorest/Az.Authorization.psd1 @@ -1,5 +1,5 @@ @{ - GUID = '35a9c347-856c-41c9-9843-5dbaed8e4ef4' + GUID = '840b66e2-3c2a-4821-acc2-8c63e07fd598' RootModule = './Az.Authorization.psm1' ModuleVersion = '0.1.0' CompatiblePSEditions = 'Core', 'Desktop' diff --git a/src/Resources/Authorization.Autorest/help/Az.Authorization.md b/src/Resources/Authorization.Autorest/help/Az.Authorization.md index 65078e53d800..312adbaac9c2 100644 --- a/src/Resources/Authorization.Autorest/help/Az.Authorization.md +++ b/src/Resources/Authorization.Autorest/help/Az.Authorization.md @@ -1,6 +1,6 @@ --- Module Name: Az.Authorization -Module Guid: 35a9c347-856c-41c9-9843-5dbaed8e4ef4 +Module Guid: 840b66e2-3c2a-4821-acc2-8c63e07fd598 Download Help Link: https://learn.microsoft.com/powershell/module/az.authorization Help Version: 1.0.0.0 Locale: en-US diff --git a/src/Resources/MSGraph.Autorest/README.md b/src/Resources/MSGraph.Autorest/README.md index f877d294f20a..43d84bc54e60 100644 --- a/src/Resources/MSGraph.Autorest/README.md +++ b/src/Resources/MSGraph.Autorest/README.md @@ -49,7 +49,7 @@ In this directory, run AutoRest: ``` yaml version: "3.9.5" use-extension: - "@autorest/powershell": "4.0.0-dev.13" + "@autorest/powershell": "4.0.0-dev.14" require: - $(this-folder)/../../readme.azure.noprofile.md diff --git a/src/Resources/MSGraph.Autorest/build-module.ps1 b/src/Resources/MSGraph.Autorest/build-module.ps1 index 7d70510abf63..03b50a8634e4 100644 --- a/src/Resources/MSGraph.Autorest/build-module.ps1 +++ b/src/Resources/MSGraph.Autorest/build-module.ps1 @@ -181,5 +181,4 @@ if (-not $DisableAfterBuildTasks){ } } - Write-Host -ForegroundColor Green '-------------Done-------------' \ No newline at end of file diff --git a/src/Resources/MSGraph.Autorest/custom/New-AzADAppCredential.ps1 b/src/Resources/MSGraph.Autorest/custom/New-AzADAppCredential.ps1 index 4371c4e3acd9..c01fe7fce855 100644 --- a/src/Resources/MSGraph.Autorest/custom/New-AzADAppCredential.ps1 +++ b/src/Resources/MSGraph.Autorest/custom/New-AzADAppCredential.ps1 @@ -107,15 +107,15 @@ function New-AzADAppCredential { [System.DateTime] ${EndDate}, - [Parameter(ParameterSetName = 'ApplicationObjectIdWithCertValueParameterSet', HelpMessage = "Custom Key Identifier")] - [Parameter(ParameterSetName = 'ApplicationIdWithCertValueParameterSet', HelpMessage = "Custom Key Identifier")] - [Parameter(ParameterSetName = 'DisplayNameWithCertValueParameterSet', HelpMessage = "Custom Key Identifier")] - [Parameter(ParameterSetName = 'ApplicationObjectWithCertValueParameterSet', HelpMessage = "Custom Key Identifier")] - [Parameter(ParameterSetName = 'ApplicationObjectIdWithPasswordParameterSet', HelpMessage = "Custom Key Identifier")] - [Parameter(ParameterSetName = 'ApplicationIdWithPasswordParameterSet', HelpMessage = "Custom Key Identifier")] - [Parameter(ParameterSetName = 'DisplayNameWithPasswordParameterSet', HelpMessage = "Custom Key Identifier")] - [Parameter(ParameterSetName = 'ApplicationObjectWithPasswordParameterSet', HelpMessage = "Custom Key Identifier")] - [Parameter()] + [Parameter(ParameterSetName = 'ApplicationObjectIdWithCertValueParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")] + [Parameter(ParameterSetName = 'ApplicationIdWithCertValueParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")] + [Parameter(ParameterSetName = 'DisplayNameWithCertValueParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")] + [Parameter(ParameterSetName = 'ApplicationObjectWithCertValueParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")] + [Parameter(ParameterSetName = 'ApplicationObjectIdWithPasswordParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")] + [Parameter(ParameterSetName = 'ApplicationIdWithPasswordParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")] + [Parameter(ParameterSetName = 'DisplayNameWithPasswordParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")] + [Parameter(ParameterSetName = 'ApplicationObjectWithPasswordParameterSet', HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")] + [Parameter(HelpMessage = "Custom Key Identifier. The format should be base64: ```$Bytes=[System.Text.Encoding]::Unicode.GetBytes(`$key);`$key=[Convert]::ToBase64String(`$Bytes)``")] [Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Category('Body')] [System.String] ${CustomKeyIdentifier}, diff --git a/src/Resources/MSGraph.Autorest/exports/New-AzADAppCredential.ps1 b/src/Resources/MSGraph.Autorest/exports/New-AzADAppCredential.ps1 index c80de29977b9..99440a1d5343 100644 --- a/src/Resources/MSGraph.Autorest/exports/New-AzADAppCredential.ps1 +++ b/src/Resources/MSGraph.Autorest/exports/New-AzADAppCredential.ps1 @@ -356,6 +356,8 @@ param( [Parameter()] [Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Category('Body')] [System.String] + # Custom Key Identifier. + # The format should be base64: `$Bytes=[System.Text.Encoding]::Unicode.GetBytes($key);$key=[Convert]::ToBase64String($Bytes)` ${CustomKeyIdentifier}, [Parameter(ParameterSetName='ApplicationObjectIdWithPasswordCredentialParameterSet', Mandatory)] diff --git a/src/Resources/MSGraph.Autorest/exports/ProxyCmdletDefinitions.ps1 b/src/Resources/MSGraph.Autorest/exports/ProxyCmdletDefinitions.ps1 index d46bd64663f5..fd58bf86fd26 100644 --- a/src/Resources/MSGraph.Autorest/exports/ProxyCmdletDefinitions.ps1 +++ b/src/Resources/MSGraph.Autorest/exports/ProxyCmdletDefinitions.ps1 @@ -6257,6 +6257,8 @@ param( [Parameter()] [Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Category('Body')] [System.String] + # Custom Key Identifier. + # The format should be base64: `$Bytes=[System.Text.Encoding]::Unicode.GetBytes($key);$key=[Convert]::ToBase64String($Bytes)` ${CustomKeyIdentifier}, [Parameter(ParameterSetName='ApplicationObjectIdWithPasswordCredentialParameterSet', Mandatory)] diff --git a/src/Resources/MSGraph.Autorest/help/New-AzADAppCredential.md b/src/Resources/MSGraph.Autorest/help/New-AzADAppCredential.md index e3a0b2ff7b35..c03bd43c137c 100644 --- a/src/Resources/MSGraph.Autorest/help/New-AzADAppCredential.md +++ b/src/Resources/MSGraph.Autorest/help/New-AzADAppCredential.md @@ -193,7 +193,8 @@ Accept wildcard characters: False ``` ### -CustomKeyIdentifier - +Custom Key Identifier. +The format should be base64: `$Bytes=[System.Text.Encoding]::Unicode.GetBytes($key);$key=[Convert]::ToBase64String($Bytes)` ```yaml Type: System.String diff --git a/src/Resources/Policy.Autorest/build-module.ps1 b/src/Resources/Policy.Autorest/build-module.ps1 index 45c12ce52dcd..9dd7db846a5c 100644 --- a/src/Resources/Policy.Autorest/build-module.ps1 +++ b/src/Resources/Policy.Autorest/build-module.ps1 @@ -75,6 +75,8 @@ if(-not $NotIsolated -and -not $Debugger) { $binFolder = Join-Path $PSScriptRoot 'bin' $objFolder = Join-Path $PSScriptRoot 'obj' +$isAzure = [System.Convert]::ToBoolean('true') + if(-not $Debugger) { Write-Host -ForegroundColor Green 'Cleaning build folders...' $null = Remove-Item -Recurse -ErrorAction SilentlyContinue -Path $binFolder, $objFolder @@ -151,7 +153,7 @@ if($NoDocs) { $null = Get-ChildItem -Path $docsFolder -Recurse -Exclude 'README.md' | Remove-Item -Recurse -ErrorAction SilentlyContinue } $null = New-Item -ItemType Directory -Force -Path $docsFolder - $addComplexInterfaceInfo = ![System.Convert]::ToBoolean('true') + $addComplexInterfaceInfo = !$isAzure Export-ProxyCmdlet -ModuleName $moduleName -ModulePath $modulePaths -ExportsFolder $exportsFolder -InternalFolder $internalFolder -ModuleDescription $moduleDescription -DocsFolder $docsFolder -ExamplesFolder $examplesFolder -ModuleGuid $guid -AddComplexInterfaceInfo:$addComplexInterfaceInfo } @@ -186,5 +188,4 @@ if (-not $DisableAfterBuildTasks){ } } - -Write-Host -ForegroundColor Green '-------------Done-------------' +Write-Host -ForegroundColor Green '-------------Done-------------' \ No newline at end of file diff --git a/src/Resources/Resources/Az.Resources.psd1 b/src/Resources/Resources/Az.Resources.psd1 index 84b79ffb6903..02365ea72482 100644 --- a/src/Resources/Resources/Az.Resources.psd1 +++ b/src/Resources/Resources/Az.Resources.psd1 @@ -3,7 +3,7 @@ # # Generated by: Microsoft Corporation # -# Generated on: 9/27/2024 +# Generated on: 10/11/2024 # @{ diff --git a/src/Resources/Resources/help/New-AzADAppCredential.md b/src/Resources/Resources/help/New-AzADAppCredential.md index 9aa09049397b..c796796118d5 100644 --- a/src/Resources/Resources/help/New-AzADAppCredential.md +++ b/src/Resources/Resources/help/New-AzADAppCredential.md @@ -202,6 +202,8 @@ Accept wildcard characters: False ``` ### -CustomKeyIdentifier +Custom Key Identifier. +The format should be base64: `$Bytes=[System.Text.Encoding]::Unicode.GetBytes($key);$key=[Convert]::ToBase64String($Bytes)` ```yaml Type: System.String