Finished initial round of NuPkg changes

529bb615 · Jared Parsons · 631b4550 · 529bb615 · 631b4550 · 631b4550
7 changed file
--- a/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj
+++ b/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj
@@ -30,48 +30,16 @@
                      SetTargetFramework="TargetFramework=$(TargetFramework)" />
  </ItemGroup>

-  <Target Name="_GetFilesToPackage">
+  <Target Name="_GetFilesToPackage" DependsOnTargets="InitializeCoreClrCompilerArtifacts">
    <ItemGroup>
-      <_File Include="$(MSBuildProjectDirectory)\build\**" TargetDir="build" />
-      <_File Include="$(MSBuildProjectDirectory)\tools\bincore\*.cmd" TargetDir="tools\bincore" />
-
-      <_File Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\netcoreapp2.1\publish\*.targets" TargetDir="tools" />
-      <_File Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\netcoreapp2.1\publish\Microsoft.Build.Tasks.CodeAnalysis.dll" TargetDir="tools" />
-      <_File Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\netcoreapp2.1\publish\**\Microsoft.Build.Tasks.CodeAnalysis.resources.dll" TargetDir="tools" />
-      <_File Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\netcoreapp2.1\publish\runtimes\**\*.*" TargetDir="tools\runtimes" />
-
-      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.dll" TargetDir="tools\bincore" />
-      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis\$(Configuration)\netstandard2.0\**\Microsoft.CodeAnalysis.resources.dll" TargetDir="tools\bincore" />
-
-      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.CSharp\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll" TargetDir="tools\bincore" />
-      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.CSharp\$(Configuration)\netstandard2.0\**\Microsoft.CodeAnalysis.CSharp.resources.dll" TargetDir="tools\bincore" />
-
-      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.VisualBasic\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll" TargetDir="tools\bincore" />
-      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.VisualBasic\$(Configuration)\netstandard2.0\**\Microsoft.CodeAnalysis.VisualBasic.resources.dll" TargetDir="tools\bincore" />
-
-      <_File Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp2.1\publish\csc.dll" TargetDir="tools\bincore" />
-      <_File Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp2.1\publish\csc.deps.json" TargetDir="tools\bincore" />
-      <_File Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp2.1\publish\csc.runtimeconfig.json" TargetDir="tools\bincore" />
-
-      <_File Include="$(ArtifactsBinDir)vbc\$(Configuration)\netcoreapp2.1\publish\vbc.dll" TargetDir="tools\bincore" />
-      <_File Include="$(ArtifactsBinDir)vbc\$(Configuration)\netcoreapp2.1\publish\vbc.deps.json" TargetDir="tools\bincore" />
-      <_File Include="$(ArtifactsBinDir)vbc\$(Configuration)\netcoreapp2.1\publish\vbc.runtimeconfig.json" TargetDir="tools\bincore" />
-
-      <_File Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\netcoreapp2.1\publish\VBCSCompiler.dll" TargetDir="tools\bincore" />
-      <_File Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\netcoreapp2.1\publish\VBCSCompiler.deps.json" TargetDir="tools\bincore" />
-      <_File Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\netcoreapp2.1\publish\VBCSCompiler.runtimeconfig.json" TargetDir="tools\bincore" />
-
-      <!-- References that are either not in the target framework or are a higher version -->
-      <!-- N.B.: The backslashes below cannot be replaced with forward slashes.
-         https://github.com/NuGet/Home/issues/3584 -->
-      <_File Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp2.1\publish\System.*.dll" TargetDir="tools\bincore" />
-      <_File Include="$(ArtifactsBinDir)csc\$(Configuration)\netcoreapp2.1\publish\runtimes\**" TargetDir="tools\bincore\runtimes" />
+      <_File Include="@(CoreClrCompilerBuildArtifact)" TargetDir="build"/>
+      <_File Include="@(CoreClrCompilerToolsArtifact)" TargetDir="tools"/>
+      <_File Include="@(CoreClrCompilerBinArtifact)" TargetDir="tools\bincore"/>
+      <_File Include="@(CoreClrCompilerBinRuntimesArtifact)" TargetDir="tools\bincore\runtimes"/>

      <TfmSpecificPackageFile Include="@(_File)" PackagePath="%(_File.TargetDir)\%(_File.RecursiveDir)%(_File.FileName)%(_File.Extension)"/>
-
-      <!-- If PackagePath doesn't have an extension NuGet considers it a directory name, so we need to handle these file explicitly -->
-      <TfmSpecificPackageFile Include="$(MSBuildProjectDirectory)\tools\bincore\RunCsc" PackagePath="tools\bincore\" />
-      <TfmSpecificPackageFile Include="$(MSBuildProjectDirectory)\tools\bincore\RunVbc" PackagePath="tools\bincore\" />
    </ItemGroup>
  </Target>
