Преглед изворни кода

Change default branch to master

Nate McMaster пре 7 година
родитељ
комит
a21d455b51
8 измењених фајлова са 54 додато и 56 уклоњено
  1. 0 1
      .appveyor.yml
  2. 48 48
      .gitmodules
  3. 0 1
      .travis.yml
  4. 1 1
      README.md
  5. 1 1
      korebuild.json
  6. 1 1
      run.ps1
  7. 2 2
      scripts/UpdateDependenciesCoreFx.ps1
  8. 1 1
      scripts/update_travis_appveyor_yml.py

+ 0 - 1
.appveyor.yml

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

+ 48 - 48
.gitmodules

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

+ 0 - 1
.travis.yml

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

+ 1 - 1
README.md

@@ -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-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`
 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]

+ 1 - 1
korebuild.json

@@ -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",
   "toolsets": {
     "nodejs": {

+ 1 - 1
run.ps1

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

+ 2 - 2
scripts/UpdateDependenciesCoreFx.ps1

@@ -6,7 +6,7 @@ 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.
+# 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'
 Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1"
@@ -108,7 +108,7 @@ Write-Host "Loading deps from $depsPath"
 [xml] $dependencies = LoadXml $depsPath
 
 if (-not $NoCommit) {
-    $baseBranch = "dev"
+    $baseBranch = "master"
     Invoke-Block { & git fetch origin }
 
     $currentBranch = Invoke-Block { & git rev-parse --abbrev-ref HEAD }

+ 1 - 1
scripts/update_travis_appveyor_yml.py

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