From f867367b56162166d67e8ec636917bf0bbf5bdff Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Fri, 3 Aug 2018 13:55:25 -0700
Subject: [PATCH] Use V2 schema for V1 outputs, do not pack pdb's (#1152)

---
 build/repo.targets                            |  2 +-
 ...crosoft.AspNetCore.AspNetCoreModule.nuspec |  2 +-
 .../AspNetCore/AspNetCore.vcxproj             |  8 ----
 .../AspNetCore/aspnetcore_schema.xml          | 39 -------------------
 .../Microsoft.AspNetCore.Server.IIS.csproj    |  4 +-
 ...tCore.Server.IntegrationTesting.IIS.csproj |  4 --
 tools/update_schema.ps1                       |  7 +---
 7 files changed, 5 insertions(+), 61 deletions(-)
 delete mode 100644 src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml

diff --git a/build/repo.targets b/build/repo.targets
index 5a2620ec75..4415123011 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -92,7 +92,7 @@
       <AncmFiles Include="%(Components.PdbLocation)" Link="%(Components.BaseOutputPath)\%(Components.Platform)\%(Components.NativeAsset).pdb" />
 
       <!-- Schema-->
-      <AncmFiles Include="$(SourceBase)AspNetCoreModuleV1\AspNetCore\aspnetcore_schema.xml" Link="AspNetCoreModuleV1\aspnetcore_schema.xml" />
+      <AncmFiles Include="$(SourceBase)AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" Link="AspNetCoreModuleV1\aspnetcore_schema.xml" />
       <AncmFiles Include="$(SourceBase)AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" Link="AspNetCoreModuleV2\aspnetcore_schema_v2.xml" />
       <AncmFiles Include="$(SourceBase)AspNetCoreModuleV2\AspNetCore\ancm.mof" Link="AspNetCoreModuleV2\ancm.mof" />
     </ItemGroup>
diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec b/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec
index 80d9490328..f05fcbbdd8 100644
--- a/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec
+++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec
@@ -25,7 +25,7 @@
     <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\aspnetcore_schema.xml"/>
+    <file src="src\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" target="aspnetcore_schema.xml"/>
     <file src="tools\installancm.ps1"/>
     <file src="LICENSE.txt"/>
     <file src="nuget\Microsoft.AspNetCore.AspNetCoreModule.props" target="build\" />
diff --git a/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj
index e1c11dddb6..169c79e503 100644
--- a/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj
+++ b/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj
@@ -213,14 +213,6 @@
   <ItemGroup>
     <None Include="Source.def" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="aspnetcore_schema.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="aspnetcore_schema.xml" />
-  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\application.cxx" />
     <ClCompile Include="src\applicationmanager.cxx" />
diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml b/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml
deleted file mode 100644
index c1590816b7..0000000000
--- a/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-    
-    IIS Asp.Net Core Extension Schema
-    
-    ** Please DO NOT edit this file yourself. **
-    
-    If you want to add configuration sections to the schema, you may place 
-    them in .xml files similar to this one, in this directory. They will be 
-    picked up automatically on startup.
-
--->
-
-<configSchema>
-  <sectionSchema name="system.webServer/aspNetCore">
-    <attribute name="processPath" type="string" expanded="true"/>
-    <attribute name="arguments" type="string" expanded="true" defaultValue=""/>
-    <attribute name="startupTimeLimit" type="uint" defaultValue="120" validationType="integerRange" validationParameter="0,3600"/> <!-- in seconds -->
-    <attribute name="shutdownTimeLimit" type="uint" defaultValue="10" validationType="integerRange" validationParameter="0,600"/>  <!-- in seconds -->   
-    <attribute name="rapidFailsPerMinute" type="uint" defaultValue="10" validationType="integerRange" validationParameter="0,100"/>
-    <attribute name="requestTimeout" type="timeSpan" defaultValue="00:02:00" validationType="timeSpanRange" validationParameter="0,1296000,60"/>
-    <attribute name="stdoutLogEnabled" type="bool" defaultValue="false" />
-    <attribute name="stdoutLogFile" type="string" defaultValue=".\aspnetcore-stdout" expanded="true"/>
-    <attribute name="processesPerApplication" type="uint" defaultValue="1" validationType="integerRange" validationParameter="1,100"/>
-    <attribute name="forwardWindowsAuthToken" type="bool" defaultValue="true" />
-    <attribute name="disableStartUpErrorPage" type="bool" defaultValue="false" />
-    <attribute name="hostingModel" type="string" />
-    <element name="recycleOnFileChange">
-      <collection addElement="file" clearElement="clear">
-        <attribute name="path" type="string" required="true" validationType="nonEmptyString" expanded="true"/>
-      </collection>
-    </element>
-    <element name="environmentVariables">
-      <collection addElement="environmentVariable" clearElement="clear" >
-        <attribute name="name" type="string" required="true" validationType="nonEmptyString"/>
-        <attribute name="value" type="string" required="true"/>
-      </collection>
-    </element>
-  </sectionSchema>
-</configSchema>
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
index 6025b459fb..0580c14e85 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
+++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
@@ -34,9 +34,7 @@
       <None Include="%(InProcessComponents.DllLocation)"
             Pack="true"
             PackagePath="runtimes/win-%(InProcessComponents.Platform)/nativeassets/$(NativeAssetsTargetFramework)" />
-      <None Include="%(InProcessComponents.PdbLocation)"
-            Pack="true"
-            PackagePath="runtimes/win-%(InProcessComponents.Platform)/nativeassets/$(NativeAssetsTargetFramework)" />
+
       <SignedPackageFile Include="%(InProcessComponents.NativeAsset)_%(InProcessComponents.Platform)"
                          PackagePath="runtimes/win-%(InProcessComponents.Platform)/nativeassets/$(NativeAssetsTargetFramework)/%(InProcessComponents.NativeAsset).dll"
                          Certificate="Microsoft" />
diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
index 766b470a50..c13eb6214b 100644
--- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
@@ -27,10 +27,6 @@
             PackageCopyToOutput="true"
             PackagePath="contentFiles/any/any/%(ShimComponents.Platform)/%(ShimComponents.PackageSubPath)"/>
 
-      <Content Include="%(ShimComponents.PdbLocation)"
-            PackageCopyToOutput="true"
-            PackagePath="contentFiles/any/any/%(ShimComponents.Platform)/%(ShimComponents.PackageSubPath)" />
-
       <SignedPackageFile Include="%(ShimComponents.NativeAsset)_%(ShimComponents.Platform)"
                          PackagePath="contentFiles/any/any/%(ShimComponents.Platform)/%(ShimComponents.PackageSubPath)%(ShimComponents.NativeAsset).dll"
                          Certificate="Microsoft" />
diff --git a/tools/update_schema.ps1 b/tools/update_schema.ps1
index 64f8248af4..2a45a3152c 100644
--- a/tools/update_schema.ps1
+++ b/tools/update_schema.ps1
@@ -15,10 +15,7 @@ $ancmSchemaFiles = @(
     "aspnetcore_schema_v2.xml"
 )
 
-$ancmSchemaFileLocations = @(
-    @(Resolve-Path "$PSScriptRoot\..\src\AspNetCoreModuleV1\AspNetCore\aspnetcore_schema.xml"),
-    @(Resolve-Path "$PSScriptRoot\..\src\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml")
-)
+$ancmSchemaFileLocation = Resolve-Path "$PSScriptRoot\..\src\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml";
 
 [bool]$isAdmin = ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")
 
@@ -46,7 +43,7 @@ if (-not $isAdmin -and -not $WhatIfPreference) {
 for ($i=0; $i -lt $ancmSchemaFiles.Length; $i++)
 {
     $schemaFile = $ancmSchemaFiles[$i]
-    $schemaSource = $ancmSchemaFileLocations[$i]
+    $schemaSource = $ancmSchemaFileLocation
 
     $destinations = @(
         "${env:ProgramFiles(x86)}\IIS Express\config\schema\",