Skip to content

Commit

Permalink
Rename "runtimes" directory in NuPkg for hosting assemblies (microsof…
Browse files Browse the repository at this point in the history 
…t#1175)

* rename dir in nupkg

* Remove "win", update docs
  • Loading branch information
@j0shuams
j0shuams authored Apr 22, 2022
1 parent 6728f2c commit 6fd1d37
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 36 deletions.
12 changes: 6 additions & 6 deletions docs/authoring.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ To make your component available as a NuGet package, it is important to include
target="lib\$(TargetFramework)\WinRT.Runtime.dll" />

<!-- Include the native DLLs -->
<file src="C:\Path\To\CsWinRT\NugetDir\runtimes\win-x64\native\WinRT.Host.dll"
target="runtimes\win-x64\native\WinRT.Host.dll" />
<file src="C:\Path\To\CsWinRT\NugetDir\runtimes\win-x86\native\WinRT.Host.dll"
target="runtimes\win-x86\native\WinRT.Host.dll" />
<file src="C:\Path\To\CsWinRT\NugetDir\runtimes\win-arm64\native\WinRT.Host.dll"
target="runtimes\win-arm64\native\WinRT.Host.dll" />
<file src="C:\Path\To\CsWinRT\NugetDir\hosting\x64\native\WinRT.Host.dll"
target="hosting\x64\native\WinRT.Host.dll" />
<file src="C:\Path\To\CsWinRT\NugetDir\hosting\x86\native\WinRT.Host.dll"
target="hosting\x86\native\WinRT.Host.dll" />
<file src="C:\Path\To\CsWinRT\NugetDir\hosting\arm64\native\WinRT.Host.dll"
target="hosting\arm64\native\WinRT.Host.dll" />

</files>
```
Expand Down
4 changes: 2 additions & 2 deletions nuget/Microsoft.Windows.CsWinRT.Authoring.Transitive.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<!-- Add the runtimeconfig.json -->
<HostingAssets Include="$(MSBuildThisFileDirectory)..\build\native\WinRT.Host.runtimeconfig.json"/>
<!-- Get the proper WinRT.Host.dll -->
<HostingAssets Include="$(MSBuildThisFileDirectory)..\runtimes\win-$(_NormalizedPlatform)\native\WinRT.Host.dll" />
<HostingAssets Include="$(MSBuildThisFileDirectory)..\runtimes\win-$(_NormalizedPlatform)\native\en-us\WinRT.Host.dll.mui" />
<HostingAssets Include="$(MSBuildThisFileDirectory)..\hosting\$(_NormalizedPlatform)\native\WinRT.Host.dll" />
<HostingAssets Include="$(MSBuildThisFileDirectory)..\hosting\$(_NormalizedPlatform)\native\en-us\WinRT.Host.dll.mui" />
</ItemGroup>

<!-- Add the WinMD file as a reference of the native app so a projection gets made -->
Expand Down
40 changes: 20 additions & 20 deletions nuget/Microsoft.Windows.CsWinRT.Authoring.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>

<None Condition="Exists('$(CsWinRTPath)runtimes\win-$(CsWinRTAuthoring_Platform)\native\WinRT.Host.dll')"
Include="$(CsWinRTPath)runtimes\win-$(CsWinRTAuthoring_Platform)\native\WinRT.Host.dll">
<None Condition="Exists('$(CsWinRTPath)hosting\win-$(CsWinRTAuthoring_Platform)\native\WinRT.Host.dll')"
Include="$(CsWinRTPath)hosting\win-$(CsWinRTAuthoring_Platform)\native\WinRT.Host.dll">
<TargetPath>WinRT.Host.dll</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>

<None Condition="Exists('$(CsWinRTPath)runtimes\win-$(CsWinRTAuthoring_Platform)\native\en-us\WinRT.Host.dll.mui')"
Include="$(CsWinRTPath)runtimes\win-$(CsWinRTAuthoring_Platform)\native\en-us\WinRT.Host.dll.mui">
<None Condition="Exists('$(CsWinRTPath)hosting\win-$(CsWinRTAuthoring_Platform)\native\en-us\WinRT.Host.dll.mui')"
Include="$(CsWinRTPath)hosting\win-$(CsWinRTAuthoring_Platform)\native\en-us\WinRT.Host.dll.mui">
<TargetPath>WinRT.Host.dll.mui</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -294,38 +294,38 @@ Copyright (C) Microsoft Corporation. All rights reserved.
</Content>

<!-- We package a version of WinRT.Host.dll for each possible architecture -->
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-x64\native\WinRT.Host.dll')" Include="$(CsWinRTPath)runtimes\win-x64\native\WinRT.Host.dll">
<Content Condition="Exists('$(CsWinRTPath)hosting\x64\native\WinRT.Host.dll')" Include="$(CsWinRTPath)hosting\x64\native\WinRT.Host.dll">
<Pack>true</Pack>
<PackagePath>runtimes\win-x64\native</PackagePath>
<PackagePath>hosting\x64\native</PackagePath>
</Content>
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-x86\native\WinRT.Host.dll')" Include="$(CsWinRTPath)runtimes\win-x86\native\WinRT.Host.dll">
<Content Condition="Exists('$(CsWinRTPath)hosting\x86\native\WinRT.Host.dll')" Include="$(CsWinRTPath)hosting\x86\native\WinRT.Host.dll">
<Pack>true</Pack>
<PackagePath>runtimes\win-x86\native</PackagePath>
<PackagePath>hosting\x86\native</PackagePath>
</Content>
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-arm\native\WinRT.Host.dll')" Include="$(CsWinRTPath)runtimes\win-arm\native\WinRT.Host.dll">
<Content Condition="Exists('$(CsWinRTPath)hosting\arm\native\WinRT.Host.dll')" Include="$(CsWinRTPath)hosting\arm\native\WinRT.Host.dll">
<Pack>true</Pack>
<PackagePath>runtimes\win-arm\native</PackagePath>
<PackagePath>hosting\arm\native</PackagePath>
</Content>
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-arm64\native\WinRT.Host.dll')" Include="$(CsWinRTPath)runtimes\win-arm64\native\WinRT.Host.dll">
<Content Condition="Exists('$(CsWinRTPath)hosting\arm64\native\WinRT.Host.dll')" Include="$(CsWinRTPath)hosting\arm64\native\WinRT.Host.dll">
<Pack>true</Pack>
<PackagePath>runtimes\win-arm64\native</PackagePath>
<PackagePath>hosting\arm64\native</PackagePath>
</Content>
<!-- Package the MUI for WinRT.Host error strings -->
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-x64\native\en-us\WinRT.Host.dll.mui')" Include="$(CsWinRTPath)runtimes\win-x64\native\en-us\WinRT.Host.dll.mui">
<Content Condition="Exists('$(CsWinRTPath)hosting\x64\native\en-us\WinRT.Host.dll.mui')" Include="$(CsWinRTPath)hosting\x64\native\en-us\WinRT.Host.dll.mui">
<Pack>true</Pack>
<PackagePath>runtimes\win-x64\native\en-us</PackagePath>
<PackagePath>hosting\x64\native\en-us</PackagePath>
</Content>
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-x86\native\en-us\WinRT.Host.Host.dll.mui')" Include="$(CsWinRTPath)runtimes\win-x86\native\en-us\WinRT.Host.dll.mui">
<Content Condition="Exists('$(CsWinRTPath)hosting\x86\native\en-us\WinRT.Host.Host.dll.mui')" Include="$(CsWinRTPath)hosting\x86\native\en-us\WinRT.Host.dll.mui">
<Pack>true</Pack>
<PackagePath>runtimes\win-x86\native\en-us</PackagePath>
<PackagePath>hosting\x86\native\en-us</PackagePath>
</Content>
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-arm\native\en-us\WinRT.Host.dll.mui')" Include="$(CsWinRTPath)runtimes\win-arm\native\en-us\WinRT.Host.dll.mui">
<Content Condition="Exists('$(CsWinRTPath)hosting\arm\native\en-us\WinRT.Host.dll.mui')" Include="$(CsWinRTPath)hosting\arm\native\en-us\WinRT.Host.dll.mui">
<Pack>true</Pack>
<PackagePath>runtimes\win-arm\native\en-us</PackagePath>
<PackagePath>hosting\arm\native\en-us</PackagePath>
</Content>
<Content Condition="Exists('$(CsWinRTPath)runtimes\win-arm64\native\en-us\WinRT.Host.dll.mui')" Include="$(CsWinRTPath)runtimes\win-arm64\native\en-us\WinRT.Host.dll.mui">
<Content Condition="Exists('$(CsWinRTPath)hosting\arm64\native\en-us\WinRT.Host.dll.mui')" Include="$(CsWinRTPath)hosting\arm64\native\en-us\WinRT.Host.dll.mui">
<Pack>true</Pack>
<PackagePath>runtimes\win-arm64\native\en-us</PackagePath>
<PackagePath>hosting\arm64\native\en-us</PackagePath>
</Content>
</ItemGroup>

Expand Down
16 changes: 8 additions & 8 deletions nuget/Microsoft.Windows.CsWinRT.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
<file src="readme.txt"/>
<file src="$net5_runtime$" target="lib\net5.0\"/>
<file src="$source_generator$" target="analyzers\dotnet\cs\"/>
<file src="$winrt_host_x64$" target ="runtimes\win-x64\native"/>
<file src="$winrt_host_x86$" target ="runtimes\win-x86\native"/>
<file src="$winrt_host_arm$" target ="runtimes\win-arm\native"/>
<file src="$winrt_host_arm64$" target ="runtimes\win-arm64\native"/>
<file src="$winrt_host_resource_x64$" target ="runtimes\win-x64\native\en-us"/>
<file src="$winrt_host_resource_x86$" target ="runtimes\win-x86\native\en-us"/>
<file src="$winrt_host_resource_arm$" target ="runtimes\win-arm\native\en-us"/>
<file src="$winrt_host_resource_arm64$" target ="runtimes\win-arm64\native\en-us"/>
<file src="$winrt_host_x64$" target ="hosting\x64\native"/>
<file src="$winrt_host_x86$" target ="hosting\x86\native"/>
<file src="$winrt_host_arm$" target ="hosting\arm\native"/>
<file src="$winrt_host_arm64$" target ="hosting\arm64\native"/>
<file src="$winrt_host_resource_x64$" target ="hosting\x64\native\en-us"/>
<file src="$winrt_host_resource_x86$" target ="hosting\x86\native\en-us"/>
<file src="$winrt_host_resource_arm$" target ="hosting\arm\native\en-us"/>
<file src="$winrt_host_resource_arm64$" target ="hosting\arm64\native\en-us"/>
<file src="$winrt_shim$" target ="lib\net5.0\"/>

<!-- Add the WinRT.Runtime sources to the pkg for embedded scenarios -->
Expand Down

0 comments on commit 6fd1d37

Please sign in to comment.