From b674549e4fe5f38485a636e4d11c8f8008ad1118 Mon Sep 17 00:00:00 2001
From: = <johluo@microsoft.com>
Date: Mon, 12 Feb 2018 16:47:13 -0800
Subject: [PATCH] Revert "Build RID specific .All and .App symbols packages"

This reverts commit f5dc3f71f26cc92b8656ed0598d0223744e507ce.
---
 build/Publish.targets                         |  1 +
 build/SharedFx.props                          |  1 -
 build/SharedFx.targets                        | 94 ++-----------------
 build/repo.props                              |  4 +
 .../SharedFrameworkSymbols.nuspec             | 21 -----
 5 files changed, 14 insertions(+), 107 deletions(-)
 delete mode 100644 build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec

diff --git a/build/Publish.targets b/build/Publish.targets
index a8f065fdc5..0c0aee6c87 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -64,6 +64,7 @@
       <PackageArchiveFileName>nuGetPackagesArchive-$(PackageVersion).lzma</PackageArchiveFileName>
       <InstallerBaseFileName>aspnetcore-runtime-$(PackageVersion)</InstallerBaseFileName>
       <InstallerAliasBaseFileName>aspnetcore-runtime-latest</InstallerAliasBaseFileName>
+      <SymbolsArchiveBaseFileName>aspnetcore-runtime-symbols-$(PackageVersion)</SymbolsArchiveBaseFileName>
       <IntermediateInstallerBaseFileName>aspnetcore-runtime-internal-$(PackageVersion)</IntermediateInstallerBaseFileName>
     </PropertyGroup>
 
diff --git a/build/SharedFx.props b/build/SharedFx.props
index 4a3267e20d..2f35fd7778 100644
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@@ -11,7 +11,6 @@
     <_DebToolDir>$(MSBuildThisFileDirectory)tools\dotnet-deb-tool-consumer\</_DebToolDir>
     <_SharedFxSourceDir>$(RepositoryRoot).deps\Signed\SharedFx\</_SharedFxSourceDir>
     <_InstallerSourceDir>$(RepositoryRoot).deps\Installers\</_InstallerSourceDir>
-    <_SymbolsSourceDir>$(RepositoryRoot).deps\Symbols\</_SymbolsSourceDir>
     <_DockerRootDir>/opt/code/</_DockerRootDir>
     <_InstallersOutputDir>$(ArtifactsDir)installers\</_InstallersOutputDir>
     <!-- 3B = semicolon in ASCII -->
diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index 589cc66b4d..3c1502a019 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -284,18 +284,9 @@
 
     <ItemGroup>
       <IgnoredAssemblies Include="@(AppPublishAssemblies);@(AllPublishAssemblies)" Condition="'%(AssetType)' == 'native' OR '%(AssetType)' == 'resources'" />
-      <AppRuntimeAssemblies Include="@(AppPublishAssemblies)" Condition="'%(AssetType)' == 'runtime'">
-        <PortablePDB>%(RootDir)%(Directory)%(Filename).pdb</PortablePDB>
-      </AppRuntimeAssemblies>
-      <AllRuntimeAssemblies Include="@(AllPublishAssemblies)" Exclude="@(AppRuntimeAssemblies)" Condition="'%(AssetType)' == 'runtime'">
-        <PortablePDB>%(RootDir)%(Directory)%(Filename).pdb</PortablePDB>
-      </AllRuntimeAssemblies>
-      <OtherAssemblies Include="@(AppPublishAssemblies);@(AllPublishAssemblies)" Exclude="@(IgnoredAssemblies);@(AppRuntimeAssemblies);@(AllRuntimeAssemblies)" />
       <_AssembliesToCrossgen Include="$(SharedFxIntermediateOutputPath)**\*.dll" />
     </ItemGroup>
 
-    <Error Text="Unaccounted shared framework assemblies found: @(OtherAssemblies). Assemblies must be included as runtime assemblies or marked as ignored." Condition="'@(OtherAssemblies)' != ''" />
-
     <!-- Compute the intersection of crossgen candidates and native/resources assemblies as the set of assemblies to skip crossgen -->
     <CreateItem Include="@(_AssembliesToCrossgen)" Condition="'%(Filename)' != ''and '@(IgnoredAssemblies)' != ''">
       <Output TaskParameter="Include" ItemName="AssembliesToRemove"/>
