From 0ba800841b351e2646a5ccee53f46d4a6380463f Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 26 Oct 2018 16:00:48 -0700
Subject: [PATCH] Ensure build output is still present when crossgen is
 disabled

* Split targets for copying outputs and preparing the crossgen tool
* Fix version override check by only looking at the 'pinned' section
---
 build/SharedFx.targets               |  1 +
 build/tasks/CheckVersionOverrides.cs |  2 +-
 eng/targets/SharedFx.Common.targets  | 52 +++++++++++++++-------------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index f5db4c1b86..f70618067c 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -22,6 +22,7 @@
       <_RestoreGraphProjectInput>@(ProjectToBuild)</_RestoreGraphProjectInput>
       <SharedFxBuildProperties>
         $(SolutionProperties);
+        SharedFxRid=$(SharedFxRid);
         DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);
         DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath)
       </SharedFxBuildProperties>
diff --git a/build/tasks/CheckVersionOverrides.cs b/build/tasks/CheckVersionOverrides.cs
index ad75aa8b2b..a510a8b800 100644
--- a/build/tasks/CheckVersionOverrides.cs
+++ b/build/tasks/CheckVersionOverrides.cs
@@ -24,7 +24,7 @@ namespace RepoTasks
             var versionOverrides = ProjectRootElement.Open(DotNetPackageVersionPropsPath);
             var dependencies = ProjectRootElement.Open(DependenciesFile);
             var pinnedVersions = dependencies.PropertyGroups
-                .Where(p => !string.Equals("Package Versions: Auto", p.Label))
+                .Where(p => string.Equals("Package Versions: Pinned", p.Label))
                 .SelectMany(p => p.Properties)
                 .ToDictionary(p => p.Name, p => p.Value, StringComparer.OrdinalIgnoreCase);
 
diff --git a/eng/targets/SharedFx.Common.targets b/eng/targets/SharedFx.Common.targets
index 6102fa6279..4f83af1176 100644
--- a/eng/targets/SharedFx.Common.targets
+++ b/eng/targets/SharedFx.Common.targets
@@ -20,20 +20,21 @@ This targets file should only be imported by .shfxproj files.
       GeneratePublishDependencyFile;
       GenerateSharedFxDependencyFile;
       GeneratePublishRuntimeConfigurationFile;
-      OptimizeOutput;
+      CopySharedFxToOutput;
+      CollectSharedFxOutput;
       PostBuildEvent;
       GetTargetPath;
     </CoreBuildDependsOn>
 
-    <OptimizeOutputDependsOn Condition=" '$(CrossGenOutput)' != 'false' ">
+    <CollectOutputSharedFxDependsOn Condition=" '$(CrossGenOutput)' != 'false' ">
       PrepareForCrossGen;
       CrossGenAssemblies;
-    </OptimizeOutputDependsOn>
+    </CollectOutputSharedFxDependsOn>
 
-    <OptimizeOutputDependsOn Condition=" '$(CrossgenSymbolsOutput)' != 'false' ">
-      $(OptimizeOutputDependsOn);
+    <CollectOutputSharedFxDependsOn Condition=" '$(CrossgenSymbolsOutput)' != 'false' ">
+      $(CollectOutputSharedFxDependsOn);
       CrossGenSymbols;
-    </OptimizeOutputDependsOn>
+    </CollectOutputSharedFxDependsOn>
 
     <PrepareForBuildDependsOn>
       PrepareOutputPaths;
@@ -71,9 +72,8 @@ This targets file should only be imported by .shfxproj files.
 
     <IntermediateOutputPath>$(IntermediateOutputPath)$(SharedFxRid)\</IntermediateOutputPath>
 
-    <!-- Override the SDK Default for this location based on whether crossgen happens or not. -->
-    <PublishDir Condition=" '$(CrossGenOutput)' != 'true' ">$(OutputPath)</PublishDir>
-    <PublishDir Condition=" '$(CrossGenOutput)' == 'true' ">$(IntermediateOutputPath)u\</PublishDir>
+    <!-- Override the SDK Default for this location for copying published output. -->
+    <PublishDir>$(IntermediateOutputPath)u\</PublishDir>
 
     <!-- If symbols generation is disabled, there is no use in producing a symbols.nupkg files. -->
     <IncludeSymbols Condition="'$(CrossgenSymbolsOutput)' == 'false'">false</IncludeSymbols>
@@ -195,14 +195,30 @@ This targets file should only be imported by .shfxproj files.
   </Target>
 
   <!-- Optimizes shared framework output -->
-  <Target Name="OptimizeOutput" DependsOnTargets="$(OptimizeOutputDependsOn)">
+  <Target Name="CollectSharedFxOutput" DependsOnTargets="$(CollectOutputSharedFxDependsOn)">
     <Message Importance="High" Text="$(SharedFxName) (fx: $(SharedFxRid)) -> $(OutputPath)" />
   </Target>
 
   <!-- Prepare the project to run crossgen. -->
