AzureIntegration 1.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166
  1. commit 03b42ccbe83eedaa0a98913aef66785a266480d0
  2. Author: Nate McMaster (automated) <[email protected]>
  3. Date: Mon Jul 2 12:40:11 2018 -0700
  4. [automated] Change default branch to master
  5. diff --git a/.appveyor.yml b/.appveyor.yml
  6. index 46038786c91..d45bd5a1f80 100644
  7. --- a/.appveyor.yml
  8. +++ b/.appveyor.yml
  9. @@ -1,18 +1,17 @@
  10. init:
  11. - - git config --global core.autocrlf true
  12. +- git config --global core.autocrlf true
  13. branches:
  14. only:
  15. - - master
  16. - - release
  17. - - dev
  18. - - /^(.*\/)?ci-.*$/
  19. + - master
  20. + - /^release\/.*$/
  21. + - /^(.*\/)?ci-.*$/
  22. build_script:
  23. - - ps: .\run.ps1 default-build
  24. +- ps: .\run.ps1 default-build
  25. clone_depth: 1
  26. environment:
  27. global:
  28. DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  29. DOTNET_CLI_TELEMETRY_OPTOUT: 1
  30. -test: off
  31. -deploy: off
  32. +test: 'off'
  33. +deploy: 'off'
  34. os: Visual Studio 2017
  35. diff --git a/.travis.yml b/.travis.yml
  36. index b10be142157..ab3980055c0 100644
  37. --- a/.travis.yml
  38. +++ b/.travis.yml
  39. @@ -3,24 +3,25 @@ sudo: false
  40. dist: trusty
  41. env:
  42. global:
  43. - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  44. - - DOTNET_CLI_TELEMETRY_OPTOUT: 1
  45. + - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  46. + - DOTNET_CLI_TELEMETRY_OPTOUT: 1
  47. mono: none
  48. os:
  49. - - linux
  50. - - osx
  51. +- linux
  52. +- osx
  53. osx_image: xcode8.2
  54. addons:
  55. apt:
  56. packages:
  57. - - libunwind8
  58. + - libunwind8
  59. branches:
  60. only:
  61. - - master
  62. - - release
  63. - - dev
  64. - - /^(.*\/)?ci-.*$/
  65. + - master
  66. + - /^release\/.*$/
  67. + - /^(.*\/)?ci-.*$/
  68. before_install:
  69. - - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
  70. +- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s
  71. + /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib
  72. + /usr/local/lib/; fi
  73. script:
  74. - - ./build.sh
  75. +- ./build.sh
  76. diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml
  77. index d7ceb763786..c2c5336fd0f 100644
  78. --- a/.vsts-pipelines/builds/ci-internal.yml
  79. +++ b/.vsts-pipelines/builds/ci-internal.yml
  80. @@ -1,5 +1,5 @@
  81. trigger:
  82. -- dev
  83. +- master
  84. - release/*
  85. resources:
  86. @@ -7,7 +7,7 @@ resources:
  87. - repository: buildtools
  88. type: git
  89. name: aspnet-BuildTools
  90. - ref: refs/heads/dev
  91. + ref: refs/heads/master
  92. phases:
  93. - template: .vsts-pipelines/templates/project-ci.yml@buildtools
  94. diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml
  95. index b7f25723f8b..507c89b0250 100644
  96. --- a/.vsts-pipelines/builds/ci-public.yml
  97. +++ b/.vsts-pipelines/builds/ci-public.yml
  98. @@ -1,5 +1,5 @@
  99. trigger:
  100. -- dev
  101. +- master
  102. - release/*
  103. # See https://github.com/aspnet/BuildTools
  104. @@ -9,7 +9,7 @@ resources:
  105. type: github
  106. endpoint: DotNet-Bot GitHub Connection
  107. name: aspnet/BuildTools
  108. - ref: refs/heads/dev
  109. -
  110. + ref: refs/heads/master
  111. +
  112. phases:
  113. - template: .vsts-pipelines/templates/project-ci.yml@buildtools
  114. diff --git a/korebuild.json b/korebuild.json
  115. index bd5d51a51b0..8a276a7f35d 100644
  116. --- a/korebuild.json
  117. +++ b/korebuild.json
  118. @@ -1,4 +1,4 @@
  119. {
  120. - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
  121. - "channel": "dev"
  122. + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
  123. + "channel": "master"
  124. }
  125. diff --git a/run.ps1 b/run.ps1
  126. index 3b273824681..34604c71758 100644
  127. --- a/run.ps1
  128. +++ b/run.ps1
  129. @@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
  130. Example config file:
  131. ```json
  132. {
  133. - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
  134. - "channel": "dev",
  135. + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
  136. + "channel": "master",
  137. "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
  138. }
  139. ```
  140. @@ -192,7 +192,7 @@ if (!$DotNetHome) {
  141. else { Join-Path $PSScriptRoot '.dotnet'}
  142. }
  143. -if (!$Channel) { $Channel = 'dev' }
  144. +if (!$Channel) { $Channel = 'master' }
  145. if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
  146. # Execute
  147. diff --git a/run.sh b/run.sh
  148. index 02aac158742..61f7a533855 100755
  149. --- a/run.sh
  150. +++ b/run.sh
  151. @@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then
  152. [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
  153. fi
  154. -[ -z "$channel" ] && channel='dev'
  155. +[ -z "$channel" ] && channel='master'
  156. [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
  157. get_korebuild