HttpSysServer 538 B

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136
  1. commit c4904acddadfc69a6da83e17ce771333de02dcab
  2. Author: Nate McMaster <[email protected]>
  3. Date: Wed Jan 31 15:01:11 2018 -0800
  4. Update dependencies.props to 2.1.0-preview-28193, build tools to 2.1.0-preview1-1010 [ci skip]
  5. Scripted changes:
  6. - updated travis and appveyor.yml files to only build dev, ci, and release branches
  7. - updated dependencies.props
  8. - updated korebuild-lock.txt
  9. - updated korebuild.json to release/2.1 channel
  10. diff --git a/.appveyor.yml b/.appveyor.yml
  11. index 46038786c91..4eea96ab69c 100644
  12. --- a/.appveyor.yml
  13. +++ b/.appveyor.yml
  14. @@ -1,18 +1,17 @@
  15. init:
  16. - - git config --global core.autocrlf true
  17. +- git config --global core.autocrlf true
  18. branches:
  19. only:
  20. - - master
  21. - - release
  22. - - dev
  23. - - /^(.*\/)?ci-.*$/
  24. + - dev
  25. + - /^release\/.*$/
  26. + - /^(.*\/)?ci-.*$/
  27. build_script:
  28. - - ps: .\run.ps1 default-build
  29. +- ps: .\run.ps1 default-build
  30. clone_depth: 1
  31. environment:
  32. global:
  33. DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  34. DOTNET_CLI_TELEMETRY_OPTOUT: 1
  35. -test: off
  36. -deploy: off
  37. +test: 'off'
  38. +deploy: 'off'
  39. os: Visual Studio 2017
  40. diff --git a/.travis.yml b/.travis.yml
  41. index b10be142157..64bdbb4441c 100644
  42. --- a/.travis.yml
  43. +++ b/.travis.yml
  44. @@ -3,24 +3,25 @@ sudo: false
  45. dist: trusty
  46. env:
  47. global:
  48. - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  49. - - DOTNET_CLI_TELEMETRY_OPTOUT: 1
  50. + - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  51. + - DOTNET_CLI_TELEMETRY_OPTOUT: 1
  52. mono: none
  53. os:
  54. - - linux
  55. - - osx
  56. +- linux
  57. +- osx
  58. osx_image: xcode8.2
  59. addons:
  60. apt:
  61. packages:
  62. - - libunwind8
  63. + - libunwind8
  64. branches:
  65. only:
  66. - - master
  67. - - release
  68. - - dev
  69. - - /^(.*\/)?ci-.*$/
  70. + - dev
  71. + - /^release\/.*$/
  72. + - /^(.*\/)?ci-.*$/
  73. before_install:
  74. - - 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
  75. +- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s
  76. + /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
  77. + /usr/local/lib/; fi
  78. script:
  79. - - ./build.sh
  80. +- ./build.sh
  81. diff --git a/build/dependencies.props b/build/dependencies.props
  82. index ae4dea95b88..14677c6e2e0 100644
  83. --- a/build/dependencies.props
  84. +++ b/build/dependencies.props
  85. @@ -3,18 +3,18 @@
  86. <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
  87. </PropertyGroup>
  88. <PropertyGroup Label="Package Versions">
  89. - <InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15679</InternalAspNetCoreSdkPackageVersion>
  90. - <MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
  91. - <MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreHostingPackageVersion>
  92. - <MicrosoftAspNetCoreTestingPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreTestingPackageVersion>
  93. - <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsLoggingConsolePackageVersion>
  94. + <InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-1010</InternalAspNetCoreSdkPackageVersion>
  95. + <MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
  96. + <MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreHostingPackageVersion>
  97. + <MicrosoftAspNetCoreTestingPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreTestingPackageVersion>
  98. + <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsLoggingConsolePackageVersion>
  99. <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
  100. - <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26115-03</MicrosoftNETCoreApp21PackageVersion>
  101. - <MicrosoftNetHttpHeadersPackageVersion>2.1.0-preview1-28153</MicrosoftNetHttpHeadersPackageVersion>
  102. + <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26122-01</MicrosoftNETCoreApp21PackageVersion>
  103. + <MicrosoftNetHttpHeadersPackageVersion>2.1.0-preview1-28193</MicrosoftNetHttpHeadersPackageVersion>
  104. <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
  105. - <MicrosoftWin32RegistryPackageVersion>4.5.0-preview1-26112-01</MicrosoftWin32RegistryPackageVersion>
  106. - <SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-preview1-26112-01</SystemNetHttpWinHttpHandlerPackageVersion>
  107. - <SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview1-26112-01</SystemSecurityPrincipalWindowsPackageVersion>
  108. + <MicrosoftWin32RegistryPackageVersion>4.5.0-preview1-26119-06</MicrosoftWin32RegistryPackageVersion>
  109. + <SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-preview1-26119-06</SystemNetHttpWinHttpHandlerPackageVersion>
  110. + <SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview1-26119-06</SystemSecurityPrincipalWindowsPackageVersion>
  111. <XunitPackageVersion>2.3.1</XunitPackageVersion>
  112. <XunitRunnerVisualStudioPackageVersion>2.3.1</XunitRunnerVisualStudioPackageVersion>
  113. </PropertyGroup>
  114. diff --git a/korebuild-lock.txt b/korebuild-lock.txt
  115. index a474bc0e356..851bfbf2034 100644
  116. --- a/korebuild-lock.txt
  117. +++ b/korebuild-lock.txt
  118. @@ -1,2 +1,2 @@
  119. -version:2.1.0-preview1-15679
  120. -commithash:5347461137cb45a77ddcc0b55b2478092de43338
  121. +version:2.1.0-preview1-1010
  122. +commithash:75ca924dfbd673c38841025b04c4dcd93b84f56d
  123. diff --git a/korebuild.json b/korebuild.json
  124. index bd5d51a51b0..678d8bb9483 100644
  125. --- a/korebuild.json
  126. +++ b/korebuild.json
  127. @@ -1,4 +1,4 @@
  128. {
  129. - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
  130. - "channel": "dev"
  131. + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
  132. + "channel": "release/2.1"
  133. }