From 1c1256406e0b576bd3ee9b282f75dc76f6cbaac6 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 28 Jun 2018 15:51:15 -0700 Subject: [PATCH] Update README, config, and scripts to use release/2.2 (#1232) --- .gitmodules | 96 ++++++++++++++-------------- README.md | 34 ++++++---- korebuild.json | 4 +- scripts/UpdateDependenciesCoreFx.ps1 | 3 +- version.props | 3 +- 5 files changed, 75 insertions(+), 65 deletions(-) diff --git a/.gitmodules b/.gitmodules index aa7c843b31..d9a6f15f15 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,192 +1,192 @@ [submodule "modules/AADIntegration"] path = modules/AADIntegration url = https://github.com/aspnet/AADIntegration.git - branch = dev + branch = release/2.2 [submodule "modules/Antiforgery"] path = modules/Antiforgery url = https://github.com/aspnet/Antiforgery.git - branch = dev + branch = release/2.2 [submodule "modules/AuthSamples"] path = modules/AuthSamples url = https://github.com/aspnet/AuthSamples.git - branch = dev + branch = release/2.2 [submodule "modules/AzureIntegration"] path = modules/AzureIntegration url = https://github.com/aspnet/AzureIntegration.git - branch = dev + branch = release/2.2 [submodule "modules/BasicMiddleware"] path = modules/BasicMiddleware url = https://github.com/aspnet/BasicMiddleware.git - branch = dev + branch = release/2.2 [submodule "modules/BrowserLink"] path = modules/BrowserLink url = https://github.com/aspnet/BrowserLink.git - branch = dev + branch = release/2.2 [submodule "modules/Caching"] path = modules/Caching url = https://github.com/aspnet/Caching.git - branch = dev + branch = release/2.2 [submodule "modules/Common"] path = modules/Common url = https://github.com/aspnet/Common.git - branch = dev + branch = release/2.2 [submodule "modules/Configuration"] path = modules/Configuration url = https://github.com/aspnet/Configuration.git - branch = dev + branch = release/2.2 [submodule "modules/CORS"] path = modules/CORS url = https://github.com/aspnet/CORS.git - branch = dev + branch = release/2.2 [submodule "modules/DataProtection"] path = modules/DataProtection url = https://github.com/aspnet/DataProtection.git - branch = dev + branch = release/2.2 [submodule "modules/DependencyInjection"] path = modules/DependencyInjection url = https://github.com/aspnet/DependencyInjection.git - branch = dev + branch = release/2.2 [submodule "modules/Diagnostics"] path = modules/Diagnostics url = https://github.com/aspnet/Diagnostics.git - branch = dev + branch = release/2.2 [submodule "modules/DotNetTools"] path = modules/DotNetTools url = https://github.com/aspnet/DotNetTools.git - branch = dev + branch = release/2.2 [submodule "modules/EntityFrameworkCore"] path = modules/EntityFrameworkCore url = https://github.com/aspnet/EntityFrameworkCore.git - branch = dev + branch = release/2.2 [submodule "modules/EventNotification"] path = modules/EventNotification url = https://github.com/aspnet/EventNotification.git - branch = dev + branch = release/2.2 [submodule "modules/FileSystem"] path = modules/FileSystem url = https://github.com/aspnet/FileSystem.git - branch = dev + branch = release/2.2 [submodule "modules/Hosting"] path = modules/Hosting url = https://github.com/aspnet/Hosting.git - branch = dev + branch = release/2.2 [submodule "modules/HtmlAbstractions"] path = modules/HtmlAbstractions url = https://github.com/aspnet/HtmlAbstractions.git - branch = dev + branch = release/2.2 [submodule "modules/HttpAbstractions"] path = modules/HttpAbstractions url = https://github.com/aspnet/HttpAbstractions.git - branch = dev + branch = release/2.2 [submodule "modules/HttpClientFactory"] path = modules/HttpClientFactory url = https://github.com/aspnet/HttpClientFactory.git - branch = dev + branch = release/2.2 [submodule "modules/HttpSysServer"] path = modules/HttpSysServer url = https://github.com/aspnet/HttpSysServer.git - branch = dev + branch = release/2.2 [submodule "modules/Identity"] path = modules/Identity url = https://github.com/aspnet/Identity.git - branch = dev + branch = release/2.2 [submodule "modules/IISIntegration"] path = modules/IISIntegration url = https://github.com/aspnet/IISIntegration.git - branch = dev + branch = release/2.2 [submodule "modules/JavaScriptServices"] path = modules/JavaScriptServices url = https://github.com/aspnet/JavaScriptServices.git - branch = dev + branch = release/2.2 [submodule "modules/JsonPatch"] path = modules/JsonPatch url = https://github.com/aspnet/JsonPatch.git - branch = dev + branch = release/2.2 [submodule "modules/KestrelHttpServer"] path = modules/KestrelHttpServer url = https://github.com/aspnet/KestrelHttpServer.git - branch = dev + branch = release/2.2 [submodule "modules/Localization"] path = modules/Localization url = https://github.com/aspnet/Localization.git - branch = dev + branch = release/2.2 [submodule "modules/Logging"] path = modules/Logging url = https://github.com/aspnet/Logging.git - branch = dev + branch = release/2.2 [submodule "modules/MetaPackages"] path = modules/MetaPackages url = https://github.com/aspnet/MetaPackages.git - branch = dev + branch = release/2.2 [submodule "modules/Microsoft.Data.Sqlite"] path = modules/Microsoft.Data.Sqlite url = https://github.com/aspnet/Microsoft.Data.Sqlite.git - branch = dev + branch = release/2.2 [submodule "modules/MusicStore"] path = modules/MusicStore url = https://github.com/aspnet/MusicStore.git - branch = dev + branch = release/2.2 [submodule "modules/Mvc"] path = modules/Mvc url = https://github.com/aspnet/Mvc.git - branch = dev + branch = release/2.2 [submodule "modules/MvcPrecompilation"] path = modules/MvcPrecompilation url = https://github.com/aspnet/MvcPrecompilation.git - branch = dev + branch = release/2.2 [submodule "modules/Options"] path = modules/Options url = https://github.com/aspnet/Options.git - branch = dev + branch = release/2.2 [submodule "modules/Proxy"] path = modules/Proxy url = https://github.com/aspnet/Proxy.git - branch = dev + branch = release/2.2 [submodule "modules/Razor"] path = modules/Razor url = https://github.com/aspnet/Razor.git - branch = dev + branch = release/2.2 [submodule "modules/ResponseCaching"] path = modules/ResponseCaching url = https://github.com/aspnet/ResponseCaching.git - branch = dev + branch = release/2.2 [submodule "modules/Routing"] path = modules/Routing url = https://github.com/aspnet/Routing.git - branch = dev + branch = release/2.2 [submodule "modules/Scaffolding"] path = modules/Scaffolding url = https://github.com/aspnet/Scaffolding.git - branch = dev + branch = release/2.2 [submodule "modules/Security"] path = modules/Security url = https://github.com/aspnet/Security.git - branch = dev + branch = release/2.2 [submodule "modules/ServerTests"] path = modules/ServerTests url = https://github.com/aspnet/ServerTests.git - branch = dev + branch = release/2.2 [submodule "modules/Session"] path = modules/Session url = https://github.com/aspnet/Session.git - branch = dev + branch = release/2.2 [submodule "modules/SignalR"] path = modules/SignalR url = https://github.com/aspnet/SignalR.git - branch = dev + branch = release/2.2 [submodule "modules/StaticFiles"] path = modules/StaticFiles url = https://github.com/aspnet/StaticFiles.git - branch = dev + branch = release/2.2 [submodule "modules/Templating"] path = modules/Templating url = https://github.com/aspnet/Templating.git - branch = dev + branch = release/2.2 [submodule "modules/WebSockets"] path = modules/WebSockets url = https://github.com/aspnet/WebSockets.git - branch = dev + branch = release/2.2 [submodule "modules/WebHooks"] path = modules/WebHooks url = https://github.com/aspnet/WebHooks.git - branch = dev + branch = release/2.2 diff --git a/README.md b/README.md index 6d6ac157c6..fd97fb2440 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,18 @@ Microsoft.AspNetCore | [![][metapackage-myget-badge]][metapackage-m [redhat-x64-rpm]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-x64.rpm [linux-musl-x64-tar]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-linux-musl-x64.tar.gz +[badge-rel-22]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.2/aspnetcore-runtime-win-x64-version-badge.svg +[win-x64-zip-rel-22]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.2/aspnetcore-runtime-latest-win-x64.zip +[win-x64-exe-rel-22]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.2/aspnetcore-runtime-latest-win-x64.exe +[win-x86-zip-rel-22]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.2/aspnetcore-runtime-latest-win-x86.zip +[win-x86-exe-rel-22]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.2/aspnetcore-runtime-latest-win-x86.exe +[linux-x64-tar-rel-22]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.2/aspnetcore-runtime-latest-linux-x64.tar.gz +[osx-x64-tar-rel-22]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.2/aspnetcore-runtime-latest-osx-x64.tar.gz +[debian-x64-deb-rel-22]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.2/aspnetcore-runtime-latest-x64.deb +[redhat-x64-rpm-rel-22]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.2/aspnetcore-runtime-latest-x64.rpm +[linux-arm-tar-rel-22]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.2/aspnetcore-runtime-latest-linux-arm.tar.gz +[linux-musl-x64-tar-rel-22]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.2/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 [win-x64-exe-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-win-x64.exe @@ -73,17 +85,17 @@ Microsoft.AspNetCore | [![][metapackage-myget-badge]][metapackage-m [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] -:---------------------|:----------------------------------------------------------------|:------------------------------------------------------------------------- -Channel name1 | `master` | `release/2.1` -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)
_(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] +Platform | Latest (dev branch)
![][badge-master] | release/2.2
![][badge-rel-22] | release/2.1
![][badge-rel-21] +:---------------------|:----------------------------------------------------------------|:------------------------------------------------------------------------- |:------------------------------------------------------------------------- +Channel name1 | `master` | `release/2.2` | `release/2.1` +Windows (x64) | [Installer (exe)][win-x64-exe]
[Archive (zip)][win-x64-zip] | [Installer (exe)][win-x64-exe-rel-22]
[Archive (zip)][win-x64-zip-rel-22] | [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-22]
[Archive (zip)][win-x86-zip-rel-22] | [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-22] | [Archive (tar.gz)][osx-x64-tar-rel-21] +Linux (x64)
_(for glibc based OS - most common)_ | [Archive (tar.gz)][linux-x64-tar] | [Archive (tar.gz)][linux-x64-tar-rel-22] | [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-22] | [Archive (tar.gz)][linux-musl-x64-tar-rel-21] +Linux (arm32) | [Archive (tar.gz)][linux-arm-tar] | [Archive (tar.gz)][linux-arm-tar-rel-22] | [Archive (tar.gz)][linux-arm-tar-rel-21] +Debian/Ubuntu (x64) | [Installer (deb)][debian-x64-deb] | [Installer (deb)][debian-x64-deb-rel-22] | [Installer (deb)][debian-x64-deb-rel-21] +RedHat/Fedora (x64) | [Installer (rpm)][redhat-x64-rpm] | [Installer (rpm)][redhat-x64-rpm-rel-22] | [Installer (rpm)][redhat-x64-rpm-rel-21] > 1 For use with the `-Channel` argument in [dotnet-install.ps1/sh](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script). diff --git a/korebuild.json b/korebuild.json index a7d496a8ad..1cfd76c544 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,6 +1,6 @@ { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev", + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json", + "channel": "release/2.2", "toolsets": { "nodejs": { "minVersion": "8.0", diff --git a/scripts/UpdateDependenciesCoreFx.ps1 b/scripts/UpdateDependenciesCoreFx.ps1 index 3a46af7cb0..4bb9be2333 100644 --- a/scripts/UpdateDependenciesCoreFx.ps1 +++ b/scripts/UpdateDependenciesCoreFx.ps1 @@ -6,7 +6,6 @@ param( [string]$GithubUsername, [string]$GithubToken ) -# This script only works against dev/master at the moment because only master prod-con builds allow you to access their results before the entire chain is finished. $ErrorActionPreference = 'Stop' Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1" @@ -108,7 +107,7 @@ Write-Host "Loading deps from $depsPath" [xml] $dependencies = LoadXml $depsPath if (-not $NoCommit) { - $baseBranch = "dev" + $baseBranch = "release/2.2" Invoke-Block { & git fetch origin } $currentBranch = Invoke-Block { & git rev-parse --abbrev-ref HEAD } diff --git a/version.props b/version.props index ea205d06ca..b2e7e63c8d 100644 --- a/version.props +++ b/version.props @@ -31,8 +31,7 @@ $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final $(ExperimentalVersionSuffix)-$(BuildNumber) - - master + release/2.2