From 961bf7f272faa990b508ba22d6307b309d36efa8 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 23 Apr 2018 17:43:22 -0700 Subject: [PATCH] Merge branch release/2.1 into dev --- README.md | 8 +++-- build/SharedFx.props | 1 + build/SharedFx.targets | 3 ++ build/dependencies.props | 2 +- build/repo.props | 2 ++ build/sources.props | 1 + build/tools/templates/Archive/Archive.csproj | 1 + scripts/UpdateDependencies.ps1 | 33 ++++++++++++-------- scripts/common.psm1 | 2 +- 9 files changed, 36 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index ad20827e0b..ce53b3d0cc 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,7 @@ Microsoft.AspNetCore | [![][metapackage-myget-badge]][metapackage-m [debian-x64-deb]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-x64.deb [redhat-x64-rpm]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-x64.rpm [alpine.3.6-x64-tar]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-alpine.3.6-x64.tar.gz +[linux-musl-x64-tar]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-linux-musl-x64.tar.gz [badge-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-win-x64-version-badge.svg [win-x64-zip-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-win-x64.zip @@ -71,14 +72,17 @@ Microsoft.AspNetCore | [![][metapackage-myget-badge]][metapackage-m [debian-x64-deb-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-x64.deb [redhat-x64-rpm-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-x64.rpm [alpine.3.6-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-alpine.3.6-x64.tar.gz +[linux-arm-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-linux-arm.tar.gz +[linux-musl-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-linux-musl-x64.tar.gz Platform | Latest (dev branch)
![][badge-master] | release/2.1
![][badge-rel-21] :---------------------|:----------------------------------------------------------------|:------------------------------------------------------------------------- Windows (x64) | [Installer (exe)][win-x64-exe]
[Archive (zip)][win-x64-zip] | [Installer (exe)][win-x64-exe-rel-21]
[Archive (zip)][win-x64-zip-rel-21] Windows (x86) | [Installer (exe)][win-x86-exe]
[Archive (zip)][win-x86-zip] | [Installer (exe)][win-x86-exe-rel-21]
[Archive (zip)][win-x86-zip-rel-21] macOS (x64) | [Archive (tar.gz)][osx-x64-tar] | [Archive (tar.gz)][osx-x64-tar-rel-21] -Linux (x64) | [Archive (tar.gz)][linux-x64-tar] | [Archive (tar.gz)][linux-x64-tar-rel-21] -Linux (arm32) | [Archive (tar.gz)][linux-arm-tar] | (not available yet) +Linux (x64)
_(for glibc based OS - most common)_ | [Archive (tar.gz)][linux-x64-tar] | [Archive (tar.gz)][linux-x64-tar-rel-21] +Linux (x64 - musl)
_(for musl based OS, such as Alpine Linux)_ | [Archive (tar.gz)][linux-musl-x64-tar] | [Archive (tar.gz)][linux-musl-x64-tar-rel-21] +Linux (arm32) | [Archive (tar.gz)][linux-arm-tar] | [Archive (tar.gz)][linux-arm-tar-rel-21] Debian/Ubuntu (x64) | [Installer (deb)][debian-x64-deb] | [Installer (deb)][debian-x64-deb-rel-21] RedHat/Fedora (x64) | [Installer (rpm)][redhat-x64-rpm] | [Installer (rpm)][redhat-x64-rpm-rel-21] Alpine Linux 3.6 (x64)| [Archive (tar.gz)][alpine.3.6-x64-tar] | [Archive (tar.gz)][alpine.3.6-x64-tar-rel-21] diff --git a/build/SharedFx.props b/build/SharedFx.props index ab47b3f4b1..d1e27fba2c 100644 --- a/build/SharedFx.props +++ b/build/SharedFx.props @@ -58,6 +58,7 @@ + diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 0f2ae1fab4..3105f50ecc 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -137,6 +137,9 @@ $(SharedFxIntermediateOutputPath)shared\Microsoft.AspNetCore.All\$(PackageVersion)\ $(SharedFxRID) + + alpine.3.6-x64 + : %3B diff --git a/build/dependencies.props b/build/dependencies.props index b390bd3866..03731eefc6 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -106,7 +106,7 @@ 4.7.49 1.7.3.4 1.6.1 - 2.0.2 + 2.0.3 1.0.1 11.0.2 12.2.1100 diff --git a/build/repo.props b/build/repo.props index 9e2f4b7571..d65dc3a215 100644 --- a/build/repo.props +++ b/build/repo.props @@ -24,6 +24,7 @@ + @@ -33,6 +34,7 @@ + diff --git a/build/sources.props b/build/sources.props index 2d011505a3..f874dc53b7 100644 --- a/build/sources.props +++ b/build/sources.props @@ -9,6 +9,7 @@ $(RestoreSources); + https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; https://api.nuget.org/v3/index.json; diff --git a/build/tools/templates/Archive/Archive.csproj b/build/tools/templates/Archive/Archive.csproj index 3d3d608b31..3699f0e4bc 100644 --- a/build/tools/templates/Archive/Archive.csproj +++ b/build/tools/templates/Archive/Archive.csproj @@ -7,6 +7,7 @@ false netcoreapp2.1 $(RestoreSources);$(DotNetRestoreSources); + true diff --git a/scripts/UpdateDependencies.ps1 b/scripts/UpdateDependencies.ps1 index fa733f24bb..7146693e5b 100755 --- a/scripts/UpdateDependencies.ps1 +++ b/scripts/UpdateDependencies.ps1 @@ -9,7 +9,10 @@ param( $BuildXml, [switch] $NoCommit, - [string[]]$ConfigVars = @() + [string]$GithubUpstreamBranch, + [string]$GithubEmail, + [string]$GithubUsername, + [string]$GithubToken ) $ErrorActionPreference = 'Stop' @@ -18,11 +21,7 @@ Set-StrictMode -Version 1 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 if (-not $NoCommit) { - $GitHubEmail = $ConfigVars["GithubEmail"] - $GitHubUsername = $ConfigVars["GithubUsername"] - $GitHubPassword = $ConfigVars["GithubToken"] - - Set-GitHubInfo $GitHubPassword $GitHubUsername $GitHubEmail + Set-GitHubInfo $GithubToken $GithubUsername $GithubEmail } $depsPath = Resolve-Path "$PSScriptRoot/../build/dependencies.props" @@ -56,15 +55,23 @@ foreach ($package in $remoteDeps.SelectNodes('//Package')) { } } -$updatedVars = UpdateVersions $variables $dependencies $depsPath -if (-not $NoCommit) { - $body = CommitUpdatedVersions $updatedVars $dependencies $depsPath - $destinationBranch = "dotnetbot/UpdateDeps" +$currentBranch = Invoke-Block { & git rev-parse --abbrev-ref HEAD } - $baseBranch = $ConfigVars["GithubUpstreamBranch"] +$destinationBranch = "dotnetbot/UpdateDeps" +Invoke-Block { & git checkout -tb $destinationBranch "origin/$GithubUpstreamBranch" } - if ($body) { - CreatePR $baseBranch $destinationBranch $body $GitHubPassword +try { + $updatedVars = UpdateVersions $variables $dependencies $depsPath + + if (-not $NoCommit) { + $body = CommitUpdatedVersions $updatedVars $dependencies $depsPath + + if ($body) { + CreatePR $GithubUpstreamBranch $destinationBranch $body $GithubToken + } } } +finally { + Invoke-Block { & git checkout $currentBranch } +} diff --git a/scripts/common.psm1 b/scripts/common.psm1 index b621d48193..c2d2e2a8ca 100644 --- a/scripts/common.psm1 +++ b/scripts/common.psm1 @@ -205,7 +205,7 @@ function UpdateVersions([hashtable]$variables, [xml]$dependencies, [string]$deps } if ($updatedVars.Count -gt 0) { - Write-Host -f Cyan "Updating $count version variables in $depsPath" + Write-Host -f Cyan "Updating version variables in $depsPath" SaveXml $dependencies $depsPath } else {