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-12-14 16:04:56 -08:00
parent 02780bac26 9183145474
commit 3c09d644cc
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Servers/IIS/ResolveIisReferences.targets
View File

@ -79,6 +79,7 @@ with the right MSBuild incantations to get output copied to the right place.
<!-- Prepend LinkBase to output path. --> <!-- Prepend LinkBase to output path. -->
<NativeContent> <NativeContent>
<Link>%(LinkBase)%(FileName)%(Extension)</Link> <Link>%(LinkBase)%(FileName)%(Extension)</Link>
<!-- Don't put this content in a nuget package. -->
<Pack>false</Pack> <Pack>false</Pack>
</NativeContent> </NativeContent>
</ItemGroup> </ItemGroup>

1
src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
View File

@ -8,7 +8,6 @@
<PackageTags>aspnetcore</PackageTags> <PackageTags>aspnetcore</PackageTags>
<PackageTitle>Microsoft ASP.NET Core Module</PackageTitle> <PackageTitle>Microsoft ASP.NET Core Module</PackageTitle>
<Pack>true</Pack> <Pack>true</Pack>
<ContentTargetFolders>content</ContentTargetFolders>
<NoPackageAnalysis>true</NoPackageAnalysis> <NoPackageAnalysis>true</NoPackageAnalysis>
<PackageDescription>ASP.NET Core Module</PackageDescription> <PackageDescription>ASP.NET Core Module</PackageDescription>
<IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable> <IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable>