Skip to content

Commit

Permalink
Merge in 'release/2.1' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@dotnet-bot
dotnet-bot committed Dec 6, 2018
2 parents 72098a1 + 50bea05 commit dfb6f09
Show file tree
Hide file tree
Showing 191 changed files with 253 additions and 486 deletions.
1 change: 0 additions & 1 deletion build/artifacts.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
<PackageArtifact Include="Microsoft.AspNetCore.ResponseCompression" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Rewrite" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Routing.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Routing" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Server.HttpSys" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Server.IISIntegration" AllMetapackage="true" AppMetapackage="true" Category="ship" />
Expand Down
1 change: 0 additions & 1 deletion build/buildorder.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
<RepositoryBuildOrder Include="CORS" Order="11" RootPath="$(RepositoryRoot)src\CORS\" />
<RepositoryBuildOrder Include="StaticFiles" Order="11" RootPath="$(RepositoryRoot)src\StaticFiles\" />
<RepositoryBuildOrder Include="Routing" Order="11" RootPath="$(RepositoryRoot)src\Routing\" />
<RepositoryBuildOrder Include="ResponseCaching" Order="11" RootPath="$(RepositoryRoot)src\ResponseCaching\" />
<RepositoryBuildOrder Include="Session" Order="11" RootPath="$(RepositoryRoot)src\Session\" />
<RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
Expand Down
1 change: 0 additions & 1 deletion build/submodules.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
<ShippedRepository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
<ShippedRepository Include="ResponseCaching" RootPath="$(RepositoryRoot)src\ResponseCaching\" />
<ShippedRepository Include="Routing" RootPath="$(RepositoryRoot)src\Routing\" />
<ShippedRepository Include="Security" RootPath="$(RepositoryRoot)src\Security\" />
<ShippedRepository Include="Session" RootPath="$(RepositoryRoot)src\Session\" />
<ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
Expand Down
18 changes: 18 additions & 0 deletions eng/Baseline.Designer.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,24 @@
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Routing.Abstractions-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Routing.Abstractions' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Routing.Abstractions' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Routing-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Routing' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Routing' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Server.Kestrel.Core-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Core' ">
<BaselinePackageVersion>2.1.3</BaselinePackageVersion>
Expand Down
2 changes: 2 additions & 0 deletions eng/Baseline.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
<Package Id="Microsoft.AspNetCore.Owin" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Routing" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.1.3" />
Expand Down
9 changes: 6 additions & 3 deletions eng/Dependencies.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,28 @@
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="$(MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="$(MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="$(MicrosoftExtensionsDiagnosticAdapterPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Process.Sources" Version="$(MicrosoftExtensionsProcessSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.RazorViews.Sources" Version="$(MicrosoftExtensionsRazorViewsSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.StackTrace.Sources" Version="$(MicrosoftExtensionsStackTraceSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(MicrosoftExtensionsTypeNameHelperSourcesPackageVersion)" />
Expand All @@ -44,8 +47,8 @@
<LatestPackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="$(MicrosoftNETCoreWindowsApiSetsPackageVersion)" />
<LatestPackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
<LatestPackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
<LatestPackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" />
<LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
<LatestPackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" />
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
<LatestPackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngPackageVersion)" />
<LatestPackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
Expand Down
2 changes: 2 additions & 0 deletions eng/ProjectReferences.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Http.Features" ProjectPath="$(RepositoryRoot)src\Http\Http.Features\src\Microsoft.AspNetCore.Http.Features.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Http" ProjectPath="$(RepositoryRoot)src\Http\Http\src\Microsoft.AspNetCore.Http.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Owin" ProjectPath="$(RepositoryRoot)src\Http\Owin\src\Microsoft.AspNetCore.Owin.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Routing.Abstractions" ProjectPath="$(RepositoryRoot)src\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Routing" ProjectPath="$(RepositoryRoot)src\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebUtilities" ProjectPath="$(RepositoryRoot)src\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Html.Abstractions" ProjectPath="$(RepositoryRoot)src\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Connections.Abstractions" ProjectPath="$(RepositoryRoot)src\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj" />
Expand Down
1 change: 0 additions & 1 deletion eng/dependencies.temp.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ This is required to provide dependencies for samples and tests.
<ItemGroup>
<LatestPackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" />
<LatestPackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
<LatestPackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.1" />
</ItemGroup>
</Project>
0 ....Routing.Abstractions/IRouteConstraint.cs → ...ting.Abstractions/src/IRouteConstraint.cs
View file
File renamed without changes.
0 ...ore.Routing.Abstractions/IRouteHandler.cs → ...Routing.Abstractions/src/IRouteHandler.cs
View file
File renamed without changes.
0 ...spNetCore.Routing.Abstractions/IRouter.cs → src/Http/Routing.Abstractions/src/IRouter.cs
View file
File renamed without changes.
0 ...e.Routing.Abstractions/IRoutingFeature.cs → ...uting.Abstractions/src/IRoutingFeature.cs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ft.AspNetCore.Routing.Abstractions.csproj → ...ft.AspNetCore.Routing.Abstractions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Microsoft.AspNetCore.Routing.RouteData</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(MicrosoftAspNetCoreHttpAbstractionsPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" PrivateAssets="All" />
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
<Reference Include="Microsoft.Extensions.PropertyHelper.Sources" PrivateAssets="All" />
</ItemGroup>
</Project>
0 ...g.Abstractions/Properties/AssemblyInfo.cs → ...stractions/src/Properties/AssemblyInfo.cs
View file
File renamed without changes.
0 ...ractions/Properties/Resources.Designer.cs → ...ions/src/Properties/Resources.Designer.cs
View file
File renamed without changes.
0 ...tCore.Routing.Abstractions/Resources.resx → ...p/Routing.Abstractions/src/Resources.resx
View file
File renamed without changes.
0 ...Core.Routing.Abstractions/RouteContext.cs → .../Routing.Abstractions/src/RouteContext.cs
View file
File renamed without changes.
0 ...NetCore.Routing.Abstractions/RouteData.cs → ...ttp/Routing.Abstractions/src/RouteData.cs
View file
File renamed without changes.
0 ...re.Routing.Abstractions/RouteDirection.cs → ...outing.Abstractions/src/RouteDirection.cs
View file
File renamed without changes.
0 ...ting.Abstractions/RouteValueDictionary.cs → ....Abstractions/src/RouteValueDictionary.cs
View file
File renamed without changes.
0 ...tractions/RoutingHttpContextExtensions.cs → ...tions/src/RoutingHttpContextExtensions.cs
View file
File renamed without changes.
0 ...outing.Abstractions/VirtualPathContext.cs → ...ng.Abstractions/src/VirtualPathContext.cs
View file
File renamed without changes.
0 ...e.Routing.Abstractions/VirtualPathData.cs → ...uting.Abstractions/src/VirtualPathData.cs
View file
File renamed without changes.
0 ...outing.Abstractions/baseline.netcore.json → ...ng.Abstractions/src/baseline.netcore.json
View file
File renamed without changes.
11 changes: 11 additions & 0 deletions ...Http/Routing.Abstractions/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Routing.Abstractions" />
</ItemGroup>

</Project>
0 ...uting.Abstractions.Tests/RouteDataTest.cs → ...outing.Abstractions/test/RouteDataTest.cs
View file
File renamed without changes.
0 ...ctions.Tests/RouteValueDictionaryTests.cs → ...actions/test/RouteValueDictionaryTests.cs
View file
File renamed without changes.
0 ...bstractions.Tests/VirtualPathDataTests.cs → ...Abstractions/test/VirtualPathDataTests.cs
View file
File renamed without changes.
Loading

0 comments on commit dfb6f09

Please sign in to comment.