Change default branch to master

This commit is contained in:
Nate McMaster 2018-07-02 11:50:02 -07:00
parent 159740d106
commit a21d455b51
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
8 changed files with 54 additions and 56 deletions

View File

@ -4,7 +4,6 @@ branches:
only: only:
- master - master
- /^release\/.*/ - /^release\/.*/
- dev
- /^(.*\/)?ci-.*$/ - /^(.*\/)?ci-.*$/
install: install:
- git submodule update --init --recursive - git submodule update --init --recursive

96
.gitmodules vendored
View File

@ -1,192 +1,192 @@
[submodule "modules/AADIntegration"] [submodule "modules/AADIntegration"]
path = modules/AADIntegration path = modules/AADIntegration
url = https://github.com/aspnet/AADIntegration.git url = https://github.com/aspnet/AADIntegration.git
branch = dev branch = master
[submodule "modules/Antiforgery"] [submodule "modules/Antiforgery"]
path = modules/Antiforgery path = modules/Antiforgery
url = https://github.com/aspnet/Antiforgery.git url = https://github.com/aspnet/Antiforgery.git
branch = dev branch = master
[submodule "modules/AuthSamples"] [submodule "modules/AuthSamples"]
path = modules/AuthSamples path = modules/AuthSamples
url = https://github.com/aspnet/AuthSamples.git url = https://github.com/aspnet/AuthSamples.git
branch = dev branch = master
[submodule "modules/AzureIntegration"] [submodule "modules/AzureIntegration"]
path = modules/AzureIntegration path = modules/AzureIntegration
url = https://github.com/aspnet/AzureIntegration.git url = https://github.com/aspnet/AzureIntegration.git
branch = dev branch = master
[submodule "modules/BasicMiddleware"] [submodule "modules/BasicMiddleware"]
path = modules/BasicMiddleware path = modules/BasicMiddleware
url = https://github.com/aspnet/BasicMiddleware.git url = https://github.com/aspnet/BasicMiddleware.git
branch = dev branch = master
[submodule "modules/BrowserLink"] [submodule "modules/BrowserLink"]
path = modules/BrowserLink path = modules/BrowserLink
url = https://github.com/aspnet/BrowserLink.git url = https://github.com/aspnet/BrowserLink.git
branch = dev branch = master
[submodule "modules/Caching"] [submodule "modules/Caching"]
path = modules/Caching path = modules/Caching
url = https://github.com/aspnet/Caching.git url = https://github.com/aspnet/Caching.git
branch = dev branch = master
[submodule "modules/Common"] [submodule "modules/Common"]
path = modules/Common path = modules/Common
url = https://github.com/aspnet/Common.git url = https://github.com/aspnet/Common.git
branch = dev branch = master
[submodule "modules/Configuration"] [submodule "modules/Configuration"]
path = modules/Configuration path = modules/Configuration
url = https://github.com/aspnet/Configuration.git url = https://github.com/aspnet/Configuration.git
branch = dev branch = master
[submodule "modules/CORS"] [submodule "modules/CORS"]
path = modules/CORS path = modules/CORS
url = https://github.com/aspnet/CORS.git url = https://github.com/aspnet/CORS.git
branch = dev branch = master
[submodule "modules/DataProtection"] [submodule "modules/DataProtection"]
path = modules/DataProtection path = modules/DataProtection
url = https://github.com/aspnet/DataProtection.git url = https://github.com/aspnet/DataProtection.git
branch = dev branch = master
[submodule "modules/DependencyInjection"] [submodule "modules/DependencyInjection"]
path = modules/DependencyInjection path = modules/DependencyInjection
url = https://github.com/aspnet/DependencyInjection.git url = https://github.com/aspnet/DependencyInjection.git
branch = dev branch = master
[submodule "modules/Diagnostics"] [submodule "modules/Diagnostics"]
path = modules/Diagnostics path = modules/Diagnostics
url = https://github.com/aspnet/Diagnostics.git url = https://github.com/aspnet/Diagnostics.git
branch = dev branch = master
[submodule "modules/DotNetTools"] [submodule "modules/DotNetTools"]
path = modules/DotNetTools path = modules/DotNetTools
url = https://github.com/aspnet/DotNetTools.git url = https://github.com/aspnet/DotNetTools.git
branch = dev branch = master
[submodule "modules/EntityFrameworkCore"] [submodule "modules/EntityFrameworkCore"]
path = modules/EntityFrameworkCore path = modules/EntityFrameworkCore
url = https://github.com/aspnet/EntityFrameworkCore.git url = https://github.com/aspnet/EntityFrameworkCore.git
branch = dev branch = master
[submodule "modules/EventNotification"] [submodule "modules/EventNotification"]
path = modules/EventNotification path = modules/EventNotification
url = https://github.com/aspnet/EventNotification.git url = https://github.com/aspnet/EventNotification.git
branch = dev branch = master
[submodule "modules/FileSystem"] [submodule "modules/FileSystem"]
path = modules/FileSystem path = modules/FileSystem
url = https://github.com/aspnet/FileSystem.git url = https://github.com/aspnet/FileSystem.git
branch = dev branch = master
[submodule "modules/Hosting"] [submodule "modules/Hosting"]
path = modules/Hosting path = modules/Hosting
url = https://github.com/aspnet/Hosting.git url = https://github.com/aspnet/Hosting.git
branch = dev branch = master
[submodule "modules/HtmlAbstractions"] [submodule "modules/HtmlAbstractions"]
path = modules/HtmlAbstractions path = modules/HtmlAbstractions
url = https://github.com/aspnet/HtmlAbstractions.git url = https://github.com/aspnet/HtmlAbstractions.git
branch = dev branch = master
[submodule "modules/HttpAbstractions"] [submodule "modules/HttpAbstractions"]
path = modules/HttpAbstractions path = modules/HttpAbstractions
url = https://github.com/aspnet/HttpAbstractions.git url = https://github.com/aspnet/HttpAbstractions.git
branch = dev branch = master
[submodule "modules/HttpClientFactory"] [submodule "modules/HttpClientFactory"]
path = modules/HttpClientFactory path = modules/HttpClientFactory
url = https://github.com/aspnet/HttpClientFactory.git url = https://github.com/aspnet/HttpClientFactory.git
branch = dev branch = master
[submodule "modules/HttpSysServer"] [submodule "modules/HttpSysServer"]
path = modules/HttpSysServer path = modules/HttpSysServer
url = https://github.com/aspnet/HttpSysServer.git url = https://github.com/aspnet/HttpSysServer.git
branch = dev branch = master
[submodule "modules/Identity"] [submodule "modules/Identity"]
path = modules/Identity path = modules/Identity
url = https://github.com/aspnet/Identity.git url = https://github.com/aspnet/Identity.git
branch = dev branch = master
[submodule "modules/IISIntegration"] [submodule "modules/IISIntegration"]
path = modules/IISIntegration path = modules/IISIntegration
url = https://github.com/aspnet/IISIntegration.git url = https://github.com/aspnet/IISIntegration.git
branch = dev branch = master
[submodule "modules/JavaScriptServices"] [submodule "modules/JavaScriptServices"]
path = modules/JavaScriptServices path = modules/JavaScriptServices
url = https://github.com/aspnet/JavaScriptServices.git url = https://github.com/aspnet/JavaScriptServices.git
branch = dev branch = master
[submodule "modules/JsonPatch"] [submodule "modules/JsonPatch"]
path = modules/JsonPatch path = modules/JsonPatch
url = https://github.com/aspnet/JsonPatch.git url = https://github.com/aspnet/JsonPatch.git
branch = dev branch = master
[submodule "modules/KestrelHttpServer"] [submodule "modules/KestrelHttpServer"]
path = modules/KestrelHttpServer path = modules/KestrelHttpServer
url = https://github.com/aspnet/KestrelHttpServer.git url = https://github.com/aspnet/KestrelHttpServer.git
branch = dev branch = master
[submodule "modules/Localization"] [submodule "modules/Localization"]
path = modules/Localization path = modules/Localization
url = https://github.com/aspnet/Localization.git url = https://github.com/aspnet/Localization.git
branch = dev branch = master
[submodule "modules/Logging"] [submodule "modules/Logging"]
path = modules/Logging path = modules/Logging
url = https://github.com/aspnet/Logging.git url = https://github.com/aspnet/Logging.git
branch = dev branch = master
[submodule "modules/MetaPackages"] [submodule "modules/MetaPackages"]
path = modules/MetaPackages path = modules/MetaPackages
url = https://github.com/aspnet/MetaPackages.git url = https://github.com/aspnet/MetaPackages.git
branch = dev branch = master
[submodule "modules/Microsoft.Data.Sqlite"] [submodule "modules/Microsoft.Data.Sqlite"]
path = modules/Microsoft.Data.Sqlite path = modules/Microsoft.Data.Sqlite
url = https://github.com/aspnet/Microsoft.Data.Sqlite.git url = https://github.com/aspnet/Microsoft.Data.Sqlite.git
branch = dev branch = master
[submodule "modules/MusicStore"] [submodule "modules/MusicStore"]
path = modules/MusicStore path = modules/MusicStore
url = https://github.com/aspnet/MusicStore.git url = https://github.com/aspnet/MusicStore.git
branch = dev branch = master
[submodule "modules/Mvc"] [submodule "modules/Mvc"]
path = modules/Mvc path = modules/Mvc
url = https://github.com/aspnet/Mvc.git url = https://github.com/aspnet/Mvc.git
branch = dev branch = master
[submodule "modules/MvcPrecompilation"] [submodule "modules/MvcPrecompilation"]
path = modules/MvcPrecompilation path = modules/MvcPrecompilation
url = https://github.com/aspnet/MvcPrecompilation.git url = https://github.com/aspnet/MvcPrecompilation.git
branch = dev branch = master
[submodule "modules/Options"] [submodule "modules/Options"]
path = modules/Options path = modules/Options
url = https://github.com/aspnet/Options.git url = https://github.com/aspnet/Options.git
branch = dev branch = master
[submodule "modules/Proxy"] [submodule "modules/Proxy"]
path = modules/Proxy path = modules/Proxy
url = https://github.com/aspnet/Proxy.git url = https://github.com/aspnet/Proxy.git
branch = dev branch = master
[submodule "modules/Razor"] [submodule "modules/Razor"]
path = modules/Razor path = modules/Razor
url = https://github.com/aspnet/Razor.git url = https://github.com/aspnet/Razor.git
branch = dev branch = master
[submodule "modules/ResponseCaching"] [submodule "modules/ResponseCaching"]
path = modules/ResponseCaching path = modules/ResponseCaching
url = https://github.com/aspnet/ResponseCaching.git url = https://github.com/aspnet/ResponseCaching.git
branch = dev branch = master
[submodule "modules/Routing"] [submodule "modules/Routing"]
path = modules/Routing path = modules/Routing
url = https://github.com/aspnet/Routing.git url = https://github.com/aspnet/Routing.git
branch = dev branch = master
[submodule "modules/Scaffolding"] [submodule "modules/Scaffolding"]
path = modules/Scaffolding path = modules/Scaffolding
url = https://github.com/aspnet/Scaffolding.git url = https://github.com/aspnet/Scaffolding.git
branch = dev branch = master
[submodule "modules/Security"] [submodule "modules/Security"]
path = modules/Security path = modules/Security
url = https://github.com/aspnet/Security.git url = https://github.com/aspnet/Security.git
branch = dev branch = master
[submodule "modules/ServerTests"] [submodule "modules/ServerTests"]
path = modules/ServerTests path = modules/ServerTests
url = https://github.com/aspnet/ServerTests.git url = https://github.com/aspnet/ServerTests.git
branch = dev branch = master
[submodule "modules/Session"] [submodule "modules/Session"]
path = modules/Session path = modules/Session
url = https://github.com/aspnet/Session.git url = https://github.com/aspnet/Session.git
branch = dev branch = master
[submodule "modules/SignalR"] [submodule "modules/SignalR"]
path = modules/SignalR path = modules/SignalR
url = https://github.com/aspnet/SignalR.git url = https://github.com/aspnet/SignalR.git
branch = dev branch = master
[submodule "modules/StaticFiles"] [submodule "modules/StaticFiles"]
path = modules/StaticFiles path = modules/StaticFiles
url = https://github.com/aspnet/StaticFiles.git url = https://github.com/aspnet/StaticFiles.git
branch = dev branch = master
[submodule "modules/Templating"] [submodule "modules/Templating"]
path = modules/Templating path = modules/Templating
url = https://github.com/aspnet/Templating.git url = https://github.com/aspnet/Templating.git
branch = dev branch = master
[submodule "modules/WebSockets"] [submodule "modules/WebSockets"]
path = modules/WebSockets path = modules/WebSockets
url = https://github.com/aspnet/WebSockets.git url = https://github.com/aspnet/WebSockets.git
branch = dev branch = master
[submodule "modules/WebHooks"] [submodule "modules/WebHooks"]
path = modules/WebHooks path = modules/WebHooks
url = https://github.com/aspnet/WebHooks.git url = https://github.com/aspnet/WebHooks.git
branch = dev branch = master

