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

Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-07-26 09:33:54 -07:00
parent 2fad79db9c c4e8dd3664
commit be3691aee8
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
6 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NuGetPackageVerifier.json
View File

@ -4,7 +4,7 @@
// Don't run any rules for packages that don't ship. // Don't run any rules for packages that don't ship.
], ],
"packages": { "packages": {
"Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources": {}, "Internal.WebHostBuilderFactory.Sources": {},
"Microsoft.AspNetCore.Server.IntegrationTesting": {} "Microsoft.AspNetCore.Server.IntegrationTesting": {}
} }
}, },

0
shared/Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources/FactoryResolutionResult.cs → shared/Internal.WebHostBuilderFactory.Sources/FactoryResolutionResult.cs
View File

0
shared/Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources/FactoryResolutionResultKind.cs → shared/Internal.WebHostBuilderFactory.Sources/FactoryResolutionResultKind.cs
View File

0
shared/Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources/WebHostFactoryResolver.cs → shared/Internal.WebHostBuilderFactory.Sources/WebHostFactoryResolver.cs
View File

6
src/Microsoft.AspNetCore.TestHost/Microsoft.AspNetCore.TestHost.csproj
View File

@ -9,9 +9,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\..\shared\Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources\FactoryResolutionResult.cs" /> <Compile Include="..\..\shared\Internal.WebHostBuilderFactory.Sources\FactoryResolutionResult.cs" />
<Compile Include="..\..\shared\Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources\FactoryResolutionResultKind.cs" /> <Compile Include="..\..\shared\Internal.WebHostBuilderFactory.Sources\FactoryResolutionResultKind.cs" />
<Compile Include="..\..\shared\Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources\WebHostFactoryResolver.cs" /> <Compile Include="..\..\shared\Internal.WebHostBuilderFactory.Sources\WebHostFactoryResolver.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
test/Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Tests/Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Tests.csproj
View File

@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\..\shared\Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources\**\*.cs" /> <Compile Include="..\..\shared\Internal.WebHostBuilderFactory.Sources\**\*.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>