Skip to content

Update script to use .NET 6 build resources #14705

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
rjmholt merged 7 commits into from
Feb 5, 2021
Merged

Update script to use .NET 6 build resources #14705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ccaa967
Update script to use .NET 6 build resources
adityapatwardhan Feb 4, 2021
382c4c8
Update tools/UpdateDotnetRuntime.ps1
adityapatwardhan Feb 5, 2021
ee6cee9
Update tools/UpdateDotnetRuntime.ps1
adityapatwardhan Feb 5, 2021
c9acca4
Update tools/UpdateDotnetRuntime.ps1
adityapatwardhan Feb 5, 2021
61fc986
Update tools/UpdateDotnetRuntime.ps1
adityapatwardhan Feb 5, 2021
c5afcaf
Update tools/UpdateDotnetRuntime.ps1
adityapatwardhan Feb 5, 2021
d5b3cd1
Address feedback
adityapatwardhan Feb 5, 2021
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: 7 additions & 4 deletions DotnetRuntimeMetadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"sdk": {
"channel": "release/5.0.1xx",
"packageVersionPattern": "5.0.0",
"sdkImageVersion": "5.0.100",
"nextChannel": "net5/rc2"
"channel": "release/6.0.1xx-preview1",
"packageVersionPattern": "6.0.0-preview.1",
"sdkImageVersion": "6.0.100",
"nextChannel": "net6/preview1"
},
"internalfeed" : {
"url": null
}
}
2 changes: 1 addition & 1 deletion nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v2" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<disabledPackageSources>
Expand Down
62 changes: 32 additions & 30 deletions tools/UpdateDotnetRuntime.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ param (
[switch]$InteractiveAuth,

[Parameter()]
[switch]$UseRTMFeed
[switch]$UseInternalFeed
)

<#
Expand Down Expand Up @@ -68,6 +68,7 @@ function Update-PackageVersion {
"Microsoft.Management.Infrastructure"
"Microsoft.PowerShell.Native"
"Microsoft.NETCore.Windows.ApiSets"
"Microsoft.PowerShell.MarkdownRender"
)

