Fix NuGet package (#979)

Resolve #978

Author: dtivel

SdkTools.props

@@ -46,17 +46,17 @@
   <ItemGroup>
     <Content Include="@(SdkFile64)" Exclude="$(WindowsSDKBuildToolsBinVersionedFolder)\x64\wintrust.dll.ini">
       <Pack>true</Pack>
-      <PackagePath>tools\$(TargetFramework)\any\tools\SDK\x64</PackagePath>
+      <PackagePath>tools\$(TargetFramework)\$(RuntimeIdentifier)\tools\SDK\x64</PackagePath>
       <Visible>false</Visible>
     </Content>
     <Content Include="$(OutputPath)\tools\SDK\x64\wintrust.dll.ini">
       <Pack>true</Pack>
-      <PackagePath>tools\$(TargetFramework)\any\tools\SDK\x64</PackagePath>
+      <PackagePath>tools\$(TargetFramework)\$(RuntimeIdentifier)\tools\SDK\x64</PackagePath>
       <Visible>false</Visible>
     </Content>
     <Content Include="@(SdkFile86)">
       <Pack>true</Pack>
-      <PackagePath>tools\$(TargetFramework)\any\tools\SDK\x86</PackagePath>
+      <PackagePath>tools\$(TargetFramework)\$(RuntimeIdentifier)\tools\SDK\x86</PackagePath>
       <Visible>false</Visible>
     </Content>
   </ItemGroup>

scripts/VerifyNuGetPackage.ps1

@@ -61,22 +61,23 @@ If ($packageFilePaths.Count -ne 1)
 [System.IO.File]::Copy($sourcePackageFilePath, $destinationFile.FullName, $overwrite)
 
 [string[]] $expectedEntryFullNames =
-    'tools/net8.0/any/tools/SDK/x64/appxpackaging.dll',
-    'tools/net8.0/any/tools/SDK/x64/appxsip.dll',
-    'tools/net8.0/any/tools/SDK/x64/makeappx.exe',
-    'tools/net8.0/any/tools/SDK/x64/makepri.exe',
-    'tools/net8.0/any/tools/SDK/x64/Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest',
-    'tools/net8.0/any/tools/SDK/x64/Microsoft.Windows.Build.Appx.AppxSip.dll.manifest',
-    'tools/net8.0/any/tools/SDK/x64/Microsoft.Windows.Build.Appx.OpcServices.dll.manifest',
-    'tools/net8.0/any/tools/SDK/x64/Microsoft.Windows.Build.Signing.mssign32.dll.manifest',
-    'tools/net8.0/any/tools/SDK/x64/Microsoft.Windows.Build.Signing.wintrust.dll.manifest',
-    'tools/net8.0/any/tools/SDK/x64/mssign32.dll',
-    'tools/net8.0/any/tools/SDK/x64/NavSip.dll',
-    'tools/net8.0/any/tools/SDK/x64/opcservices.dll',
-    'tools/net8.0/any/tools/SDK/x64/SignTool.exe.manifest',
-    'tools/net8.0/any/tools/SDK/x64/wintrust.dll',
-    'tools/net8.0/any/tools/SDK/x64/wintrust.dll.ini',
-    'tools/net8.0/any/tools/SDK/x86/mage.exe'
+    'tools/net8.0/win-x64/sign.dll',
+    'tools/net8.0/win-x64/tools/SDK/x64/appxpackaging.dll',
+    'tools/net8.0/win-x64/tools/SDK/x64/appxsip.dll',
+    'tools/net8.0/win-x64/tools/SDK/x64/makeappx.exe',
+    'tools/net8.0/win-x64/tools/SDK/x64/makepri.exe',
+    'tools/net8.0/win-x64/tools/SDK/x64/Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest',
+    'tools/net8.0/win-x64/tools/SDK/x64/Microsoft.Windows.Build.Appx.AppxSip.dll.manifest',
+    'tools/net8.0/win-x64/tools/SDK/x64/Microsoft.Windows.Build.Appx.OpcServices.dll.manifest',
+    'tools/net8.0/win-x64/tools/SDK/x64/Microsoft.Windows.Build.Signing.mssign32.dll.manifest',
+    'tools/net8.0/win-x64/tools/SDK/x64/Microsoft.Windows.Build.Signing.wintrust.dll.manifest',
+    'tools/net8.0/win-x64/tools/SDK/x64/mssign32.dll',
+    'tools/net8.0/win-x64/tools/SDK/x64/NavSip.dll',
+    'tools/net8.0/win-x64/tools/SDK/x64/opcservices.dll',
+    'tools/net8.0/win-x64/tools/SDK/x64/SignTool.exe.manifest',
+    'tools/net8.0/win-x64/tools/SDK/x64/wintrust.dll',
+    'tools/net8.0/win-x64/tools/SDK/x64/wintrust.dll.ini',
+    'tools/net8.0/win-x64/tools/SDK/x86/mage.exe'
 
 Try
 {