View File

@ -14,7 +14,6 @@ branches:
only: only:
- master - master
- /^release\/.*/ - /^release\/.*/
- dev
- /^(.*\/)?ci-.*$/ - /^(.*\/)?ci-.*$/
script: script:
- ./build.sh -t:CheckUniverse - ./build.sh -t:CheckUniverse

View File

@ -73,7 +73,7 @@ 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-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 [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) <br> ![][badge-master] | release/2.1 <br> ![][badge-rel-21] Platform | Latest (master branch) <br> ![][badge-master] | release/2.1 <br> ![][badge-rel-21]
:---------------------|:----------------------------------------------------------------|:------------------------------------------------------------------------- :---------------------|:----------------------------------------------------------------|:-------------------------------------------------------------------------
Channel name<sup>1</sup> | `master` | `release/2.1` Channel name<sup>1</sup> | `master` | `release/2.1`
Windows (x64) | [Installer (exe)][win-x64-exe]<br>[Archive (zip)][win-x64-zip] | [Installer (exe)][win-x64-exe-rel-21]<br>[Archive (zip)][win-x64-zip-rel-21] Windows (x64) | [Installer (exe)][win-x64-exe]<br>[Archive (zip)][win-x64-zip] | [Installer (exe)][win-x64-exe-rel-21]<br>[Archive (zip)][win-x64-zip-rel-21]