$packages = [System.Collections.Generic.Dictionary[[string], [PkgVer[]] ]]::new()
Expand Down Expand Up @@ -97,21 +98,22 @@ function Update-PackageVersion {

$versionPattern = (Get-Content "$PSScriptRoot/../DotnetRuntimeMetadata.json" | ConvertFrom-Json).sdk.packageVersionPattern

$source = if ($UseNuGetOrg) { 'nuget.org' } elseif ($UseRTMFeed) { 'dotnet5-rtm' } else { 'dotnet5' }
$source = if ($UseNuGetOrg) { 'nuget.org' } elseif ($UseInternalFeed) { 'dotnet-internal' } else { 'dotnet' }

# Always add nuget.org as some packages are only found there.
$source = if ($source -ne 'nuget.org') {
@($source, "nuget.org")
}

$packages.GetEnumerator() | ForEach-Object {
$pkgs = Find-Package -Name $_.Key -AllVersions -AllowPrereleaseVersions -Source $source

foreach ($v in $_.Value) {
$version = $v.Version

foreach ($p in $pkgs) {
if ($UseRTMFeed -and $p.Version -eq $versionPattern) {
if ([System.Management.Automation.SemanticVersion] ($version) -lt [System.Management.Automation.SemanticVersion] ($p.Version)) {
$v.NewVersion = $p.Version
break
}
}
elseif ($p.Version -like "$versionPattern*") {
# some packages are directly updated on nuget.org so need to check that too.
if ($p.Version -like "$versionPattern*" -or $p.Source -eq 'nuget.org') {
if ([System.Management.Automation.SemanticVersion] ($version) -lt [System.Management.Automation.SemanticVersion] ($p.Version)) {
$v.NewVersion = $p.Version
break
Expand Down Expand Up @@ -152,17 +154,21 @@ function Update-CsprojFile([string] $path, $values) {
}

function Get-DotnetUpdate {
$dotnetMetadataPath = "$PSScriptRoot/../DotnetRuntimeMetadata.json"
$metataJson = (Get-Content $dotnetMetadataPath -Raw | ConvertFrom-Json)
$nextChannel = $metataJson.sdk.nextChannel
$feedUrl = $metataJson.internalfeed.url

if ($SDKVersionOverride) {
return @{
ShouldUpdate = $true
NewVersion = $SDKVersionOverride
Message = $null
FeedUrl = $feedUrl
}
}

try {
$dotnetMetadataPath = "$PSScriptRoot/../DotnetRuntimeMetadata.json"
$nextChannel = (Get-Content $dotnetMetadataPath -Raw | ConvertFrom-Json).sdk.nextChannel
$latestSDKversion = [System.Management.Automation.SemanticVersion] (Invoke-RestMethod -Uri "http://aka.ms/dotnet/$nextChannel/Sdk/productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() })
$currentVersion = [System.Management.Automation.SemanticVersion] (( Get-Content -Path "$PSScriptRoot/../global.json" -Raw | ConvertFrom-Json).sdk.version)

Expand All @@ -184,6 +190,7 @@ function Get-DotnetUpdate {
ShouldUpdate = $shouldUpdate
NewVersion = $newVersion
Message = $Message
FeedUrl = $feedUrl
}
}

Expand All @@ -210,32 +217,27 @@ if ($dotnetUpdate.ShouldUpdate) {

Find-Dotnet

$feedname = if ($UseRTMFeed) {
'dotnet5-rtm'
} elseif ($UseNuGetOrg) {
'dotnet5'
} else {
'dotnet-internal'
}
$feedname = if ($UseNuGetOrg) { 'nuget.org' } elseif ($UseInternalFeed) { 'dotnet-internal' } else { 'dotnet' }

$addDotnet5Source = (-not (Get-PackageSource -Name $feedname -ErrorAction SilentlyContinue))
$addDotnetSource = (-not (Get-PackageSource -Name $feedname -ErrorAction SilentlyContinue))

if (!$UseNuGetOrg -and ($addDotnet5Source -or $addDotnet5InternalSource)) {
$nugetFileSources = ([xml](Get-Content .\nuget.config -Raw)).Configuration.packagesources.add
if (!$UseNuGetOrg -and $addDotnetSource) {
$nugetFileContent = Get-Content "$PSScriptRoot/../nuget.config" -Raw
$nugetFileSources = ([xml]($nugetFileContent)).Configuration.packagesources.add

if ($addDotnet5Source -and $feedname -ne 'dotnet-internal') {
$dotnet5Feed = $nugetFileSources | Where-Object { $_.Key -eq $feedname } | Select-Object -ExpandProperty Value
Register-PackageSource -Name $feedname -Location $dotnet5Feed -ProviderName NuGet
if ($feedname -ne 'dotnet-internal') {
$dotnetFeed = $nugetFileSources | Where-Object { $_.Key -eq $feedname } | Select-Object -ExpandProperty Value
Register-PackageSource -Name $feedname -Location $dotnetFeed -ProviderName NuGet
Write-Verbose -Message "Register new package source $feedname" -verbose
}

if ($addDotnet5Source -and $InteractiveAuth -and $feedname -eq 'dotnet-internal') {
if ($feedname -eq 'dotnet-internal') {
# This NuGet feed is for internal to Microsoft use only.
$dotnet5InternalFeed = 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
$updatedNugetFile = (Get-Content .\nuget.config -Raw) -replace "</packageSources>", " <add key=`"dotnet5-internal`" value=`"$dotnet5InternalFeed`" />`r`n </packageSources>"
$updatedNugetFile | Out-File .\nuget.config -Force
Register-PackageSource -Name 'dotnet5-internal' -Location $dotnet5InternalFeed -ProviderName NuGet
Write-Verbose -Message "Register new package source 'dotnet5-internal'" -verbose
$dotnetInternalFeed = $dotnetMetadataJson.internalfeed.url
$updatedNugetFile = $nugetFileContent -replace "</packageSources>", " <add key=`"dotnet-internal`" value=`"$dotnetInternalFeed`" />`r`n </packageSources>"
$updatedNugetFile | Out-File "$PSScriptRoot/../nuget.config" -Force
Register-PackageSource -Name 'dotnet-internal' -Location $dotnetInternalFeed -ProviderName NuGet
Write-Verbose -Message "Register new package source 'dotnet-internal'" -verbose
}
}

Expand Down