| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113 |
- commit 2d23ed73e7c7d263acf142c7d30353811a9f3715
- Author: ASP.NET CI <[email protected]>
- Date: Sun Sep 16 19:16:11 2018 +0000
- Update dependencies.props
-
- [auto-updated: dependencies]
- diff --git a/build/dependencies.props b/build/dependencies.props
- index 231fbef9dd1..bb2f9074f16 100644
- --- a/build/dependencies.props
- +++ b/build/dependencies.props
- @@ -4,51 +4,51 @@
- </PropertyGroup>
- <PropertyGroup Label="Package Versions">
- <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
- - <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20180907.9</InternalAspNetCoreSdkPackageVersion>
- - <MicrosoftAspNetCoreAllPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreAllPackageVersion>
- - <MicrosoftAspNetCoreAuthenticationCorePackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
- - <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
- - <MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>
- - <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
- - <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreHostingPackageVersion>
- - <MicrosoftAspNetCoreHttpExtensionsPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
- - <MicrosoftAspNetCoreHttpOverridesPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreHttpOverridesPackageVersion>
- - <MicrosoftAspNetCoreHttpPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreHttpPackageVersion>
- - <MicrosoftAspNetCoreHttpSysSourcesPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreHttpSysSourcesPackageVersion>
- - <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.7.0-alpha1-10419</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
- - <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreServerKestrelPackageVersion>
- - <MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreTestHostPackageVersion>
- - <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreTestingPackageVersion>
- - <MicrosoftAspNetCoreWebUtilitiesPackageVersion>3.0.0-alpha1-10419</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
- + <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20180911.2</InternalAspNetCoreSdkPackageVersion>
- + <MicrosoftAspNetCoreAllPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreAllPackageVersion>
- + <MicrosoftAspNetCoreAuthenticationCorePackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
- + <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
- + <MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>
- + <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
- + <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreHostingPackageVersion>
- + <MicrosoftAspNetCoreHttpExtensionsPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
- + <MicrosoftAspNetCoreHttpOverridesPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreHttpOverridesPackageVersion>
- + <MicrosoftAspNetCoreHttpPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreHttpPackageVersion>
- + <MicrosoftAspNetCoreHttpSysSourcesPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreHttpSysSourcesPackageVersion>
- + <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.7.0-alpha1-10454</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
- + <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreServerKestrelPackageVersion>
- + <MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreTestHostPackageVersion>
- + <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreTestingPackageVersion>
- + <MicrosoftAspNetCoreWebUtilitiesPackageVersion>3.0.0-alpha1-10454</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
- <MicrosoftBuildFrameworkPackageVersion>15.6.82</MicrosoftBuildFrameworkPackageVersion>
- <MicrosoftBuildUtilitiesCorePackageVersion>15.6.82</MicrosoftBuildUtilitiesCorePackageVersion>
- - <MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion>3.0.0-alpha1-10419</MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion>
- - <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-alpha1-10419</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
- - <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-alpha1-10419</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
- - <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-alpha1-10419</MicrosoftExtensionsConfigurationJsonPackageVersion>
- - <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-alpha1-10419</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
- - <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10419</MicrosoftExtensionsLoggingConsolePackageVersion>
- - <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-alpha1-10419</MicrosoftExtensionsLoggingDebugPackageVersion>
- - <MicrosoftExtensionsLoggingPackageVersion>3.0.0-alpha1-10419</MicrosoftExtensionsLoggingPackageVersion>
- - <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-alpha1-10419</MicrosoftExtensionsLoggingTestingPackageVersion>
- - <MicrosoftExtensionsOptionsPackageVersion>3.0.0-alpha1-10419</MicrosoftExtensionsOptionsPackageVersion>
- + <MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion>3.0.0-alpha1-10454</MicrosoftExtensionsBuffersMemoryPoolSourcesPackageVersion>
- + <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-alpha1-10454</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
- + <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-alpha1-10454</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
- + <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-alpha1-10454</MicrosoftExtensionsConfigurationJsonPackageVersion>
- + <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-alpha1-10454</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
- + <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10454</MicrosoftExtensionsLoggingConsolePackageVersion>
- + <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-alpha1-10454</MicrosoftExtensionsLoggingDebugPackageVersion>
- + <MicrosoftExtensionsLoggingPackageVersion>3.0.0-alpha1-10454</MicrosoftExtensionsLoggingPackageVersion>
- + <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-alpha1-10454</MicrosoftExtensionsLoggingTestingPackageVersion>
- + <MicrosoftExtensionsOptionsPackageVersion>3.0.0-alpha1-10454</MicrosoftExtensionsOptionsPackageVersion>
- <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
- <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
- <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview2-26905-02</MicrosoftNETCoreApp22PackageVersion>
- <MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion>
- - <MicrosoftNetHttpHeadersPackageVersion>3.0.0-alpha1-10419</MicrosoftNetHttpHeadersPackageVersion>
- + <MicrosoftNetHttpHeadersPackageVersion>3.0.0-alpha1-10454</MicrosoftNetHttpHeadersPackageVersion>
- <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
- <MicrosoftWebAdministrationPackageVersion>11.1.0</MicrosoftWebAdministrationPackageVersion>
- <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
- - <SystemBuffersPackageVersion>4.6.0-preview1-26905-03</SystemBuffersPackageVersion>
- - <SystemDiagnosticsEventLogPackageVersion>4.6.0-preview1-26905-03</SystemDiagnosticsEventLogPackageVersion>
- - <SystemIOPipelinesPackageVersion>4.6.0-preview1-26905-03</SystemIOPipelinesPackageVersion>
- + <SystemBuffersPackageVersion>4.6.0-preview1-26907-04</SystemBuffersPackageVersion>
- + <SystemDiagnosticsEventLogPackageVersion>4.6.0-preview1-26907-04</SystemDiagnosticsEventLogPackageVersion>
- + <SystemIOPipelinesPackageVersion>4.6.0-preview1-26907-04</SystemIOPipelinesPackageVersion>
- <SystemMemoryPackageVersion>4.6.0-preview1-26717-04</SystemMemoryPackageVersion>
- - <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.6.0-preview1-26905-03</SystemNetWebSocketsWebSocketProtocolPackageVersion>
- - <SystemNumericsVectorsPackageVersion>4.6.0-preview1-26905-03</SystemNumericsVectorsPackageVersion>
- - <SystemRuntimeCompilerServicesUnsafePackageVersion>4.6.0-preview1-26905-03</SystemRuntimeCompilerServicesUnsafePackageVersion>
- - <SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview1-26905-03</SystemSecurityPrincipalWindowsPackageVersion>
- - <SystemServiceProcessServiceControllerPackageVersion>4.6.0-preview1-26905-03</SystemServiceProcessServiceControllerPackageVersion>
- + <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.6.0-preview1-26907-04</SystemNetWebSocketsWebSocketProtocolPackageVersion>
- + <SystemNumericsVectorsPackageVersion>4.6.0-preview1-26907-04</SystemNumericsVectorsPackageVersion>
- + <SystemRuntimeCompilerServicesUnsafePackageVersion>4.6.0-preview1-26907-04</SystemRuntimeCompilerServicesUnsafePackageVersion>
- + <SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview1-26907-04</SystemSecurityPrincipalWindowsPackageVersion>
- + <SystemServiceProcessServiceControllerPackageVersion>4.6.0-preview1-26907-04</SystemServiceProcessServiceControllerPackageVersion>
- <Tooling_NewtonsoftJsonPackageVersion>9.0.1</Tooling_NewtonsoftJsonPackageVersion>
- <XunitPackageVersion>2.3.1</XunitPackageVersion>
- <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
- diff --git a/korebuild-lock.txt b/korebuild-lock.txt
- index 58059d1ff4b..a3511df82d3 100644
- --- a/korebuild-lock.txt
- +++ b/korebuild-lock.txt
- @@ -1,7 +1,2 @@
- -<<<<<<< HEAD
- -version:3.0.0-alpha1-20180907.9
- -commithash:f997365a8832ff0a3cbd9a98df45734ac2723fa0
- -=======
- -version:2.2.0-preview1-20180907.8
- -commithash:078918eb5c1f176ee1da351c584fb4a4d7491aa0
- ->>>>>>> merge/release/2.2-to-master
- +version:3.0.0-alpha1-20180911.2
- +commithash:2a2b7dbea1b247930c41da497f4ea0b2bb756818
|