From 9183145474d31e0090715ec693671d4bf6a0f1b9 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Fri, 14 Dec 2018 16:04:15 -0800
Subject: [PATCH] Fix package layout for ANCM packages (#5119)

---
 build/repo.props                                             | 2 +-
 eng/targets/Cpp.Common.props                                 | 1 +
 src/Servers/IIS/ResolveIisReferences.targets                 | 2 ++
 .../Microsoft.AspNetCore.AspNetCoreModule.pkgproj            | 3 +--
 .../Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj          | 5 ++---
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/repo.props b/build/repo.props
index 887da3ee09..df0b9bf1ab 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -71,7 +71,7 @@
 
     <NpmProjectDirectory Include="$(RepositoryRoot)src\Middleware\CORS\test\FunctionalTests\" />
 
-    <ProjectToBuild Condition=" '$(OS)' == 'Windows_NT' " Include="$(RepositoryRoot)src\Servers\**\*.vcxproj">
+    <ProjectToBuild Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' " Include="$(RepositoryRoot)src\Servers\**\*.vcxproj">
       <!-- Required to prevent triggering double-builds. See src\Servers\IIS\ResolveIisReferences.targets for details. -->
       <AdditionalProperties Condition="'$(SharedFxRid)' == 'win-x64'">Platform=x64</AdditionalProperties>
       <AdditionalProperties Condition="'$(SharedFxRid)' == 'win-x86'">Platform=x86</AdditionalProperties>
diff --git a/eng/targets/Cpp.Common.props b/eng/targets/Cpp.Common.props
index f295dbafad..f827506c4f 100644
--- a/eng/targets/Cpp.Common.props
+++ b/eng/targets/Cpp.Common.props
@@ -3,6 +3,7 @@
 
   <PropertyGroup>
     <SignOutput Condition=" '$(SignType)' != '' ">true</SignOutput>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <Import Project="MicroBuild.Plugin.props" Condition="'$(MicroBuildSentinelFile)' == ''" />
diff --git a/src/Servers/IIS/ResolveIisReferences.targets b/src/Servers/IIS/ResolveIisReferences.targets
index 8355fc7c30..b69a024af0 100644
--- a/src/Servers/IIS/ResolveIisReferences.targets
+++ b/src/Servers/IIS/ResolveIisReferences.targets
@@ -79,6 +79,8 @@ with the right MSBuild incantations to get output copied to the right place.
       <!-- Prepend LinkBase to output path. -->
       <NativeContent>
         <Link>%(LinkBase)%(FileName)%(Extension)</Link>
+        <!-- Don't put this content in a nuget package. -->
+        <Pack>false</Pack>
       </NativeContent>
     </ItemGroup>
 
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
index 97b177aabb..4ab6c6330a 100644
--- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
+++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
@@ -8,7 +8,6 @@
     <PackageTags>aspnetcore</PackageTags>
     <PackageTitle>Microsoft ASP.NET Core Module</PackageTitle>
     <Pack>true</Pack>
-    <ContentTargetFolders>content</ContentTargetFolders>
     <NoPackageAnalysis>true</NoPackageAnalysis>
     <PackageDescription>ASP.NET Core Module</PackageDescription>
     <IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable>
@@ -19,7 +18,7 @@
     <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb" PackagePath="contentFiles/any/any/x86" />
     <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" PackagePath="contentFiles/any/any/x64" />
     <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb" PackagePath="contentFiles/any/any/x64" />
-    <Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\*.xml" PackagePath="" />
+    <Content Include="..\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" PackagePath="/aspnetcore_schema.xml" />
     <Content Include="Microsoft.AspNetCore.AspNetCoreModule.props" PackagePath="build\" />
     <Reference Include="AspNetCoreModule" />
   </ItemGroup>
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
index 2cc6e089fd..1649ef6927 100644
--- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
+++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
@@ -8,7 +8,6 @@
     <PackageTags>aspnetcore</PackageTags>
     <PackageTitle>Microsoft ASP.NET Core Module</PackageTitle>
     <Pack>true</Pack>
-    <ContentTargetFolders>content</ContentTargetFolders>
     <NoPackageAnalysis>true</NoPackageAnalysis>
     <PackageDescription>ASP.NET Core Module</PackageDescription>
     <IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable>
@@ -25,8 +24,8 @@
     <Content Include="..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll" PackagePath="contentFiles/any/any/x64/2.0.0" />
     <Content Include="..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.pdb" PackagePath="contentFiles/any/any/x64/2.0.0" />
 
-    <Content Include="..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\*.xml" PackagePath="" />
-    <Content Include="..\AspNetCoreModuleV2\AspNetCore\ancm.mof" />
+    <Content Include="..\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" PackagePath="/" />
+    <Content Include="..\AspNetCoreModuleV2\AspNetCore\ancm.mof" PackagePath="/" />
     <Content Include="Microsoft.AspNetCore.AspNetCoreModule.props.in" PackagePath="build\" />
     <Reference Include="AspNetCoreModuleV2" />
   </ItemGroup>