Skip to content

Prevent scanning/signing of unrelated packages #3998

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
samsharma2700 merged 6 commits into from
Mar 10, 2026
Merged

Prevent scanning/signing of unrelated packages #3998

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
413e39d
Isolate built nuget packages
samsharma2700 Mar 4, 2026
3502de3
Merge branch 'main' of https://github.com/dotnet/SqlClient into dev/s…
samsharma2700 Mar 4, 2026
cd8c910
Feedback update
samsharma2700 Mar 4, 2026
3fb2823
Explicitly download Abstractions
samsharma2700 Mar 4, 2026
bb21706
Ensure output directory exists
samsharma2700 Mar 4, 2026
3603449
Consolidate directory creation
samsharma2700 Mar 5, 2026
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ BenchmarkDotNet.Artifacts/
project.lock.json
project.fragment.lock.json
artifacts/
output/

# StyleCop
StyleCopReport.xml
Expand Down
6 changes: 3 additions & 3 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,10 +483,10 @@
<RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "bin", SearchOption.AllDirectories))' />
<RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", ".nuget", SearchOption.AllDirectories))' />
<RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "obj", SearchOption.AllDirectories))' />
<!-- We keep packages/ but remove all of the generated files. -->
<!-- We keep packages/ but remove all of the generated files in the output directory. -->
<ItemGroup>
<PackagesToDelete Include="$(RepoRoot)/packages/*.nupkg" />
<PackagesToDelete Include="$(RepoRoot)/packages/*.snupkg" />
<PackagesToDelete Include="$(RepoRoot)/output/*.nupkg" />
<PackagesToDelete Include="$(RepoRoot)/output/*.snupkg" />
</ItemGroup>
<Delete Files="@(PackagesToDelete)" />
Comment thread
samsharma2700 marked this conversation as resolved.
Outdated
</Target>
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/templates/jobs/publish-nuget-package-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:

variables:
- name: ob_outputDirectory
value: $(Build.SourcesDirectory)/packages
value: $(Build.SourcesDirectory)/output

pool:
type: release
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/templates/steps/generate-nuget-package-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ parameters:

- name: outputDirectory
type: string
default: '$(Build.SourcesDirectory)/packages'
default: '$(Build.SourcesDirectory)/output'

# The C# build configuration (e.g. Debug or Release) to use when building the NuGet package.
- name: buildConfiguration
Expand Down
7 changes: 4 additions & 3 deletions eng/pipelines/libraries/common-variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ variables:
- name: BUILD_OUTPUT
value: $(REPO_ROOT)/artifacts

# THis is where our C# projects place their NuGet package outputs (see Directory.Build.props
# <PackagesDir>).
# This is where our C# projects place their NuGet package outputs. This is intentionally
# separate from packages/ (where downloaded pipeline artifacts go) so that ESRP signing and
# OneBranch artifact publishing only operate on packages built by the current job.
- name: PACK_OUTPUT
value: $(REPO_ROOT)/packages
value: $(REPO_ROOT)/output

# C# assembly versions must be in the format: Major.Minor.Build.Revision, but
# $(Build.BuildNumber) has the format XXX.YY. Additionally, each version part
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<BinFolder Condition="'$(TargetsUnix)' == 'true'">$(Artifacts)bin\Unix\</BinFolder>
<ToolsDir Condition="'$(ToolsDir)'==''">$(RepoRoot)tools\</ToolsDir>
<GenAPISrcDir Condition="'$(GenAPISrcDir)'==''">$(ToolsDir)GenAPI\</GenAPISrcDir>
<PackagesDir Condition="'$(PackagesDir)'==''">$(RepoRoot)packages\</PackagesDir>
<PackagesDir Condition="'$(PackagesDir)'==''">$(RepoRoot)output\</PackagesDir>
Comment thread
samsharma2700 marked this conversation as resolved.
Outdated
<NuGetRoot Condition="'$(NuGetRoot)' == ''">$(RepoRoot).nuget\</NuGetRoot>
<NuGetCmd>$(NuGetRoot)nuget.exe</NuGetCmd>
<!-- Respect environment variable for the .NET install directory if set; otherwise, use the current default location -->
Expand Down