-</Project>
\ No newline at end of file
+
+  <Import Project="..\Microsoft.Net.Compilers.Toolset\CoreClrCompilerArtifacts.targets"/>
+</Project>
--- a/src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunCsc
+++ b/src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunCsc
-#!/bin/sh
-
-set -e
-set -u
-
-THISDIR=$(dirname $0)
-
-# The expression ${VAR:-TEXT} expands to:
-#  If VAR is null or empty => TEXT
-#  If VAR is non-empty => ${VAR}
-# So: If DOTNET_HOST_PATH is set, use it, otherwise use unqualified dotnet
-HOST_PATH=${DOTNET_HOST_PATH:-dotnet}
-
-exec "${HOST_PATH}" "$THISDIR/csc.dll" "$@"
--- a/src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunCsc.cmd
+++ b/src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunCsc.cmd
-@echo off
-if defined DOTNET_HOST_PATH (
-    set HOST_PATH=%DOTNET_HOST_PATH%
-) else (
-    set HOST_PATH=dotnet
-)
-"%HOST_PATH%" "%~dp0\csc.dll" %*
--- a/src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunVbc
+++ b/src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunVbc
-#!/bin/sh
-
-set -e
-set -u
-
-THISDIR=$(dirname $0)
-
-# The expression ${VAR:-TEXT} expands to:
-#  If VAR is null or empty => TEXT
-#  If VAR is non-empty => ${VAR}
-# So: If DOTNET_HOST_PATH is set, use it, otherwise use unqualified dotnet
-HOST_PATH=${DOTNET_HOST_PATH:-dotnet}
-
-exec "${HOST_PATH}" "$THISDIR/vbc.dll" "$@"
--- a/src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunVbc.cmd
+++ b/src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunVbc.cmd
-@echo off
-if defined DOTNET_HOST_PATH (
-    set HOST_PATH=%DOTNET_HOST_PATH%
-) else (
-    set HOST_PATH=dotnet
-)
-"%HOST_PATH%" "%~dp0\vbc.dll" %*
--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets
+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets
@@ -9,7 +9,6 @@
  <Target Name="InitializeCoreClrCompilerArtifacts">
    <ItemGroup>
      <CoreClrCompilerBuildArtifact Include="$(MSBuildProjectDirectory)\build\**" />
-      <CoreClrCompilerToolsArtifact Include="$(MSBuildProjectDirectory)\tools\bincore\*.cmd" />

      <CoreClrCompilerToolsArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\netcoreapp2.1\publish\*.targets" />
      <CoreClrCompilerToolsArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\netcoreapp2.1\publish\Microsoft.Build.Tasks.CodeAnalysis.dll" />

--- a/src/NuGet/Microsoft.Net.Compilers/CompilerArtifacts.targets
+++ b/src/NuGet/Microsoft.Net.Compilers/CompilerArtifacts.targets
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
-<Project>
-
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-
-  <!--
-    The CompilerArtifact list is used to generate Microsoft.Net.Compilers package, VS.Toolset.Roslyn CoreXT package and Microsoft.CodeAnalysis.Compilers Willow VSIX.
-    Keeping the list in central location allows us to make sure that these packages include the same files.
-
-    Ngen* attributes indicate how VS should NGEN the assemblies that are distributed by VS Setup.
-    NgenApplication is relative to the Roslyn install directory within MSBuild (i.e. MSBuild\15.0\Bin\Roslyn).
-
-    Set OverwriteOptimizationData to true to replace optimization data already embedded in the assembly with data retrieved from VS training scenarios.
-    We only need to specify this for assemblies built outside or Roslyn repo since the projects in Roslyn repo are responsible for embedding 
-    VS training data to the assemblies they produce.
-  -->
-
-  <Target Name="InitializeCompilerArtifacts">
-    <ItemGroup>
-      
-      <!-- The Roslyn built binaries must be taken from these locations because this is the location where signing occurs -->
-      <CompilerArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.dll" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis\$(Configuration)\netstandard2.0\Microsoft.DiaSymReader.Native.amd64.dll"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis\$(Configuration)\netstandard2.0\Microsoft.DiaSymReader.Native.x86.dll"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.CSharp\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.Scripting\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.Scripting.dll" NgenArchitecture="all" NgenApplication="csi.exe"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.CSharp.Scripting\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Scripting.dll" NgenArchitecture="all" NgenApplication="csi.exe"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.VisualBasic\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\net472\csc.exe" NgenArchitecture="all" NgenApplication="csc.exe" NgenPriority="1"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\net472\csc.exe.config"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\net472\csc.rsp"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\csi.exe" NgenArchitecture="all" NgenApplication="csi.exe" NgenPriority="1"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\csi.exe.config"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\csi.rsp"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)vbc\$(Configuration)\net472\vbc.exe" NgenArchitecture="all" NgenApplication="vbc.exe" NgenPriority="1"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)vbc\$(Configuration)\net472\vbc.exe.config"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)vbc\$(Configuration)\net472\vbc.rsp"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\net472\VBCSCompiler.exe" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe" NgenPriority="1"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\net472\VBCSCompiler.exe.config"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\net472\Microsoft.Build.Tasks.CodeAnalysis.dll" NgenArchitecture="all" />
-      <CompilerArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\net472\Microsoft.Managed.Core.targets"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\net472\Microsoft.CSharp.Core.targets"/>
-      <CompilerArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\net472\Microsoft.VisualBasic.Core.targets"/>
-
-      <!--
-        Do not overwrite optimization data of System.Threading.Tasks.Extensions.dll
-        This assembly is signed by Open key in CoreFX and MicroBuild does not support this key.
-        Arcade SignTool doesn't support signing directly at this point either.
-        https://github.com/dotnet/arcade/issues/1204
-        
-        We don't currently collect optimization data for the following assemblies.
-      -->
-      <_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Threading.Tasks.Extensions.dll"/>
-      <_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Buffers.dll"/>
-      <_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Memory.dll"/>
-      <_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Numerics.Vectors.dll"/>      
-      
-      <!--
-        System.Numerics.Vector requires JIT, since its size is dynamic and based on the underlying CPU support.
-      -->
-      <_NoNGen Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Numerics.Vectors.dll"/>
-      
-      <CompilerArtifact Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.*.dll" Exclude="@(_NoOptimizationData)" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe" OverwriteNgenOptimizationData="true"/>
-      <CompilerArtifact Include="@(_NoOptimizationData)" Exclude="@(_NoNGen)" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe" OverwriteNgenOptimizationData="false"/>
-      <CompilerArtifact Include="@(_NoNGen)" />
-    </ItemGroup>
-  </Target>
-</Project>