@@ -312,14 +303,6 @@
       </AssembliesToCrossgen>
       <AssembliesToCrossgen Remove="@(AssembliesToRemove)" />
     </ItemGroup>
-
-    <!-- Compute the intersection of runtime assemblies and assemblies to crossgen to resolve the set of portablePDBs to publish -->
-    <CreateItem Include="@(AppRuntimeAssemblies)" Condition="'%(Filename)' != ''and '@(AssembliesToCrossgen)' != ''">
-      <Output TaskParameter="Include" ItemName="AppPortablePDBsToPublish"/>
-    </CreateItem>
-    <CreateItem Include="@(AllRuntimeAssemblies)" Condition="'%(Filename)' != ''and '@(AssembliesToCrossgen)' != ''">
-      <Output TaskParameter="Include" ItemName="AllPortablePDBsToPublish"/>
-    </CreateItem>
   </Target>
 
   <Target Name="CrossGenAssemblies"
@@ -367,77 +350,19 @@
     <Exec Command="$(SharedFxCrossGenToolDirectory)$(CrossGenTool) @%(AssembliesToCrossgen.SymbolsRsp)" EnvironmentVariables="COMPlus_PartialNGen=0" />
   </Target>
 
-  <Target Name="_BuildSharedFxSymbols">
-    <PropertyGroup>
-      <SymbolsPackageId>runtime.$(SharedFxRID).$(SymbolsNuspecIdSuffix)</SymbolsPackageId>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <_SymbolFiles Include="$(SymbolsWorkDir)**\*.pdb;$(SymbolsWorkDir)**\*.map" />
-      <SymbolFiles Include="@(_SymbolFiles)">
-        <PackagePath>%(RecursiveDir)%(Filename)%(Extension)</PackagePath>
-      </SymbolFiles>
-    </ItemGroup>
-
-    <!-- Create Layout -->
-    <Copy
-      SourceFiles="$(_TemplatesDir)SharedFxSymbols\SharedFrameworkSymbols.nuspec"
-      DestinationFiles="$(SymbolsWorkDir)$(SymbolsPackageId).nuspec"
-      OverwriteReadOnlyFiles="True" />
-
-    <!-- Produce symbols nupkg -->
-    <PackNuspec NuspecPath="$(SymbolsWorkDir)$(SymbolsPackageId).nuspec"
-      DestinationFolder="$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))symbols\"
-      Properties="version=$(PackageVersion);id=$(SymbolsPackageId);description=$(Description);Configuration=$(Configuration)"
-      Overwrite="true"
-      PackageFiles="@(SymbolFiles)"
-      BasePath="$(SymbolsWorkDir)" />
-  </Target>
-
-  <Target Name="PackSharedFx" DependsOnTargets="DefineSharedFxPrerequisites" >
-    <PropertyGroup>
-      <AppSharedFxSymbolsDirectory>$(_WorkRoot)Symbols\Microsoft.AspNetCore.App\</AppSharedFxSymbolsDirectory>
-      <AllSharedFxSymbolsDirectory>$(_WorkRoot)Symbols\Microsoft.AspNetCore.All\</AllSharedFxSymbolsDirectory>
-    </PropertyGroup>
-
+  <Target Name="PackSharedFx">
     <ItemGroup>
       <CrossGenOutput Include="$(SharedFxCrossGenDirectory)**\*.dll" />
-      <AppCrossGenSymbols Include="$(SharedFxCrossGenDirectory)shared\Microsoft.AspNetCore.App\$(PackageVersion)\**\*" Exclude="@(CrossGenOutput)" />
-      <AllCrossGenSymbols Include="$(SharedFxCrossGenDirectory)shared\Microsoft.AspNetCore.All\$(PackageVersion)\**\*" Exclude="@(CrossGenOutput)" />
+      <CrossGenSymbols Include="$(SharedFxCrossGenDirectory)**\*" Exclude="@(CrossGenOutput)" />
     </ItemGroup>
 
