Localization 1.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121
  1. commit dc1592b63d155151ff0bd54baee43cc185ca4f7d
  2. Author: Nate McMaster (automated) <[email protected]>
  3. Date: Mon Jul 2 12:40:27 2018 -0700
  4. [automated] Change default branch to master
  5. diff --git a/.appveyor.yml b/.appveyor.yml
  6. index 4eea96ab69c..d45bd5a1f80 100644
  7. --- a/.appveyor.yml
  8. +++ b/.appveyor.yml
  9. @@ -2,7 +2,7 @@ init:
  10. - git config --global core.autocrlf true
  11. branches:
  12. only:
  13. - - dev
  14. + - master
  15. - /^release\/.*$/
  16. - /^(.*\/)?ci-.*$/
  17. build_script:
  18. diff --git a/.travis.yml b/.travis.yml
  19. index 64bdbb4441c..ab3980055c0 100644
  20. --- a/.travis.yml
  21. +++ b/.travis.yml
  22. @@ -16,7 +16,7 @@ addons:
  23. - libunwind8
  24. branches:
  25. only:
  26. - - dev
  27. + - master
  28. - /^release\/.*$/
  29. - /^(.*\/)?ci-.*$/
  30. before_install:
  31. diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml
  32. index d7ceb763786..c2c5336fd0f 100644
  33. --- a/.vsts-pipelines/builds/ci-internal.yml
  34. +++ b/.vsts-pipelines/builds/ci-internal.yml
  35. @@ -1,5 +1,5 @@
  36. trigger:
  37. -- dev
  38. +- master
  39. - release/*
  40. resources:
  41. @@ -7,7 +7,7 @@ resources:
  42. - repository: buildtools
  43. type: git
  44. name: aspnet-BuildTools
  45. - ref: refs/heads/dev
  46. + ref: refs/heads/master
  47. phases:
  48. - template: .vsts-pipelines/templates/project-ci.yml@buildtools
  49. diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml
  50. index b7f25723f8b..507c89b0250 100644
  51. --- a/.vsts-pipelines/builds/ci-public.yml
  52. +++ b/.vsts-pipelines/builds/ci-public.yml
  53. @@ -1,5 +1,5 @@
  54. trigger:
  55. -- dev
  56. +- master
  57. - release/*
  58. # See https://github.com/aspnet/BuildTools
  59. @@ -9,7 +9,7 @@ resources:
  60. type: github
  61. endpoint: DotNet-Bot GitHub Connection
  62. name: aspnet/BuildTools
  63. - ref: refs/heads/dev
  64. -
  65. + ref: refs/heads/master
  66. +
  67. phases:
  68. - template: .vsts-pipelines/templates/project-ci.yml@buildtools
  69. diff --git a/korebuild.json b/korebuild.json
  70. index bd5d51a51b0..8a276a7f35d 100644
  71. --- a/korebuild.json
  72. +++ b/korebuild.json
  73. @@ -1,4 +1,4 @@
  74. {
  75. - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
  76. - "channel": "dev"
  77. + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
  78. + "channel": "master"
  79. }
  80. diff --git a/run.ps1 b/run.ps1
  81. index 3b273824681..34604c71758 100644
  82. --- a/run.ps1
  83. +++ b/run.ps1
  84. @@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
  85. Example config file:
  86. ```json
  87. {
  88. - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
  89. - "channel": "dev",
  90. + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
  91. + "channel": "master",
  92. "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
  93. }
  94. ```
  95. @@ -192,7 +192,7 @@ if (!$DotNetHome) {
  96. else { Join-Path $PSScriptRoot '.dotnet'}
  97. }
  98. -if (!$Channel) { $Channel = 'dev' }
  99. +if (!$Channel) { $Channel = 'master' }
  100. if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
  101. # Execute
  102. diff --git a/run.sh b/run.sh
  103. index 02aac158742..61f7a533855 100755
  104. --- a/run.sh
  105. +++ b/run.sh
  106. @@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then
  107. [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
  108. fi
  109. -[ -z "$channel" ] && channel='dev'
  110. +[ -z "$channel" ] && channel='master'
  111. [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
  112. get_korebuild