Add fixes for dotnet/sdk#1360 (comment) and set existing workarounds …

…for < 2.0 sdk

appveyor.yml

@@ -5,7 +5,7 @@ skip_commits:
     - '**/*.md'
 
 build_script:
-  - cmd: nuget pack MSBuild.Sdk.Extras.nuspec -Version 1.0.3-beta.%APPVEYOR_BUILD_NUMBER% -NoPackageAnalysis
+  - cmd: nuget pack MSBuild.Sdk.Extras.nuspec -Version 1.0.4-beta.%APPVEYOR_BUILD_NUMBER% -NoPackageAnalysis
 
 artifacts:
   - path: '*.nupkg'

src/build/netstandard1.0/MSBuild.Sdk.Extras.props

@@ -1,5 +1,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <MSBuildSDKExtrasTargets>$(MSBuildThisFileDirectory)MSBuildSdkExtras.Common.targets</MSBuildSDKExtrasTargets>
+
+    <!-- Detect the SDK version. For now, we have to check the  BundledNETCoreAppTargetFrameworkVersion prop 
+         since there's no separate SDK version property
+     -->
+    <_ExtrasSdkVersion>$(BundledNETCoreAppTargetFrameworkVersion)</_ExtrasSdkVersion>
+    <_ExtrasSdkVersion Condition="'$(_ExtrasSdkVersion)' == ''">1.0</_ExtrasSdkVersion>    
   </PropertyGroup>
 </Project>

src/build/netstandard1.0/MSBuild.Sdk.Extras.targets

@@ -1,11 +1,12 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.Build.Tasks.Pack\build\NuGet.Build.Tasks.Pack.targets"/>
+  <Import Condition="'$(_ExtrasSdkVersion)' &lt; 2.0 "
+    Project="$(MSBuildThisFileDirectory)..\NuGet.Build.Tasks.Pack\build\NuGet.Build.Tasks.Pack.targets"/>
 
   <!-- https://raw.githubusercontent.com/AArnott/NuGet4698Workaround/master/build/NuGet4698Workaround.targets -->
   <Target Name="PackSatelliteAssemblies"
           BeforeTargets="_WalkEachTargetPerFramework"
           DependsOnTargets="SatelliteDllsProjectOutputGroupWithTargetFramework"
-          Condition=" '$(IncludeBuildOutput)' != 'false' ">
+          Condition=" '$(IncludeBuildOutput)' != 'false' and '$(_ExtrasSdkVersion)' &lt; 2.0">
     <ItemGroup>
       <Content Include="@(_SatelliteDllsProjectOutputGroupOutputWithTargetFramework)"
                Condition=" '%(_SatelliteDllsProjectOutputGroupOutputWithTargetFramework.Culture)' != '' ">
@@ -31,4 +32,18 @@
       </_SatelliteDllsProjectOutputGroupOutputWithTargetFramework>
     </ItemGroup>
   </Target>
+
+
+<!-- Work around bug in Microsoft.NET.Sdk < v2.0 where satellites were deployed on top of each other in root. -->
+  <!-- https://github.com/dotnet/sdk/issues/1360 -->
+  <Target Name="WorkaroundIncorrectSatelliteDeployment" 
+          AfterTargets="ResolveLockFileCopyLocalProjectDeps"
+          Condition="'$(_ExtrasSdkVersion)' &lt; 2.0 " >
+    <ItemGroup>
+      <ReferenceCopyLocalPaths Remove="@(ResourceCopyLocalItems)" />
+      <ReferenceCopyLocalPaths Include="@(ResourceCopyLocalItems)">
+        <DestinationSubDirectory>$([System.IO.Directory]::GetParent(%(ResourceCopyLocalItems.FullPath)).get_Name())\</DestinationSubDirectory>
+      </ReferenceCopyLocalPaths>
+    </ItemGroup>
+  </Target>
 </Project>

src/buildMultiTargeting/MSBuild.Sdk.Extras.targets

@@ -5,7 +5,7 @@
   <!-- Fix NuGet Pack to include satellite assemblies.
        See https://github.com/NuGet/Home/issues/4698 -->
   <Target Name="PackSatelliteAssemblies" BeforeTargets="_WalkEachTargetPerFramework">
-    <MSBuild Condition="'$(IncludeBuildOutput)' == 'true'"
+    <MSBuild Condition="'$(IncludeBuildOutput)' == 'true' and '$(_ExtrasSdkVersion)' &lt; 2.0"
              Projects="$(MSBuildProjectFullPath)"
              Targets="SatelliteDllsProjectOutputGroupWithTargetFramework"
              BuildInParallel="$(BuildInParallel)"