From 03a6a7352dd7f93ee88cb0a0ef94b75c70900b0c Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Thu, 26 May 2022 17:36:12 -0700 Subject: [PATCH] Update script to pin to .NET 7 preview 5 version --- DotnetRuntimeMetadata.json | 6 +++--- tools/UpdateDotnetRuntime.ps1 | 13 +++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json index 308c57cf662..e1db727ce6e 100644 --- a/DotnetRuntimeMetadata.json +++ b/DotnetRuntimeMetadata.json @@ -1,11 +1,11 @@ { "sdk": { - "channel": "7.0.1xx-preview4", + "channel": "7.0.1xx-preview5", "quality": "daily", "qualityFallback": "preview", - "packageVersionPattern": "7.0.0-preview.4", + "packageVersionPattern": "7.0.0-preview.5", "sdkImageVersion": "7.0.100", - "nextChannel": "7.0.1xx", + "nextChannel": "7.0.1xx-preview5", "azureFeed": "", "sdkImageOverride": "" }, diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1 index 39bfa1ff014..a6e6ca613b9 100644 --- a/tools/UpdateDotnetRuntime.ps1 +++ b/tools/UpdateDotnetRuntime.ps1 @@ -227,6 +227,7 @@ function Get-DotnetUpdate { } else { $shouldUpdate = $false $newVersion = $latestSDKVersionString + $Message = $null -eq $currentVersion.PreReleaseLabel ? "$latestSDKversion is not preview, update manually." : "No update needed." } } catch { @@ -257,7 +258,7 @@ function Update-DevContainer { <# .DESCRIPTION Update the DotnetMetadata.json file with the latest version of the SDK #> -function Update-DotnetRuntimeMetadataChannel { +function Update-DotnetRuntimeMetadata { param ( [string] $newSdk ) @@ -267,11 +268,15 @@ function Update-DotnetRuntimeMetadataChannel { # Transform SDK Version '7.0.100-preview.5.22263.22' -> '7.0.1xx-preview5' $newChannel = $sdkParts[0] + "." + $sdkParts[1] + "." + ($sdkParts[2] -replace '0','x') + $sdkParts[3] - Write-Verbose -Verbose -Message "Updating DotnetRuntimeMetadata.json with channel $newChannel" + # Transform SDK Version '7.0.100-preview.5.22263.22' -> '7.0.100-preview.5' + $newPackageVersionPattern = $sdkParts[0] + "." + $sdkParts[1] + "." + '0-' + ($sdkParts[2] -split '-')[-1] + "." + $sdkParts[3] + Write-Verbose -Verbose -Message "Updating DotnetRuntimeMetadata.json with package filter $newPackageVersionPattern" + $metadata = Get-Content -Raw "$PSScriptRoot/../DotnetRuntimeMetadata.json" | ConvertFrom-Json $metadata.sdk.channel = $newChannel + $metadata.sdk.packageVersionPattern = $newPackageVersionPattern $metadata | ConvertTo-Json | Out-File -FilePath "$PSScriptRoot/../DotnetRuntimeMetadata.json" -Force } @@ -355,6 +360,8 @@ if ($dotnetUpdate.ShouldUpdate) { Write-Verbose -Message "Updating global.json completed." -Verbose + Update-DotnetRuntimeMetadata -newSdk $latestSdkVersion + Update-PackageVersion Write-Verbose -Message "Updating project files completed." -Verbose @@ -385,8 +392,6 @@ if ($dotnetUpdate.ShouldUpdate) { } Update-DevContainer - - Update-DotnetRuntimeMetadataChannel -newSdk $latestSdkVersion } else { Write-Verbose -Verbose -Message $dotnetUpdate.Message