-    <!-- Copy over PDBs  -->
-    <Copy
-      SourceFiles="%(AppPortablePDBsToPublish.PortablePDB)"
-      DestinationFolder="$(AppSharedFxSymbolsDirectory)runtimes\$(SharedFxRID)\lib\netcoreapp2.1"
-      OverwriteReadOnlyFiles="True"
-      Condition="Exists('%(AppPortablePDBsToPublish.PortablePDB)')" />
-    <Copy
-      SourceFiles="%(AllPortablePDBsToPublish.PortablePDB)"
-      DestinationFolder="$(AllSharedFxSymbolsDirectory)runtimes\$(SharedFxRID)\lib\netcoreapp2.1"
-      OverwriteReadOnlyFiles="True"
-      Condition="Exists('%(AllPortablePDBsToPublish.PortablePDB)')" />
-    <Copy
-      SourceFiles="@(AppCrossGenSymbols)"
-      DestinationFolder="$(AppSharedFxSymbolsDirectory)runtimes\$(SharedFxRID)\lib\netcoreapp2.1"
-      OverwriteReadOnlyFiles="True" />
-    <Copy
-      SourceFiles="@(AllCrossGenSymbols)"
-      DestinationFolder="$(AllSharedFxSymbolsDirectory)runtimes\$(SharedFxRID)\lib\netcoreapp2.1"
-      OverwriteReadOnlyFiles="True" />
-
-    <!-- Create symbols nupkg -->
-    <PropertyGroup>
-      <AppSymbolsArguments>SymbolsWorkDir=$(AppSharedFxSymbolsDirectory)</AppSymbolsArguments>
-      <AppSymbolsArguments>$(AppSymbolsArguments);SymbolsNuspecIdSuffix=Microsoft.AspNetCore.App.symbols</AppSymbolsArguments>
-      <AppSymbolsArguments>$(AppSymbolsArguments);Description=Symbol packages for Microsoft.AspNetCore.App shared framework</AppSymbolsArguments>
-      <AllSymbolsArguments>SymbolsWorkDir=$(AllSharedFxSymbolsDirectory)</AllSymbolsArguments>
-      <AllSymbolsArguments>$(AllSymbolsArguments);SymbolsNuspecIdSuffix=Microsoft.AspNetCore.All.symbols</AllSymbolsArguments>
-      <AllSymbolsArguments>$(AllSymbolsArguments);Description=Symbol packages for Microsoft.AspNetCore.All shared framework</AllSymbolsArguments>
-    </PropertyGroup>
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_BuildSharedFxSymbols" Properties="$(AppSymbolsArguments)" />
-    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_BuildSharedFxSymbols" Properties="$(AllSymbolsArguments)" />
+    <!-- Create symbols archive -->
+    <ZipArchive
+      File="$(SharedFxOutputPath)$(SharedFxInstallerName)-symbols-$(PackageVersion)-$(SharedFxRID).zip"
+      SourceFiles="@(CrossGenSymbols)"
+      WorkingDirectory="$(SharedFxCrossGenDirectory)"
+      Overwrite="true"
+      Condition="$([MSBuild]::IsOSPlatform('Linux')) OR $([MSBuild]::IsOSPlatform('Windows'))"/>
 
     <!-- Replace assemblies with crossgen output -->
     <Copy
@@ -458,5 +383,4 @@
   </Target>
 
   <Target Name="BuildSharedFx" DependsOnTargets="ResolveSharedFxFiles;CrossGenAssemblies;CrossGenSymbols;PackSharedFx"/>
-
 </Project>
diff --git a/build/repo.props b/build/repo.props
index 4a773a8f0a..d7ece91600 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -25,6 +25,10 @@
     <IntermediateInstaller Include="osx-x64" FileExt=".tar.gz" />
     <IntermediateInstaller Include="linux-x64" FileExt=".tar.gz" />
 
+    <RuntimeSymbolsArchive Include="win-x86" FileExt=".zip" />
+    <RuntimeSymbolsArchive Include="win-x64" FileExt=".zip" />
+    <RuntimeSymbolsArchive Include="linux-x64" FileExt=".tar.gz" />
+
     <NativeInstaller Include="win-x86" FileExt=".exe" />
     <NativeInstaller Include="win-x86" FileExt=".zip" />
     <NativeInstaller Include="win-x64" FileExt=".exe" />
diff --git a/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec b/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec
deleted file mode 100644
index fed64a5849..0000000000
--- a/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-  <metadata>
-    <id>$ID$</id>
-    <version>$VERSION$</version>
-    <description>$DESCRIPTION$</description>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <copyright>Copyright © Microsoft Corporation</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt</licenseUrl>
-    <iconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <projectUrl>https://asp.net</projectUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <serviceable Condition="'$(Configuration)' == 'Release'">true</serviceable>
-    <tags>aspnetcore</tags>
-  </metadata>
-  <files>
-    <file src="**\*.pdb" target="" />
-    <file src="**\*.map" target="" />
-  </files>
-</package>