AuthSamples 1.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980
  1. commit b81183aa181939a2c3b0cf236237a682475dbb08
  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 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 28507b93b36..3f610fcd27a 100644
  20. --- a/.travis.yml
  21. +++ b/.travis.yml
  22. @@ -16,7 +16,7 @@ os:
  23. osx_image: xcode8.2
  24. branches:
  25. only:
  26. - - dev
  27. + - master
  28. - /^release\/.*$/
  29. - /^(.*\/)?ci-.*$/
  30. before_install:
  31. diff --git a/korebuild.json b/korebuild.json
  32. index bd5d51a51b0..8a276a7f35d 100644
  33. --- a/korebuild.json
  34. +++ b/korebuild.json
  35. @@ -1,4 +1,4 @@
  36. {
  37. - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
  38. - "channel": "dev"
  39. + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
  40. + "channel": "master"
  41. }
  42. diff --git a/run.ps1 b/run.ps1
  43. index 3b273824681..34604c71758 100644
  44. --- a/run.ps1
  45. +++ b/run.ps1
  46. @@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
  47. Example config file:
  48. ```json
  49. {
  50. - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
  51. - "channel": "dev",
  52. + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
  53. + "channel": "master",
  54. "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
  55. }
  56. ```
  57. @@ -192,7 +192,7 @@ if (!$DotNetHome) {
  58. else { Join-Path $PSScriptRoot '.dotnet'}
  59. }
  60. -if (!$Channel) { $Channel = 'dev' }
  61. +if (!$Channel) { $Channel = 'master' }
  62. if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
  63. # Execute
  64. diff --git a/run.sh b/run.sh
  65. index 02aac158742..61f7a533855 100755
  66. --- a/run.sh
  67. +++ b/run.sh
  68. @@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then
  69. [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
  70. fi
  71. -[ -z "$channel" ] && channel='dev'
  72. +[ -z "$channel" ] && channel='master'
  73. [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
  74. get_korebuild