Skip to content

Commit

Permalink
React to changes in corefx
Browse files Browse the repository at this point in the history
New package versions incoming to this patch causes a cascading change to preserve transitive dependencies

* System.Data.SqlClient
* System.Memory
* System.Runtime.CompilerServices.Unsafe
* System.Threading.Tasks.Extensions
  • Loading branch information
Nate McMaster committed Jun 5, 2018
1 parent 6586c92 commit a373d7e
Show file tree
Hide file tree
Showing 29 changed files with 176 additions and 176 deletions.
121 changes: 121 additions & 0 deletions build/artifacts.props

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions build/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
<!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
<MicrosoftNETCoreAppPackageVersion>2.1.0</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0</MicrosoftNETCoreDotNetAppHostPackageVersion>
<SystemDataSqlClientPackageVersion>4.5.0</SystemDataSqlClientPackageVersion>
<SystemMemoryPackageVersion>4.5.0</SystemMemoryPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemThreadingTasksExtensionsPackageVersion>4.5.0</SystemThreadingTasksExtensionsPackageVersion>
</PropertyGroup>

<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
Expand Down Expand Up @@ -101,21 +105,18 @@
<SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion>
<SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
<SystemComponentModelAnnotationsPackageVersion>4.5.0</SystemComponentModelAnnotationsPackageVersion>
<SystemDataSqlClientPackageVersion>4.5.0</SystemDataSqlClientPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.5.0</SystemDiagnosticsEventLogPackageVersion>
<SystemIdentityModelTokensJwtPackageVersion>5.2.0</SystemIdentityModelTokensJwtPackageVersion>
<SystemInteractiveAsyncPackageVersion>3.1.1</SystemInteractiveAsyncPackageVersion>
<SystemIOPipelinesPackageVersion>4.5.0</SystemIOPipelinesPackageVersion>
<SystemMemoryPackageVersion>4.5.0</SystemMemoryPackageVersion>
<SystemNetHttpPackageVersion>4.3.2</SystemNetHttpPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>4.5.0</SystemNetHttpWinHttpHandlerPackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.0</SystemNetWebSocketsWebSocketProtocolPackageVersion>
<SystemNumericsVectorsPackageVersion>4.5.0</SystemNumericsVectorsPackageVersion>
<SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion>
<SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion>
<SystemReflectionMetadataPackageVersion>1.6.0</SystemReflectionMetadataPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
<SystemSecurityCryptographyCngPackageVersion>4.5.0</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.5.0</SystemSecurityCryptographyXmlPackageVersion>
Expand All @@ -125,7 +126,6 @@
<SystemTextEncodingsWebPackageVersion>4.5.0</SystemTextEncodingsWebPackageVersion>
<SystemThreadingChannelsPackageVersion>4.5.0</SystemThreadingChannelsPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>4.9.0</SystemThreadingTasksDataflowPackageVersion>
<SystemThreadingTasksExtensionsPackageVersion>4.5.0</SystemThreadingTasksExtensionsPackageVersion>
<SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
<Utf8JsonPackageVersion>1.3.7</Utf8JsonPackageVersion>
<VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
Expand Down
121 changes: 0 additions & 121 deletions build/external-dependencies.props

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions build/submodules.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,53 +7,53 @@

