Fix packaging

src/Compilers/CSharp/Portable/FlowAnalysis/NullableWalker.cs

@@ -4952,7 +4952,7 @@ public override BoundNode VisitUnaryOperator(BoundUnaryOperator node)
         public override BoundNode VisitPointerIndirectionOperator(BoundPointerIndirectionOperator node)
         {
             var result = base.VisitPointerIndirectionOperator(node);
-            var type = TypeSymbolWithAnnotations.Create( node.Type);
+            var type = TypeSymbolWithAnnotations.Create(node.Type);
             SetResult(type, type);
             return result;
         }
@@ -4960,7 +4960,7 @@ public override BoundNode VisitPointerIndirectionOperator(BoundPointerIndirectio
         public override BoundNode VisitPointerElementAccess(BoundPointerElementAccess node)
         {
             var result = base.VisitPointerElementAccess(node);
-            var type = TypeSymbolWithAnnotations.Create( node.Type);
+            var type = TypeSymbolWithAnnotations.Create(node.Type);
             SetResult(type, type);
             return result;
         }

src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj

 <!-- 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 Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
     <RoslynProjectType>Custom</RoslynProjectType>
 
     <IsPackable>true</IsPackable>
@@ -17,6 +17,9 @@
     </PackageDescription>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage</TargetsForTfmSpecificContentInPackage>
     <NoWarn>$(NoWarn);NU5100</NoWarn>
+
+    <_DependsOn Condition="'$(TargetFramework)' == 'net472'">InitializeDesktopCompilerArtifacts</_DependsOn>
+    <_DependsOn Condition="'$(TargetFramework)' == 'netcoreapp2.1'">InitializeCoreClrCompilerArtifacts</_DependsOn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,9 +28,16 @@
     <ProjectReference Include="..\..\Interactive\csi\csi.csproj" PrivateAssets="All"/>
     <ProjectReference Include="..\..\Compilers\Core\MSBuildTask\Microsoft.Build.Tasks.CodeAnalysis.csproj" PrivateAssets="All"/>
     <ProjectReference Include="..\..\Compilers\Server\VBCSCompiler\VBCSCompiler.csproj" PrivateAssets="All"/>
+
+    <ProjectReference Update="@(ProjectReference)"
+                      Targets="Publish"
+                      ReferenceOutputAssembly="false"
+                      SkipGetTargetFrameworkProperties="true"
+                      Condition="'$(TargetFramework)' == 'netcoreapp2.1'"
+                      SetTargetFramework="TargetFramework=netcoreapp2.1" />
   </ItemGroup>
 
-  <Target Name="_GetFilesToPackage" DependsOnTargets="InitializeDesktopCompilerArtifacts;InitializeCoreClrCompilerArtifacts">
+  <Target Name="_GetFilesToPackage" DependsOnTargets="$(_DependsOn)">
     <ItemGroup>
       <_File Include="@(DesktopCompilerArtifact)" TargetDir="tasks/net472"/>
       <_File Include="@(DesktopCompilerResourceArtifact)" TargetDir="tasks/net472"/>
@@ -36,14 +46,14 @@
       <_File Include="@(CoreClrCompilerBinArtifact)" TargetDir="tasks/netcoreapp2.1/bincore"/>
       <_File Include="@(CoreClrCompilerBinRuntimesArtifact)" TargetDir="tasks/netcoreapp2.1/bincore/runtimes"/>
      
-      <_File Include="$(MSBuildProjectDirectory)\build\**\*.*" TargetDir="build" />
-      <_File Include="$(MSBuildProjectDirectory)\build\**\*.*" TargetDir="buildMultiTargeting" />
+      <_File Include="$(MSBuildProjectDirectory)\build\**\*.*" Condition="'$(TargetFramework)' == 'net472'" TargetDir="build" />
+      <_File Include="$(MSBuildProjectDirectory)\build\**\*.*" Condition="'$(TargetFramework)' == 'net472'" TargetDir="buildMultiTargeting" />
         <!-- build multitargeting directory -->
      
       <TfmSpecificPackageFile Include="@(_File)" PackagePath="%(_File.TargetDir)/%(_File.RecursiveDir)%(_File.FileName)%(_File.Extension)" />
     </ItemGroup>
   </Target>
 
-  <Import Project="DesktopCompilerArtifacts.targets"/>
-  <Import Project="CoreClrCompilerArtifacts.targets"/>
+  <Import Project="DesktopCompilerArtifacts.targets" Condition="'$(TargetFramework)' == 'net472'" />
+  <Import Project="CoreClrCompilerArtifacts.targets" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
 </Project>