From 84126a1d4129f0d6a0cd6370c0dbb72b563fe271 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Tue, 17 May 2022 17:47:53 -0700 Subject: [PATCH 1/3] Update script to automatically take new preview pre-release builds --- DotnetRuntimeMetadata.json | 6 +++--- tools/UpdateDotnetRuntime.ps1 | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json index 34f1b8f8db2..308c57cf662 100644 --- a/DotnetRuntimeMetadata.json +++ b/DotnetRuntimeMetadata.json @@ -1,11 +1,11 @@ { "sdk": { "channel": "7.0.1xx-preview4", - "quality": "signed", - "qualityFallback": "daily", + "quality": "daily", + "qualityFallback": "preview", "packageVersionPattern": "7.0.0-preview.4", "sdkImageVersion": "7.0.100", - "nextChannel": "7.0.1xx-preview4", + "nextChannel": "7.0.1xx", "azureFeed": "", "sdkImageOverride": "" }, diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1 index 520e2398457..ce951265d6a 100644 --- a/tools/UpdateDotnetRuntime.ps1 +++ b/tools/UpdateDotnetRuntime.ps1 @@ -254,6 +254,25 @@ function Update-DevContainer { $devContainerDocker | Out-File -FilePath $dockerFilePath -Force } +<# + .DESCRIPTION Update the DotnetMetadata.json file with the latest version of the SDK + #> +function Update-DotnetRuntimeMetadataChannel { + param ( + [string] $newSdk + ) + + # -replace uses regex so we are splitting on "." + $sdkParts = $newSdk -split '\.' + $newChannel = $sdkParts[0] + "." + $sdkParts[1] + "." + ($sdkParts[2] -replace '0','x') + $sdkParts[3] + + Write-Verbose -Verbose -Message "Updating DotnetRuntimeMetadata.json with channel $newChannel" + + $metadata = Get-Content -Raw "$PSScriptRoot/../DotnetRuntimeMetadata.json" | ConvertFrom-Json + $metadata.sdk.channel = $newChannel + $metadata | ConvertTo-Json | Out-File -FilePath "$PSScriptRoot/../DotnetRuntimeMetadata.json" -Force +} + $dotnetMetadataPath = "$PSScriptRoot/../DotnetRuntimeMetadata.json" $dotnetMetadataJson = Get-Content $dotnetMetadataPath -Raw | ConvertFrom-Json $channel = $dotnetMetadataJson.sdk.channel @@ -364,6 +383,8 @@ if ($dotnetUpdate.ShouldUpdate) { } Update-DevContainer + + Update-DotnetRuntimeMetadataChannel -newSdk $latestSdkVersion } else { Write-Verbose -Verbose -Message $dotnetUpdate.Message From cf55ce081146666a560cb8b237769825dcf0bc0e Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Wed, 18 May 2022 10:33:44 -0700 Subject: [PATCH 2/3] Address CR comments --- tools/UpdateDotnetRuntime.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1 index ce951265d6a..903bbd467c1 100644 --- a/tools/UpdateDotnetRuntime.ps1 +++ b/tools/UpdateDotnetRuntime.ps1 @@ -262,8 +262,10 @@ function Update-DotnetRuntimeMetadataChannel { [string] $newSdk ) - # -replace uses regex so we are splitting on "." + # -replace uses regex so we are splitting on "." and not on "\.". "\" is escaped in the regex. $sdkParts = $newSdk -split '\.' + + # 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" From b392c66114664124f79726faf5674d2ecfb7b950 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Wed, 18 May 2022 13:07:26 -0700 Subject: [PATCH 3/3] Update tools/UpdateDotnetRuntime.ps1 Co-authored-by: Dongbo Wang --- tools/UpdateDotnetRuntime.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1 index 903bbd467c1..39bfa1ff014 100644 --- a/tools/UpdateDotnetRuntime.ps1 +++ b/tools/UpdateDotnetRuntime.ps1 @@ -262,7 +262,7 @@ function Update-DotnetRuntimeMetadataChannel { [string] $newSdk ) - # -replace uses regex so we are splitting on "." and not on "\.". "\" is escaped in the regex. + # -replace uses regex so in order to split on `.`, we need to use `\.` to escape the dot character. $sdkParts = $newSdk -split '\.' # Transform SDK Version '7.0.100-preview.5.22263.22' -> '7.0.1xx-preview5'