Deploy copy-local package satellites correctly

dotnet · May 18, 2017 · 25c7fce · 25c7fce
1 parent 81be051
commit 25c7fce
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 1 deletion.
diff --git a/...s/TestProjects/DesktopUsingPackageWithSatellites/DesktopUsingPackageWithSatellites.csproj b/...s/TestProjects/DesktopUsingPackageWithSatellites/DesktopUsingPackageWithSatellites.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net46</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentValidation" Version="5.5.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/TestAssets/TestProjects/DesktopUsingPackageWithSatellites/Program.cs b/TestAssets/TestProjects/DesktopUsingPackageWithSatellites/Program.cs
@@ -0,0 +1,15 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace TestApp
+{
+    class Program
+    {
+        static void Main()
+        {
+            Console.WriteLine("Hello World");
+        }
+    }
+}
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.PackageDependencyResolution.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.PackageDependencyResolution.targets
@@ -494,7 +494,10 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <!-- Add the copy local items -->
     <ItemGroup>
-      <ReferenceCopyLocalPaths Include="@(AllCopyLocalItems)" />
+      <ReferenceCopyLocalPaths Include="@(AllCopyLocalItems)" Exclude="@(ResourceCopyLocalItems)" />
+      <ReferenceCopyLocalPaths Include="@(ResourceCopyLocalItems)" Condition="'@(ResourceCopyLocalItems)' != ''">
+        <DestinationSubDirectory>$([System.IO.Directory]::GetParent(%(ResourceCopyLocalItems.FullPath)).get_Name())\</DestinationSubDirectory>
+      </ReferenceCopyLocalPaths>
     </ItemGroup>
 
   </Target>

diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExe.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExe.cs
@@ -377,5 +377,24 @@ public void It_generates_binding_redirects_if_needed()
                 "DesktopNeedsBindingRedirects.exe.config"
             });
         }
+
+        [WindowsOnlyFact]
+        public void It_places_package_satellites_correctly()
+        {
+            var testAsset = _testAssetsManager
+              .CopyTestAsset("DesktopUsingPackageWithSatellites")
+              .WithSource()
+              .Restore(Log);
+
+            var buildCommand = new BuildCommand(Log, testAsset.TestRoot);
+            buildCommand
+                .Execute()
+                .Should()
+                .Pass();
+
+            var outputDirectory = buildCommand.GetOutputDirectory("net46");
+            outputDirectory.Should().NotHaveFile("FluentValidation.resources.dll");
+            outputDirectory.Should().HaveFile(@"fr\FluentValidation.resources.dll");
+        }
     }
 }