Fix single file / R2R for apps targeting windows 10

microsoft/CsWinRT#442
dsplaisted · Sep 30, 2020 · 843da9d · 843da9d
1 parent 655edd9
commit 843da9d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
@@ -627,7 +627,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 
 
  <ItemGroup>
- <_ResolvedCopyLocalPublishAssets Include="@(RuntimePackAsset)" Condition="'$(SelfContained)' == 'true'" />
+ <_ResolvedCopyLocalPublishAssets Include="@(RuntimePackAsset)"
+ Condition="'$(SelfContained)' == 'true' Or '%(RuntimePackAsset.RuntimePackAlwaysCopyLocal)' == 'true'" />
  </ItemGroup>
 
  <ItemGroup Condition="'$(_UseBuildDependencyFile)' != 'true'">
@@ -704,11 +705,6 @@ Copyright (c) .NET Foundation. All rights reserved.
  <DestinationSubPath>%(ReferenceCopyLocalPaths.DestinationSubDirectory)%(ReferenceCopyLocalPaths.Filename)%(ReferenceCopyLocalPaths.Extension)</DestinationSubPath>
  </_ResolvedCopyLocalPublishAssets>
 
- <!-- Include RuntimePackAsset where RuntimePackAlwaysCopyLocal is true -->
- <_ResolvedCopyLocalPublishAssets Include="@(RuntimePackAsset)"
- Condition="'%(RuntimePackAsset.RuntimePackAlwaysCopyLocal)' == 'true'">
- <DestinationSubPath>%(ReferenceCopyLocalPaths.DestinationSubDirectory)%(ReferenceCopyLocalPaths.Filename)%(ReferenceCopyLocalPaths.Extension)</DestinationSubPath>
- </_ResolvedCopyLocalPublishAssets>
  </ItemGroup>
  </Target>
 

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenWeWantToRequireWindowsForDesktopApps.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenWeWantToRequireWindowsForDesktopApps.cs
@@ -255,6 +255,16 @@ void Assert(DirectoryInfo outputDir)
  .Should()
  .Contain(i => i.RelativePath == "WinRT.Runtime.dll" && Path.GetFileName(i.Identity) == "WinRT.Runtime.dll",
  because: "wapproj should copy cswinrt dlls");
+
+ // ready to run is supported
+ publishCommand.Execute("-p:SelfContained=true", $"-p:RuntimeIdentifier={runtimeIdentifier}", $"-p:PublishReadyToRun=true")
+ .Should()
+ .Pass();
+
+ // PublishSingleFile is supported
+ publishCommand.Execute("-p:SelfContained=true", $"-p:RuntimeIdentifier={runtimeIdentifier}", $"-p:PublishSingleFile=true")
+ .Should()
+ .Pass();
  }
 
  private TestAsset CreateWindowsDesktopSdkTestAsset(string projectName, string uiFrameworkProperty)