From 4a2b97a966e3dc6e018fa5e22c6a190c977ffbf9 Mon Sep 17 00:00:00 2001 From: dingmeng-xue Date: Tue, 28 Jul 2020 11:29:11 +0800 Subject: [PATCH 1/2] Update changelog for upcoming release --- src/Accounts/Accounts/ChangeLog.md | 2 +- src/CognitiveServices/CognitiveServices/ChangeLog.md | 3 +-- src/HDInsight/HDInsight/ChangeLog.md | 4 ++-- src/OperationalInsights/OperationalInsights/ChangeLog.md | 2 +- src/RecoveryServices/RecoveryServices/ChangeLog.md | 2 +- src/Storage/Storage.Management/ChangeLog.md | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Accounts/Accounts/ChangeLog.md b/src/Accounts/Accounts/ChangeLog.md index 1f520a56c800..7c7ae77dbac8 100644 --- a/src/Accounts/Accounts/ChangeLog.md +++ b/src/Accounts/Accounts/ChangeLog.md @@ -20,7 +20,7 @@ ## Upcoming Release * Updated `Connect-AzAccount` to accept parameter `MaxContextPopulation` [#9865] * Updated SubscriptionClient version to 2019-06-01 and display tenant domains [#9838] -* Supported Multitenant +* Supported home tenant and managedBy tenant information of subscription * Corrected module name, version info in telemetry data * Adjusted SqlDatabaseDnsSuffix and ServiceManagementUrl if environment metadata endpoint returns incompatible value diff --git a/src/CognitiveServices/CognitiveServices/ChangeLog.md b/src/CognitiveServices/CognitiveServices/ChangeLog.md index ba71064dec61..dca18e711668 100644 --- a/src/CognitiveServices/CognitiveServices/ChangeLog.md +++ b/src/CognitiveServices/CognitiveServices/ChangeLog.md @@ -18,8 +18,7 @@ - Additional information about change #1 --> ## Upcoming Release - -* Specifically use "Deny" as NetworkRules default action. +* Used `Deny` specifically as NetworkRules default action. ## Version 1.5.0 * Supported displaying account capabilities. diff --git a/src/HDInsight/HDInsight/ChangeLog.md b/src/HDInsight/HDInsight/ChangeLog.md index cb6967584872..300c7782ad61 100644 --- a/src/HDInsight/HDInsight/ChangeLog.md +++ b/src/HDInsight/HDInsight/ChangeLog.md @@ -22,8 +22,8 @@ - Add new parameter `EncryptionInTransit` to the cmdlet `New-AzHDInsightCluster` - Add new parameter `EncryptionInTransit` to the cmdlet `New-AzHDInsightClusterConfig` * Supported creating cluster with private link feature: - - Add new parameter `PublicNetworkAccessType` and `OutboundPublicNetworkAccessType`to the cmdlet `New-AzHDInsightCluster` - - Add new parameter `PublicNetworkAccessType` and `OutboundPublicNetworkAccessType`to the cmdlet `New-AzHDInsightClusterConfig` + - Add new parameter `PublicNetworkAccessType` and `OutboundPublicNetworkAccessType` to the cmdlet `New-AzHDInsightCluster` + - Add new parameter `PublicNetworkAccessType` and `OutboundPublicNetworkAccessType` to the cmdlet `New-AzHDInsightClusterConfig` * Returned virtual network information when calling `New-AzHDInsightCluster` or `Get-AzHDInsightCluster` diff --git a/src/OperationalInsights/OperationalInsights/ChangeLog.md b/src/OperationalInsights/OperationalInsights/ChangeLog.md index 83b423e1282a..3b5c7db86a91 100644 --- a/src/OperationalInsights/OperationalInsights/ChangeLog.md +++ b/src/OperationalInsights/OperationalInsights/ChangeLog.md @@ -20,7 +20,7 @@ ## Upcoming Release ## Version 2.3.0 -* Added `-ForceDelete` option for `Remove-AzOperationalInsightsworkspace` +* Added `-ForceDelete` option for `Remove-AzOperationalInsightsWorkspace` * Added new cmdlet `Get-AzOperationalInsightsDeletedWorkspace` * Added new cmdlet `Restore-AzOperationalInsightsWorkspace` diff --git a/src/RecoveryServices/RecoveryServices/ChangeLog.md b/src/RecoveryServices/RecoveryServices/ChangeLog.md index d25e81da401a..6b1ddaba2c3a 100644 --- a/src/RecoveryServices/RecoveryServices/ChangeLog.md +++ b/src/RecoveryServices/RecoveryServices/ChangeLog.md @@ -18,7 +18,7 @@ - Additional information about change #1 --> ## Upcoming Release -* Improved the Azure Backup contaner/item discovery experience. +* Improved the Azure Backup container/item discovery experience. ## Version 2.11.0 * Removed project reference to Authentication diff --git a/src/Storage/Storage.Management/ChangeLog.md b/src/Storage/Storage.Management/ChangeLog.md index 5673b3181475..4f59f53a7585 100644 --- a/src/Storage/Storage.Management/ChangeLog.md +++ b/src/Storage/Storage.Management/ChangeLog.md @@ -21,9 +21,9 @@ * Supported create container/blob Sas token with new permission x,t - `New-AzStorageBlobSASToken` - `New-AzStorageContainerSASToken` -* support create account Sas token with new permission x,t,f +* Supported create account Sas token with new permission x,t,f - `New-AzStorageAccountSASToken` -* Support get single file share usage +* Supported get single file share usage - `Get-AzRmStorageShare` ## Version 2.3.0 From a068ee04efb13353df762497f0519791084a7972 Mon Sep 17 00:00:00 2001 From: dingmeng-xue Date: Tue, 28 Jul 2020 15:39:02 +0800 Subject: [PATCH 2/2] Update version and release scripts for DesktopVirtualization 2.0.0 --- .../Az.DesktopVirtualization.psd1 | 2 +- src/DesktopVirtualization/ChangeLog.md | 3 +++ .../Properties/AssemblyInfo.cs | 4 ++-- tools/ExpandModules.ps1 | 2 +- tools/PackModules.ps1 | 19 ++++++++++++++----- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/DesktopVirtualization/Az.DesktopVirtualization.psd1 b/src/DesktopVirtualization/Az.DesktopVirtualization.psd1 index bb788ad9191d..17c77a8a86ab 100644 --- a/src/DesktopVirtualization/Az.DesktopVirtualization.psd1 +++ b/src/DesktopVirtualization/Az.DesktopVirtualization.psd1 @@ -12,7 +12,7 @@ RootModule = './Az.DesktopVirtualization.psm1' # Version number of this module. -ModuleVersion = '1.0.0' +ModuleVersion = '2.0.0' # Supported PSEditions CompatiblePSEditions = 'Core', 'Desktop' diff --git a/src/DesktopVirtualization/ChangeLog.md b/src/DesktopVirtualization/ChangeLog.md index 6b366f0562ef..466607ee049d 100644 --- a/src/DesktopVirtualization/ChangeLog.md +++ b/src/DesktopVirtualization/ChangeLog.md @@ -18,6 +18,9 @@ - Additional information about change #1 --> ## Upcoming Release + + +## Version 2.0.0 * Require Location property for creating top level arm objects. * Made `ApplicationGroupType` required for `New-AzWvdApplicationGroup`. * Made `HostPoolArmPath` required for `New-AzWvdApplicationGroup`. diff --git a/src/DesktopVirtualization/Properties/AssemblyInfo.cs b/src/DesktopVirtualization/Properties/AssemblyInfo.cs index 8d00e8d0f74a..2bab8c893670 100644 --- a/src/DesktopVirtualization/Properties/AssemblyInfo.cs +++ b/src/DesktopVirtualization/Properties/AssemblyInfo.cs @@ -24,5 +24,5 @@ [assembly: ComVisible(false)] [assembly: CLSCompliant(false)] [assembly: Guid("5FAC4032-09B2-4E1D-A7CB-078DEA39CAF1")] -[assembly: AssemblyVersion("1.0.0")] -[assembly: AssemblyFileVersion("1.0.0")] +[assembly: AssemblyVersion("2.0.0")] +[assembly: AssemblyFileVersion("2.0.0")] diff --git a/tools/ExpandModules.ps1 b/tools/ExpandModules.ps1 index 953a624f94a6..7aad5ef448af 100644 --- a/tools/ExpandModules.ps1 +++ b/tools/ExpandModules.ps1 @@ -35,7 +35,7 @@ $tmp = Join-Path -Path (Get-Item $Artifacts).FullName -ChildPath "tmp" try { foreach ($artifact in (Get-ChildItem -Path $Artifacts -Filter "*.nupkg").FullName) { - $module_name = (((Get-Item -Path $artifact).Name) -split("\.([0-9])+"))[0] + $module_name = (Get-Item -Path $artifact).Name $zip_artifact = Join-Path -Path (Get-Item $Artifacts).FullName -ChildPath $module_name".zip" Write-Output "Renaming package $artifact to zip archive $zip_artifact" diff --git a/tools/PackModules.ps1 b/tools/PackModules.ps1 index d0f25155ba3f..e883fc6c2645 100644 --- a/tools/PackModules.ps1 +++ b/tools/PackModules.ps1 @@ -112,11 +112,20 @@ if (!(Test-Path -Path $tmp)) { try { foreach ($artifact in Get-ChildItem $tmp -Directory) { - $module_name = ($artifact).Name - Write-Output "Repackaging $module_name" - Update-NugetPackage -TempRepoPath (Get-Item $Artifacts).FullName -ModuleName $module_name -DirPath $tmp"\"$module_name -NugetExe $NugetExe - Write-Output "Removing $tmp\$module_name" - Remove-Item -Recurse $tmp"\"$module_name -Force -ErrorAction Stop + $artifactDir = ($artifact).Name + $tokens = $artifactDir.split(".") + if($tokens.length -gt 1) { + # Az.n.n.n.nuget or Az.module.n.n.n.nuget + if($tokens.length -gt 5) { + $module_name = $tokens[0]+"."+$tokens[1] + } else { + $module_name = $tokens[0] + } + } else { + $module_name = $artifactDir + } + Write-Output "Repackaging $module_name under $artifactDir" + Update-NugetPackage -TempRepoPath (Get-Item $Artifacts).FullName -ModuleName $module_name -DirPath $tmp"\"$artifactDir -NugetExe $NugetExe } } catch { $Errors = $_