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

Merge branch release/2.0 into release/2.0-msrc

This commit is contained in:
Nate McMaster 2018-04-18 13:55:56 -07:00
parent 20533d0510 de3d5e0e29
commit d8b413720f
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/RuntimeStore.targets
View File

@ -191,7 +191,7 @@
<Output TaskParameter="HostingStartupArtifacts" ItemName="HostingStartupArtifacts" /> <Output TaskParameter="HostingStartupArtifacts" ItemName="HostingStartupArtifacts" />
</RepoTasks.ResolveHostingStartupPackages> </RepoTasks.ResolveHostingStartupPackages>
<MSBuild <MSBuild Condition="@(HostingStartupArtifacts->Count()) != 0"
Projects="$(MSBuildProjectFullPath)" Projects="$(MSBuildProjectFullPath)"
Targets="_BuildHostingDeps" Targets="_BuildHostingDeps"
Properties="HostingStartupPackageName=%(HostingStartupArtifacts.PackageId);HostingStartupPackageVersion=%(HostingStartupArtifacts.Version)" /> Properties="HostingStartupPackageName=%(HostingStartupArtifacts.PackageId);HostingStartupPackageVersion=%(HostingStartupArtifacts.Version)" />
@ -200,7 +200,8 @@
<DepsFiles Include="$(_DepsOutputDirectory)**\*.deps.json" /> <DepsFiles Include="$(_DepsOutputDirectory)**\*.deps.json" />
</ItemGroup> </ItemGroup>
<RepoTasks.TrimDeps DepsFiles="@(DepsFiles)" /> <RepoTasks.TrimDeps Condition="@(DepsFiles->Count()) != 0"
DepsFiles="@(DepsFiles)" />
</Target> </Target>
<Target Name="PackRuntimeStore" DependsOnTargets="_ResolveRuntimeStoreRID"> <Target Name="PackRuntimeStore" DependsOnTargets="_ResolveRuntimeStoreRID">
@ -228,7 +229,9 @@
SymbolsDestination="$(_SymbolsZipDirectory)"/> SymbolsDestination="$(_SymbolsZipDirectory)"/>
<!-- Insert deps files --> <!-- Insert deps files -->
<Copy SourceFiles="@(DepsFiles)" DestinationFolder="$(_StoreZipDirectory)additionalDeps\%(RecursiveDir)" /> <Copy Condition="@(DepsFiles->Count()) != 0"
SourceFiles="@(DepsFiles)"
DestinationFolder="$(_StoreZipDirectory)additionalDeps\%(RecursiveDir)" />
<ItemGroup> <ItemGroup>
<OutputZipFiles Include="$(_StoreZipDirectory)**\*" /> <OutputZipFiles Include="$(_StoreZipDirectory)**\*" />

15
build/artifacts.props
View File

@ -10,9 +10,21 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<!--
Exclude the additionalDeps files for this hosting startup in the 2.0.8 release.
This should be re-enabled the next time Microsoft.NETCore.App is shipped.
-->
<PackageArtifact Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Metapackage="true" RuntimeStore="true" Category="ship">
<HostingStartup>false</HostingStartup>
<!-- <HostingStartup>true</HostingStartup> -->
</PackageArtifact>
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Metapackage="true" RuntimeStore="true" Category="ship">
<HostingStartup>false</HostingStartup>
<!-- <HostingStartup>true</HostingStartup> -->
</PackageArtifact>
<PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="ship" /> <PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" Metapackage="true" RuntimeStore="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" Metapackage="true" RuntimeStore="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Metapackage="true" RuntimeStore="true" HostingStartup="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.Abstractions" Metapackage="true" RuntimeStore="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Abstractions" Metapackage="true" RuntimeStore="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.Cookies" Metapackage="true" RuntimeStore="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Cookies" Metapackage="true" RuntimeStore="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.Core" Metapackage="true" RuntimeStore="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Core" Metapackage="true" RuntimeStore="true" Category="ship" />
@ -28,7 +40,6 @@
<PackageArtifact Include="Microsoft.AspNetCore.Authorization.Policy" Metapackage="true" RuntimeStore="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Authorization.Policy" Metapackage="true" RuntimeStore="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Authorization" Metapackage="true" RuntimeStore="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Authorization" Metapackage="true" RuntimeStore="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.AzureKeyVault.HostingStartup" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.AzureKeyVault.HostingStartup" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Metapackage="true" RuntimeStore="true" HostingStartup="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Metapackage="true" RuntimeStore="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Metapackage="true" RuntimeStore="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Buffering" Category="noship" /> <PackageArtifact Include="Microsoft.AspNetCore.Buffering" Category="noship" />