View File

@ -1,5 +1,5 @@
{ {
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
"channel": "master", "channel": "master",
"toolsets": { "toolsets": {
"nodejs": { "nodejs": {

View File

@ -206,7 +206,7 @@ if (!$DotNetHome) {
else { Join-Path $PSScriptRoot '.dotnet'} else { Join-Path $PSScriptRoot '.dotnet'}
} }
if (!$Channel) { $Channel = 'dev' } if (!$Channel) { $Channel = 'master' }
if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
if ($PackageVersionPropsUrl) { if ($PackageVersionPropsUrl) {

View File

@ -6,7 +6,7 @@ param(
[string]$GithubUsername, [string]$GithubUsername,
[string]$GithubToken [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. # This script only works against master at the moment because only master prod-con builds allow you to access their results before the entire chain is finished.
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1" Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1"
@ -108,7 +108,7 @@ Write-Host "Loading deps from $depsPath"
[xml] $dependencies = LoadXml $depsPath [xml] $dependencies = LoadXml $depsPath
if (-not $NoCommit) { if (-not $NoCommit) {
$baseBranch = "dev" $baseBranch = "master"
Invoke-Block { & git fetch origin } Invoke-Block { & git fetch origin }
$currentBranch = Invoke-Block { & git rev-parse --abbrev-ref HEAD } $currentBranch = Invoke-Block { & git rev-parse --abbrev-ref HEAD }

View File

@ -93,7 +93,7 @@ def transform_yaml_doc(document):
if not 'branches' in document: if not 'branches' in document:
document['branches'] = {} document['branches'] = {}
document['branches']['only'] = [ document['branches']['only'] = [
'dev', '/^release\/.*$/', '/^(.*\/)?ci-.*$/'] 'master', '/^release\/.*$/', '/^(.*\/)?ci-.*$/']
return document return document
update(".travis.yml", transform_yaml_doc) update(".travis.yml", transform_yaml_doc)