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

Merge fixes

This commit is contained in:
John Luo 2020-02-20 18:12:00 -08:00
parent bf47617576
commit 5f52370264
11 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eng/Build.props
View File

@ -190,6 +190,14 @@
$(RepoRoot)src\Azure\**\src\*.csproj;
$(RepoRoot)src\SignalR\**\src\*.csproj;
$(RepoRoot)src\Components\**\src\*.csproj;
$(RepoRoot)src\FileProviders\**\src\*.csproj;
$(RepoRoot)src\Configuration.KeyPerFile\**\src\*.csproj;
$(RepoRoot)src\Localization\**\src\*.csproj;
$(RepoRoot)src\ObjectPool\**\src\*.csproj;
$(RepoRoot)src\JSInterop\**\src\*.csproj;
$(RepoRoot)src\WebEncoders\**\src\*.csproj;
$(RepoRoot)src\HealthChecks\**\src\*.csproj;
$(RepoRoot)src\Testing\**\src\*.csproj;
"
Exclude="
@(ProjectToBuild);

2
eng/ProjectReferences.props
View File

@ -63,6 +63,7 @@
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Server" ProjectPath="$(RepoRoot)src\Components\Blazor\Server\src\Microsoft.AspNetCore.Blazor.Server.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.DataAnnotations.Validation" ProjectPath="$(RepoRoot)src\Components\Blazor\Validation\src\Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj" />
<ProjectReferenceProvider Include="Ignitor" ProjectPath="$(RepoRoot)src\Components\Ignitor\src\Ignitor.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.Testing.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.Abstractions" ProjectPath="$(RepoRoot)src\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" RefProjectPath="$(RepoRoot)src\DataProtection\Abstractions\ref\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Cryptography.Internal" ProjectPath="$(RepoRoot)src\DataProtection\Cryptography.Internal\src\Microsoft.AspNetCore.Cryptography.Internal.csproj" RefProjectPath="$(RepoRoot)src\DataProtection\Cryptography.Internal\ref\Microsoft.AspNetCore.Cryptography.Internal.csproj" />
@ -152,6 +153,5 @@
<ProjectReferenceProvider Include="Microsoft.Extensions.WebEncoders" ProjectPath="$(RepoRoot)src\WebEncoders\src\Microsoft.Extensions.WebEncoders.csproj" RefProjectPath="$(RepoRoot)src\WebEncoders\ref\Microsoft.Extensions.WebEncoders.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" ProjectPath="$(RepoRoot)src\HealthChecks\Abstractions\src\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj" RefProjectPath="$(RepoRoot)src\HealthChecks\Abstractions\ref\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Diagnostics.HealthChecks" ProjectPath="$(RepoRoot)src\HealthChecks\HealthChecks\src\Microsoft.Extensions.Diagnostics.HealthChecks.csproj" RefProjectPath="$(RepoRoot)src\HealthChecks\HealthChecks\ref\Microsoft.Extensions.Diagnostics.HealthChecks.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.Testing.csproj" RefProjectPath="$(RepoRoot)src\Testing\ref\Microsoft.AspNetCore.Testing.csproj" />
</ItemGroup>
</Project>

1
src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj
View File

@ -5,7 +5,6 @@
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>configuration</PackageTags>

1
src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
View File

@ -8,7 +8,6 @@
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
<NuspecFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildProjectName).netcoreapp.nuspec</NuspecFile>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>files;filesystem</PackageTags>

1
src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj
View File

@ -13,7 +13,6 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>diagnostics;healthchecks</PackageTags>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>

1
src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
View File

@ -12,7 +12,6 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>diagnostics;healthchecks</PackageTags>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>

1
src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj
View File

@ -7,7 +7,6 @@
<PackageTags>javascript;interop</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>

1
src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj
View File

@ -12,7 +12,6 @@ Microsoft.Extensions.Localization.IStringLocalizer&lt;T&gt;</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>localization</PackageTags>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>

1
src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj
View File

@ -9,7 +9,6 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>localization</PackageTags>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>

1
src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj
View File

@ -7,7 +7,6 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>pooling</PackageTags>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>

1
src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj
View File

@ -8,7 +8,6 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags>
<IsPackable>true</IsPackable>
<IsShipping>true</IsShipping>
<IsAspNetCoreApp>true</IsAspNetCoreApp>
</PropertyGroup>