JavaScriptServices 538 B

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136
  1. commit f35c814fc76b544b984a7520d79771c5c03a1b27
  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 10c59a68332..0d49a01d7f8 100755
  12. --- a/.appveyor.yml
  13. +++ b/.appveyor.yml
  14. @@ -1,21 +1,19 @@
  15. init:
  16. - - git config --global core.autocrlf true
  17. +- git config --global core.autocrlf true
  18. install:
  19. - - ps: Install-Product node 6.9.2 x64
  20. +- ps: Install-Product node 6.9.2 x64
  21. branches:
  22. only:
  23. - - master
  24. - - release
  25. - - dev
  26. - - /^(.*\/)?ci-.*$/
  27. - - /^rel\/.*/
  28. + - dev
  29. + - /^release\/.*$/
  30. + - /^(.*\/)?ci-.*$/
  31. build_script:
  32. - - ps: .\run.ps1 default-build
  33. +- ps: .\run.ps1 default-build
  34. clone_depth: 1
  35. environment:
  36. global:
  37. DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  38. DOTNET_CLI_TELEMETRY_OPTOUT: 1
  39. -test: off
  40. -deploy: off
  41. +test: 'off'
  42. +deploy: 'off'
  43. os: Visual Studio 2017
  44. diff --git a/.travis.yml b/.travis.yml
  45. index 33cfe66b9a9..7a388983f55 100755
  46. --- a/.travis.yml
  47. +++ b/.travis.yml
  48. @@ -12,8 +12,13 @@ addons:
  49. - zlib1g
  50. mono: none
  51. os:
  52. - - linux
  53. - - osx
  54. +- linux
  55. +- osx
  56. osx_image: xcode7.1
  57. script:
  58. - - ./build.sh
  59. +- ./build.sh
  60. +branches:
  61. + only:
  62. + - dev
  63. + - /^release\/.*$/
  64. + - /^(.*\/)?ci-.*$/
  65. diff --git a/build/dependencies.props b/build/dependencies.props
  66. index a889aab2c41..08bab6cef85 100644
  67. --- a/build/dependencies.props
  68. +++ b/build/dependencies.props
  69. @@ -3,25 +3,25 @@
  70. <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
  71. </PropertyGroup>
  72. <PropertyGroup Label="Package Versions">
  73. - <InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15679</InternalAspNetCoreSdkPackageVersion>
  74. - <MicrosoftAspNetCoreDiagnosticsPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreDiagnosticsPackageVersion>
  75. - <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
  76. - <MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreHostingPackageVersion>
  77. - <MicrosoftAspNetCoreMvcPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreMvcPackageVersion>
  78. - <MicrosoftAspNetCoreMvcTagHelpersPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
  79. - <MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
  80. - <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
  81. - <MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreServerKestrelPackageVersion>
  82. - <MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreStaticFilesPackageVersion>
  83. - <MicrosoftAspNetCoreWebSocketsPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreWebSocketsPackageVersion>
  84. - <MicrosoftExtensionsDependencyInjectionPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsDependencyInjectionPackageVersion>
  85. - <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
  86. - <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsLoggingConsolePackageVersion>
  87. - <MicrosoftExtensionsLoggingDebugPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsLoggingDebugPackageVersion>
  88. + <InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-1010</InternalAspNetCoreSdkPackageVersion>
  89. + <MicrosoftAspNetCoreDiagnosticsPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreDiagnosticsPackageVersion>
  90. + <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
  91. + <MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreHostingPackageVersion>
  92. + <MicrosoftAspNetCoreMvcPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreMvcPackageVersion>
  93. + <MicrosoftAspNetCoreMvcTagHelpersPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
  94. + <MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
  95. + <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
  96. + <MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreServerKestrelPackageVersion>
  97. + <MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreStaticFilesPackageVersion>
  98. + <MicrosoftAspNetCoreWebSocketsPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreWebSocketsPackageVersion>
  99. + <MicrosoftExtensionsDependencyInjectionPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsDependencyInjectionPackageVersion>
  100. + <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
  101. + <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsLoggingConsolePackageVersion>
  102. + <MicrosoftExtensionsLoggingDebugPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsLoggingDebugPackageVersion>
  103. <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
  104. - <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26115-03</MicrosoftNETCoreApp21PackageVersion>
  105. + <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26122-01</MicrosoftNETCoreApp21PackageVersion>
  106. <NewtonsoftJsonPackageVersion>10.0.1</NewtonsoftJsonPackageVersion>
  107. - <SystemThreadingTasksDataflowPackageVersion>4.9.0-preview1-26112-01</SystemThreadingTasksDataflowPackageVersion>
  108. + <SystemThreadingTasksDataflowPackageVersion>4.9.0-preview1-26119-06</SystemThreadingTasksDataflowPackageVersion>
  109. </PropertyGroup>
  110. <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
  111. </Project>
  112. diff --git a/korebuild-lock.txt b/korebuild-lock.txt
  113. index a474bc0e356..851bfbf2034 100644
  114. --- a/korebuild-lock.txt
  115. +++ b/korebuild-lock.txt
  116. @@ -1,2 +1,2 @@
  117. -version:2.1.0-preview1-15679
  118. -commithash:5347461137cb45a77ddcc0b55b2478092de43338
  119. +version:2.1.0-preview1-1010
  120. +commithash:75ca924dfbd673c38841025b04c4dcd93b84f56d
  121. diff --git a/korebuild.json b/korebuild.json
  122. index 147edd8750f..8f2792737fa 100644
  123. --- a/korebuild.json
  124. +++ b/korebuild.json
  125. @@ -1,6 +1,6 @@
  126. {
  127. - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
  128. - "channel": "dev",
  129. + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
  130. + "channel": "release/2.1",
  131. "toolsets": {
  132. "nodejs": {
  133. "required": true,