-  <Target Name="PrepareForCrossGen" DependsOnTargets="RunResolvePackageDependencies;RunResolvePublishAssemblies">
+  <Target Name="CopySharedFxToOutput" DependsOnTargets="RunResolvePackageDependencies;RunResolvePublishAssemblies">
+    <ItemGroup>
+      <NativeAssetsToPublish Include="@(ResolvedAssembliesToPublish)" Condition="'%(AssetType)' == 'native' " />
+      <ResourceAssetsToPublish Include="@(ResolvedAssembliesToPublish)" Condition="'%(AssetType)' == 'resources'" />
+      <RuntimeAssetsToPublish Include="@(ResolvedAssembliesToPublish)" Condition="'%(AssetType)' == 'runtime'" />
+      <OtherAssemblies Include="@(ResolvedAssembliesToPublish)" Exclude="@(NativeAssetsToPublish);@(ResourceAssetsToPublish);@(RuntimeAssetsToPublish)" />
+    </ItemGroup>
 
+    <Error Text="Unaccounted shared framework assemblies found: @(OtherAssemblies). These files have an unknown asset type." Condition="'@(OtherAssemblies)' != ''" />
+
+    <Copy Condition=" '$(CrossGenOutput)' != 'true' "
+          SourceFiles="@(RuntimeAssetsToPublish)" DestinationFiles="@(RuntimeAssetsToPublish->'$(RuntimeAssetsOutputPath)%(DestinationSubPath)')" />
+    <Copy SourceFiles="@(NativeAssetsToPublish)" DestinationFiles="@(NativeAssetsToPublish->'$(NativeAssetsOutputPath)%(DestinationSubPath)')" />
+    <Copy SourceFiles="@(ResourceAssetsToPublish)" DestinationFiles="@(ResourceAssetsToPublish->'$(RuntimeAssetsOutputPath)%(DestinationSubPath)')" />
+  </Target>
+
+  <Target Name="PrepareForCrossGen" DependsOnTargets="RunResolvePackageDependencies;RunResolvePublishAssemblies">
     <MakeDir Directories="$(CrossGenToolDir)" />
+
     <PropertyGroup>
       <RuntimePackageName>Microsoft.NETCore.App</RuntimePackageName>
       <CrossGenTool>crossgen</CrossGenTool>
@@ -231,15 +247,6 @@ This targets file should only be imported by .shfxproj files.
     <Error Text="Could not find crossgen in %(RuntimePackage.ResolvedPath)" Condition="@(CrossGenToolFile->Count()) == 0" />
     <Error Text="Expected to resolve a single clr jit assembly but instead resolved @(ClrJitAssembly->Count()) with identities %(ClrJitAssembly.Identity)" Condition="'@(ClrJitAssembly->Count())' != 1" />
 
-    <ItemGroup>
-      <NativeAssetsToPublish Include="@(ResolvedAssembliesToPublish)" Condition="'%(AssetType)' == 'native' " />
-      <ResourceAssetsToPublish Include="@(ResolvedAssembliesToPublish)" Condition="'%(AssetType)' == 'resources'" />
-      <RuntimeAssetsToPublish Include="@(ResolvedAssembliesToPublish)" Condition="'%(AssetType)' == 'runtime'" />
-      <OtherAssemblies Include="@(ResolvedAssembliesToPublish)" Exclude="@(NativeAssetsToPublish);@(ResourceAssetsToPublish);@(RuntimeAssetsToPublish)" />
-    </ItemGroup>
-
-    <Error Text="Unaccounted shared framework assemblies found: @(OtherAssemblies). These files have an unknown asset type." Condition="'@(OtherAssemblies)' != ''" />
-
     <!-- Resolve list of assemblies to crossgen -->
     <ItemGroup>
       <AssembliesToCrossgen Include="@(RuntimeAssetsToPublish)">
@@ -251,9 +258,6 @@ This targets file should only be imported by .shfxproj files.
         <Symbols>$(SymbolsOutputPath)%(RecursiveDir)</Symbols>
       </AssembliesToCrossgen>
     </ItemGroup>
-
-    <Copy SourceFiles="@(NativeAssetsToPublish)" DestinationFiles="@(NativeAssetsToPublish->'$(NativeAssetsOutputPath)%(DestinationSubPath)')" />
-    <Copy SourceFiles="@(ResourceAssetsToPublish)" DestinationFiles="@(ResourceAssetsToPublish->'$(RuntimeAssetsOutputPath)%(DestinationSubPath)')" />
   </Target>
 
   <!--
@@ -261,7 +265,7 @@ This targets file should only be imported by .shfxproj files.
     This uses .rsp files to get around OS limitations in the maximum number of characters that can be passed in on command-line.
   -->
   <Target Name="CrossGenAssemblies"
-    DependsOnTargets="PrepareForCrossGen;ResolveReferences"
+    DependsOnTargets="CopySharedFxToOutput;ResolveReferences"
     Inputs="@(AssembliesToCrossgen)"
     Outputs="%(AssembliesToCrossgen.Destination)">