Skip to content
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

Jump to bottom

Update nuget.exe. Remove duplicate files from package. Resolve nuget.… #2074

Merged
merged 1 commit into from
Sep 17, 2020
Merged

Update nuget.exe. Remove duplicate files from package. Resolve nuget.… #2074

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
Binary file modified .nuget/NuGet.exe
View file
Open in desktop
Binary file not shown.
Binary file added .nuget/NuGet.pdb
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions src/Nuget/Sarif.Multitool.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<license type="expression">MIT</license>
<projectUrl>https://github.com/microsoft/sarif-sdk</projectUrl>
<icon>triskelion.png</icon>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

triskelion [](start = 10, length = 10)

more recent nuget clients expect an embedded icon rather than simply having a URL to one.

<iconUrl>https://go.microsoft.com/fwlink/?linkid=2008860</iconUrl>
<tags>SARIF command line static analysis</tags>
<packageTypes>
Expand All @@ -26,15 +27,14 @@
/>
<file src="bld\bin\$platform$_$configuration$\Sarif.Multitool\Publish\net461\**"
target="tools\net461"
exclude="bld\bin\$platform$_$configuration$\Sarif.Multitool\Publish\net461\Sarif*"
exclude="bld\bin\$platform$_$configuration$\Sarif.Multitool\Publish\net461\Sarif*;bld\bin\$platform$_$configuration$\Sarif.Multitool\Publish\net461\WorkItems*;"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bld\bin$platform$$configuration$\Sarif.Multitool\Publish\net461\Sarif*;bld\bin$platform$$configuration$\Sarif.Multitool\Publish\net461\WorkItems*; [](start = 19, length = 150)

this exclusion prevents the unsigned binary from getting copied as well as the signed binary. since workitems.dll is signed, the lack of an exclusion resulted in it being duplicated in the package.

/>
<file src="bld\bin\Signing\net461\**"
target="tools\net461"
/>

<file src="bld\bin\$platform$_$configuration$\Sarif.Multitool\Publish\netcoreapp2.1\**"
target="tools\netcoreapp2.1"
exclude="bld\bin\$platform$_$configuration$\Sarif.Multitool\Publish\netcoreapp2.1\Sarif*.dll"
exclude="bld\bin\$platform$_$configuration$\Sarif.Multitool\Publish\netcoreapp2.1\Sarif*.dll;bld\bin\$platform$_$configuration$\Sarif.Multitool\Publish\netcoreapp2.1\WorkItems*"
/>
<file src="bld\bin\Signing\netcoreapp2.1\**"
target="tools\netcoreapp2.1"
Expand All @@ -55,6 +55,7 @@
target="tools\netcoreapp2.1\any"
/>

<file src="triskelion.png" />
<file src="src\ReleaseHistory.md" />
<file src="src\Sarif.Multitool\**\*.cs" target="src" />
</files>
Expand Down