DataProtection 538 B

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160
  1. commit 232329866788d50eb349ac3ce460f3bd292965ad
  2. Author: Nate McMaster <[email protected]>
  3. Date: Wed Jan 31 15:01:10 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 e6fa444db37..4eea96ab69c 100644
  12. --- a/.appveyor.yml
  13. +++ b/.appveyor.yml
  14. @@ -1,19 +1,17 @@
  15. -init:
  16. - - git config --global core.autocrlf true
  17. +init:
  18. +- git config --global core.autocrlf true
  19. branches:
  20. only:
  21. - - master
  22. - - release
  23. - - dev
  24. - - /^(.*\/)?ci-.*$/
  25. - - /^rel\/.*/
  26. + - dev
  27. + - /^release\/.*$/
  28. + - /^(.*\/)?ci-.*$/
  29. build_script:
  30. - - ps: .\run.ps1 default-build
  31. +- ps: .\run.ps1 default-build
  32. clone_depth: 1
  33. environment:
  34. global:
  35. DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  36. DOTNET_CLI_TELEMETRY_OPTOUT: 1
  37. -test: off
  38. -deploy: off
  39. +test: 'off'
  40. +deploy: 'off'
  41. os: Visual Studio 2017
  42. diff --git a/.travis.yml b/.travis.yml
  43. index 6c59666f3a7..64bdbb4441c 100644
  44. --- a/.travis.yml
  45. +++ b/.travis.yml
  46. @@ -3,25 +3,25 @@ sudo: false
  47. dist: trusty
  48. env:
  49. global:
  50. - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  51. - - DOTNET_CLI_TELEMETRY_OPTOUT: 1
  52. + - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  53. + - DOTNET_CLI_TELEMETRY_OPTOUT: 1
  54. mono: none
  55. os:
  56. - - linux
  57. - - osx
  58. +- linux
  59. +- osx
  60. osx_image: xcode8.2
  61. addons:
  62. apt:
  63. packages:
  64. - - libunwind8
  65. + - libunwind8
  66. branches:
  67. only:
  68. - - master
  69. - - release
  70. - - dev
  71. - - /^(.*\/)?ci-.*$/
  72. - - /^rel\/.*/
  73. + - dev
  74. + - /^release\/.*$/
  75. + - /^(.*\/)?ci-.*$/
  76. before_install:
  77. - - 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
  78. +- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s
  79. + /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
  80. + /usr/local/lib/; fi
  81. script:
  82. - - ./build.sh
  83. +- ./build.sh
  84. diff --git a/build/dependencies.props b/build/dependencies.props
  85. index e17d551df9c..23d21e65050 100644
  86. --- a/build/dependencies.props
  87. +++ b/build/dependencies.props
  88. @@ -3,29 +3,29 @@
  89. <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
  90. </PropertyGroup>
  91. <PropertyGroup Label="Package Versions">
  92. - <InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15679</InternalAspNetCoreSdkPackageVersion>
  93. - <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
  94. - <MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreHostingPackageVersion>
  95. - <MicrosoftAspNetCoreTestingPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreTestingPackageVersion>
  96. + <InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-1010</InternalAspNetCoreSdkPackageVersion>
  97. + <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
  98. + <MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreHostingPackageVersion>
  99. + <MicrosoftAspNetCoreTestingPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreTestingPackageVersion>
  100. <MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion>
  101. - <MicrosoftExtensionsConfigurationJsonPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsConfigurationJsonPackageVersion>
  102. - <MicrosoftExtensionsConfigurationPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsConfigurationPackageVersion>
  103. - <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
  104. - <MicrosoftExtensionsDependencyInjectionPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsDependencyInjectionPackageVersion>
  105. - <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
  106. - <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsLoggingConsolePackageVersion>
  107. - <MicrosoftExtensionsLoggingPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsLoggingPackageVersion>
  108. - <MicrosoftExtensionsOptionsPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsOptionsPackageVersion>
  109. - <MicrosoftExtensionsWebEncodersSourcesPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
  110. + <MicrosoftExtensionsConfigurationJsonPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsConfigurationJsonPackageVersion>
  111. + <MicrosoftExtensionsConfigurationPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsConfigurationPackageVersion>
  112. + <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
  113. + <MicrosoftExtensionsDependencyInjectionPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsDependencyInjectionPackageVersion>
  114. + <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
  115. + <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsLoggingConsolePackageVersion>
  116. + <MicrosoftExtensionsLoggingPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsLoggingPackageVersion>
  117. + <MicrosoftExtensionsOptionsPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsOptionsPackageVersion>
  118. + <MicrosoftExtensionsWebEncodersSourcesPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
  119. <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.14.2</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
  120. <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
  121. - <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26115-03</MicrosoftNETCoreApp21PackageVersion>
  122. + <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26122-01</MicrosoftNETCoreApp21PackageVersion>
  123. <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
  124. - <MicrosoftWin32RegistryPackageVersion>4.5.0-preview1-26112-01</MicrosoftWin32RegistryPackageVersion>
  125. + <MicrosoftWin32RegistryPackageVersion>4.5.0-preview1-26119-06</MicrosoftWin32RegistryPackageVersion>
  126. <MoqPackageVersion>4.7.49</MoqPackageVersion>
  127. <StackExchangeRedisStrongNamePackageVersion>1.2.4</StackExchangeRedisStrongNamePackageVersion>
  128. - <SystemSecurityCryptographyXmlPackageVersion>4.5.0-preview1-26112-01</SystemSecurityCryptographyXmlPackageVersion>
  129. - <SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview1-26112-01</SystemSecurityPrincipalWindowsPackageVersion>
  130. + <SystemSecurityCryptographyXmlPackageVersion>4.5.0-preview1-26119-06</SystemSecurityCryptographyXmlPackageVersion>
  131. + <SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview1-26119-06</SystemSecurityPrincipalWindowsPackageVersion>
  132. <WindowsAzureStoragePackageVersion>8.1.4</WindowsAzureStoragePackageVersion>
  133. <XunitPackageVersion>2.3.1</XunitPackageVersion>
  134. <XunitRunnerVisualStudioPackageVersion>2.3.1</XunitRunnerVisualStudioPackageVersion>
  135. diff --git a/korebuild-lock.txt b/korebuild-lock.txt
  136. index a474bc0e356..851bfbf2034 100644
  137. --- a/korebuild-lock.txt
  138. +++ b/korebuild-lock.txt
  139. @@ -1,2 +1,2 @@
  140. -version:2.1.0-preview1-15679
  141. -commithash:5347461137cb45a77ddcc0b55b2478092de43338
  142. +version:2.1.0-preview1-1010
  143. +commithash:75ca924dfbd673c38841025b04c4dcd93b84f56d
  144. diff --git a/korebuild.json b/korebuild.json
  145. index bd5d51a51b0..678d8bb9483 100644
  146. --- a/korebuild.json
  147. +++ b/korebuild.json
  148. @@ -1,4 +1,4 @@
  149. {
  150. - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
  151. - "channel": "dev"
  152. + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
  153. + "channel": "release/2.1"
  154. }
  155. diff --git a/run.sh b/run.sh
  156. old mode 100644
  157. new mode 100755