<ItemGroup>
<Repository Include="AADIntegration" />
<Repository Include="Antiforgery" />
<Repository Include="AuthSamples" />
<Repository Include="AzureIntegration" />
<Repository Include="BasicMiddleware" />
<Repository Include="BrowserLink" />
<Repository Include="Caching" />
<Repository Include="Common" />
<Repository Include="Configuration" />
<Repository Include="CORS" />
<Repository Include="DataProtection" />
<Repository Include="DependencyInjection" />
<Repository Include="Diagnostics" />
<Repository Include="DotNetTools" />
<Repository Include="EntityFrameworkCore" />
<Repository Include="FileSystem" />
<Repository Include="Hosting" />
<Repository Include="HtmlAbstractions" />
<Repository Include="HttpAbstractions" />
<Repository Include="HttpClientFactory" />
<Repository Include="HttpSysServer" />
<Repository Include="Identity" />
<Repository Include="IISIntegration" />
<Repository Include="JavaScriptServices" />
<Repository Include="JsonPatch" />
<Repository Include="KestrelHttpServer" />
<Repository Include="Localization" />
<Repository Include="Logging" />
<Repository Include="MetaPackages" />
<Repository Include="MusicStore" />
<Repository Include="Mvc" />
<Repository Include="MvcPrecompilation" />
<Repository Include="Options" />
<Repository Include="Razor" />
<Repository Include="ResponseCaching" />
<Repository Include="Routing" />
<Repository Include="Scaffolding" />
<Repository Include="Security" />
<Repository Include="ServerTests" />
<Repository Include="Session" />
<Repository Include="SignalR" />
<Repository Include="WebSockets" />
<Repository Include="StaticFiles" />
<Repository Include="WebSockets" />
</ItemGroup>

<ItemGroup>
<ShippedRepository Include="Antiforgery" />
<ShippedRepository Include="BasicMiddleware" />
<ShippedRepository Include="BrowserLink" />
<ShippedRepository Include="Caching" />
<ShippedRepository Include="Common" />
<ShippedRepository Include="Configuration" />
<ShippedRepository Include="CORS" />
<ShippedRepository Include="DataProtection" />
<ShippedRepository Include="DependencyInjection" />
<ShippedRepository Include="DotNetTools" />
<ShippedRepository Include="EventNotification" />
<ShippedRepository Include="FileSystem" />
<ShippedRepository Include="Hosting" />
<ShippedRepository Include="HtmlAbstractions" />
<ShippedRepository Include="HttpAbstractions" />
<ShippedRepository Include="HttpClientFactory" />
<ShippedRepository Include="HttpSysServer" />
<ShippedRepository Include="IISIntegration" />
<ShippedRepository Include="JsonPatch" />
<ShippedRepository Include="Localization" />
<ShippedRepository Include="Logging" />
<ShippedRepository Include="Microsoft.Data.Sqlite" />
<ShippedRepository Include="Options" />
<ShippedRepository Include="ResponseCaching" />
<ShippedRepository Include="Routing" />
<ShippedRepository Include="ServerTests" />
<ShippedRepository Include="Session" />
<ShippedRepository Include="Testing" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion modules/Antiforgery
Submodule Antiforgery updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/BasicMiddleware
Submodule BasicMiddleware updated 1 files
+3 −3 version.props
2 changes: 1 addition & 1 deletion modules/BrowserLink
Submodule BrowserLink updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/CORS
Submodule CORS updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/Caching
Submodule Caching updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/Common
2 changes: 1 addition & 1 deletion modules/Configuration
Submodule Configuration updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/DataProtection
Submodule DataProtection updated 1 files
+3 −3 version.props
2 changes: 1 addition & 1 deletion modules/DependencyInjection
2 changes: 1 addition & 1 deletion modules/DotNetTools
Submodule DotNetTools updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/FileSystem
Submodule FileSystem updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/Hosting
Submodule Hosting updated 1 files
+3 −3 version.props
2 changes: 1 addition & 1 deletion modules/HtmlAbstractions
2 changes: 1 addition & 1 deletion modules/HttpAbstractions
2 changes: 1 addition & 1 deletion modules/HttpClientFactory
2 changes: 1 addition & 1 deletion modules/HttpSysServer
Submodule HttpSysServer updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/IISIntegration
Submodule IISIntegration updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/JsonPatch
Submodule JsonPatch updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/Localization
Submodule Localization updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/Logging
Submodule Logging updated 1 files
+3 −3 version.props
2 changes: 1 addition & 1 deletion modules/Options
Submodule Options updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/ResponseCaching
Submodule ResponseCaching updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/Routing
Submodule Routing updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/ServerTests
Submodule ServerTests updated 1 files
+2 −2 version.props
2 changes: 1 addition & 1 deletion modules/Session
Submodule Session updated 1 files
+2 −2 version.props

0 comments on commit a373d7e

Please sign in to comment.