From 754c3b0c2eec9117655ad03c0c8a0d6be4b14e31 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Tue, 26 Jun 2018 12:39:01 -0700
Subject: [PATCH] Fix props files inside Microsoft.AspNetCore.AspNetCoreModule*
 Nuget packages (#975)

---
 build/repo.targets                               | 16 +++++++++++++---
 ...Microsoft.AspNetCore.AspNetCoreModule.nuspec} |  5 +++--
 .../Microsoft.AspNetCore.AspNetCoreModule.props  |  4 ----
 ...crosoft.AspNetCore.AspNetCoreModuleV2.nuspec} |  4 ++--
 ...rosoft.AspNetCore.AspNetCoreModuleV2.props.in | 13 +++++++++++++
 5 files changed, 31 insertions(+), 11 deletions(-)
 rename nuget/{AspNetCoreV1.nuspec => Microsoft.AspNetCore.AspNetCoreModule.nuspec} (92%)
 rename nuget/{AspNetCoreV2.nuspec => Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec} (94%)
 create mode 100644 nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in

diff --git a/build/repo.targets b/build/repo.targets
index 2adc903471..27117d706f 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -93,15 +93,25 @@
   </Target>
 
   <Target Name="PackageNativeProjects">
-    <PackNuspec NuspecPath="$(MSBuildThisFileDirectory)..\nuget\AspNetCoreV1.nuspec"
+    <PropertyGroup>
+      <AspNetCoreModuleV2PropsFile>$(MSBuildThisFileDirectory)..\nuget\Microsoft.AspNetCore.AspNetCoreModuleV2.props.in</AspNetCoreModuleV2PropsFile>
+      <AspNetCoreModuleV2PropsOutputFile>$(MSBuildThisFileDirectory)..\artifacts\Microsoft.AspNetCore.AspNetCoreModuleV2.props</AspNetCoreModuleV2PropsOutputFile>
+    </PropertyGroup>
+
+    <GenerateFileFromTemplate
+        TemplateFile="$(AspNetCoreModuleV2PropsFile)"
+        Properties="AspNetCoreModuleOutOfProcessVersion=$(AspNetCoreModuleOutOfProcessVersion)"
+        OutputPath="$(AspNetCoreModuleV2PropsOutputFile)" />
+
+    <PackNuspec NuspecPath="$(MSBuildThisFileDirectory)..\nuget\Microsoft.AspNetCore.AspNetCoreModule.nuspec"
       DestinationFolder="$(BuildDir)"
       Properties="version=$(PackageVersion);Configuration=$(Configuration)"
       Overwrite="true"
       BasePath="$(RepositoryRoot)" />
 
-    <PackNuspec NuspecPath="$(MSBuildThisFileDirectory)..\nuget\AspNetCoreV2.nuspec"
+    <PackNuspec NuspecPath="$(MSBuildThisFileDirectory)..\nuget\Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec"
       DestinationFolder="$(BuildDir)"
-      Properties="version=$(PackageVersion);Configuration=$(Configuration);AspNetCoreModuleOutOfProcessVersion=$(AspNetCoreModuleOutOfProcessVersion)"
+      Properties="version=$(PackageVersion);Configuration=$(Configuration);AspNetCoreModuleOutOfProcessVersion=$(AspNetCoreModuleOutOfProcessVersion);AspNetCoreModuleV2Props=$(AspNetCoreModuleV2PropsOutputFile)"
       Overwrite="true"
       BasePath="$(RepositoryRoot)" />
 
diff --git a/nuget/AspNetCoreV1.nuspec b/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec
similarity index 92%
rename from nuget/AspNetCoreV1.nuspec
rename to nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec
index 273b826516..80d9490328 100644
--- a/nuget/AspNetCoreV1.nuspec
+++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec
@@ -13,7 +13,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>ASP.NET Core Module</description>
     <language>en-US</language>
-    <tags>Microsoft.AspNetCore.AspNetCoreModuleV1</tags>
+    <tags>Microsoft.AspNetCore.AspNetCoreModule</tags>
     <contentFiles>
       <files include="any/any/*/*.dll" buildAction="None" copyToOutput="true" flatten="false" />
       <files include="any/any/*/*.pdb" buildAction="None" copyToOutput="true" flatten="false" />
