Skip to content

Update paths for cross-platform tool restore layout #993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dtivel merged 1 commit into from
Mar 27, 2026
+24 −23
Merged

Update paths for cross-platform tool restore layout #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ extends:
InputType: Basic
Function: analyze
TargetPattern: binskimPattern
AnalyzeTargetBinskim: $(Build.SourcesDirectory)\artifacts\bin\Sign.Cli\$(_BuildConfig)\net8.0\win-x64\publish\*.dll
AnalyzeTargetBinskim: $(Build.SourcesDirectory)\artifacts\bin\Sign.Cli\$(_BuildConfig)\net8.0\publish\*.dll
AnalyzeSymPath: 'SRV*https://symweb'
condition: succeededOrFailed()
- task: PublishTestResults@2
Expand Down
2 changes: 0 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@
<UpdateXlfOnBuild Condition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
</PropertyGroup>

<!-- See https://github.com/dotnet/sdk/pull/51281 -->
<PropertyGroup>
<CreateRidSpecificToolPackages>false</CreateRidSpecificToolPackages>
<UseAppHost>false</UseAppHost>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions SdkTools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@
<ItemGroup>
<Content Include="@(SdkFile64)" Exclude="$(WindowsSDKBuildToolsBinVersionedFolder)\x64\wintrust.dll.ini">
<Pack>true</Pack>
<PackagePath>tools\$(TargetFramework)\$(RuntimeIdentifier)\tools\SDK\x64</PackagePath>
<PackagePath>tools\$(TargetFramework)\any\tools\SDK\x64</PackagePath>
<Visible>false</Visible>
</Content>
<Content Include="$(OutputPath)\tools\SDK\x64\wintrust.dll.ini">
<Pack>true</Pack>
<PackagePath>tools\$(TargetFramework)\$(RuntimeIdentifier)\tools\SDK\x64</PackagePath>
<PackagePath>tools\$(TargetFramework)\any\tools\SDK\x64</PackagePath>
<Visible>false</Visible>
</Content>
<Content Include="@(SdkFile86)">
<Pack>true</Pack>
<PackagePath>tools\$(TargetFramework)\$(RuntimeIdentifier)\tools\SDK\x86</PackagePath>
<PackagePath>tools\$(TargetFramework)\any\tools\SDK\x86</PackagePath>
<Visible>false</Visible>
</Content>
</ItemGroup>
Expand Down
34 changes: 17 additions & 17 deletions scripts/VerifyNuGetPackage.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,23 @@ If ($packageFilePaths.Count -ne 1)
[System.IO.File]::Copy($sourcePackageFilePath, $destinationFile.FullName, $overwrite)

[string[]] $expectedEntryFullNames =
'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'
'tools/net8.0/any/sign.dll',
'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'

Try
{
Expand Down
3 changes: 3 additions & 0 deletions src/Sign.Cli/Sign.Cli.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<RootNamespace>Sign.Cli</RootNamespace>
<SelfContained>false</SelfContained>
<ToolCommandName>sign</ToolCommandName>
<!-- Clear RID inherited from Directory.Build.props so dotnet pack produces
tools/net8.0/any/ layout for cross-platform tool restore (issue #984). -->
<RuntimeIdentifier />
</PropertyGroup>

<ItemGroup>
Expand Down