huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.1' to release/2.2

This commit is contained in:
Nate McMaster 2018-12-07 12:45:42 -08:00
parent c331a7be14 df3e4b98a2
commit 5017afa0ad
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
8 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -26,3 +26,4 @@ scripts/tmp/
.tools/ .tools/
src/**/global.json src/**/global.json
launchSettings.json launchSettings.json
korebuild-lock.txt

3
build/repo.props
View File

@ -75,8 +75,7 @@
Exclude=" Exclude="
@(ProjectToExclude); @(ProjectToExclude);
$(RepositoryRoot)**\bin\**\*; $(RepositoryRoot)**\bin\**\*;
$(RepositoryRoot)**\obj\**\*; $(RepositoryRoot)**\obj\**\*;" />
$(RepositoryRoot)**\AutobahnTestApp\**\*;" />
</ItemGroup> </ItemGroup>
<!-- Properties for publishing --> <!-- Properties for publishing -->

6
src/Servers/HttpSys/NuGetPackageVerifier.json
View File

@ -1,10 +1,4 @@
{ {
"adx-nonshipping": {
"rules": [],
"packages": {
"Microsoft.AspNetCore.HttpSys.Sources": {}
}
},
"Default": { "Default": {
"rules": [ "rules": [
"DefaultCompositeRule" "DefaultCompositeRule"

15
src/Servers/HttpSys/test/Directory.Build.props
View File

@ -1,15 +0,0 @@
<Project>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<DeveloperBuildTestTfms>netcoreapp2.2</DeveloperBuildTestTfms>
<StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
<StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTestTfms)</StandardTestTfms>
<StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net472</StandardTestTfms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
</ItemGroup>
</Project>

2
src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks> <TargetFrameworks>netcoreapp2.2;net472</TargetFrameworks>
<TestGroupName>HttpSys.FunctionalTests</TestGroupName> <TestGroupName>HttpSys.FunctionalTests</TestGroupName>
</PropertyGroup> </PropertyGroup>

2
src/Servers/HttpSys/test/Tests/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks> <TargetFrameworks>netcoreapp2.2;net472</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
View File

@ -7,7 +7,7 @@
<ItemGroup> <ItemGroup>
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" /> <Compile Include="$(KestrelSharedSourceRoot)test\*.cs" />
<Compile Include="$(RepositoryRoot)\src\Shared\Buffers.Testing\*.cs" /> <Compile Include="$(SharedSourceRoot)Buffers.Testing\*.cs" />
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" /> <Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup> </ItemGroup>

2
src/SignalR/test/Microsoft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj
View File

@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\..\..\Shared\Buffers.Testing\**\*.cs" /> <Compile Include="$(SharedSourceRoot)Buffers.Testing\**\*.cs" />
<Content Include="..\xunit.runner.json" Link="xunit.runner.json"> <Content Include="..\xunit.runner.json" Link="xunit.runner.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>