@@ -24,7 +24,8 @@
     <file src="src\AspNetCoreModuleV1\AspNetCore\bin\$Configuration$\x64\aspnetcore.dll" target="contentFiles\any\any\x64\" />
     <file src="src\AspNetCoreModuleV1\AspNetCore\bin\$Configuration$\Win32\aspnetcore.pdb" target="contentFiles\any\any\x86\" />
     <file src="src\AspNetCoreModuleV1\AspNetCore\bin\$Configuration$\x64\aspnetcore.pdb" target="contentFiles\any\any\x64\" />
-    <file src="src\AspNetCoreModuleV1\AspNetCore\bin\$Configuration$\x64\*.xml"/>
+
+    <file src="src\AspNetCoreModuleV1\AspNetCore\aspnetcore_schema.xml"/>
     <file src="tools\installancm.ps1"/>
     <file src="LICENSE.txt"/>
     <file src="nuget\Microsoft.AspNetCore.AspNetCoreModule.props" target="build\" />
diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props
index 1f33b20ed2..7a761813b4 100644
--- a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props
+++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props
@@ -3,10 +3,6 @@
   <PropertyGroup>
     <AspNetCoreModuleX64Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcore.dll</AspNetCoreModuleX64Location>
     <AspNetCoreModuleX86Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcore.dll</AspNetCoreModuleX86Location>
-    <InProcessRequestHandlerX64Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_inprocess.dll</InProcessRequestHandlerX64Location>
-    <InProcessRequestHandlerX86Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll</InProcessRequestHandlerX86Location>
-    <OutOfProcessRequestHandlerX64Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll</OutOfProcessRequestHandlerX64Location>
-    <OutOfProcessRequestHandlerX86Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll</OutOfProcessRequestHandlerX86Location>
   </PropertyGroup>
 
 </Project>
diff --git a/nuget/AspNetCoreV2.nuspec b/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec
similarity index 94%
rename from nuget/AspNetCoreV2.nuspec
rename to nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec
index 9210f7a7cc..c4d109d5ba 100644
--- a/nuget/AspNetCoreV2.nuspec
+++ b/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec
@@ -36,9 +36,9 @@
     <file src="src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$Configuration$\Win32\aspnetcorev2_inprocess.pdb" target="contentFiles\any\any\x86" />
     <file src="src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$Configuration$\x64\aspnetcorev2_inprocess.pdb" target="contentFiles\any\any\x64" />
 
-    <file src="src\AspNetCoreModuleV2\AspNetCore\bin\$Configuration$\x64\*.xml"/>
+    <file src="src\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml"/>
     <file src="tools\installancm.ps1"/>
     <file src="LICENSE.txt"/>
-    <file src="nuget\Microsoft.AspNetCore.AspNetCoreModule.props" target="build\" />
+    <file src="$AspNetCoreModuleV2Props$" target="build\" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in b/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in
new file mode 100644
index 0000000000..09af105513
--- /dev/null
+++ b/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in
@@ -0,0 +1,13 @@
+<Project>
+
+  <PropertyGroup>
+    <AspNetCoreModuleOutOfProcessVersion>${AspNetCoreModuleOutOfProcessVersion}</AspNetCoreModuleOutOfProcessVersion>
+    <AspNetCoreModuleX64Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2.dll</AspNetCoreModuleX64Location>
+    <AspNetCoreModuleX86Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2.dll</AspNetCoreModuleX86Location>
+    <InProcessRequestHandlerX64Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_inprocess.dll</InProcessRequestHandlerX64Location>
+    <InProcessRequestHandlerX86Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll</InProcessRequestHandlerX86Location>
+    <OutOfProcessRequestHandlerX64Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll</OutOfProcessRequestHandlerX64Location>
+    <OutOfProcessRequestHandlerX86Location>$(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll</OutOfProcessRequestHandlerX86Location>
+  </PropertyGroup>
+
+</Project>