Skip to content

Cherry-Pick: Add changes to fix Nuget Core Package Creation#3633

Merged
Aniruddh25 merged 2 commits into
release/2.0from
dev/rubencerna/cherry-pcik/nuget-core-fixes
May 22, 2026
Merged

Cherry-Pick: Add changes to fix Nuget Core Package Creation#3633
Aniruddh25 merged 2 commits into
release/2.0from
dev/rubencerna/cherry-pcik/nuget-core-fixes

Conversation

@RubenCerna2079
Copy link
Copy Markdown
Contributor

Why make this change?

This change cherry-picks the PRs that fixes the new Nuget Core Package

What is this change?

Cherry-picked PRs

How was this tested?

Existing tests in cherry-pick cover new changes.

Sample Request(s)

N/A

RubenCerna2079 and others added 2 commits May 22, 2026 14:00
## Why make this change?

- Solves issue #3607
Currently the notice file script has a bug that causes it to not replace
some of the strings correctly as the values in the `content` variable
that are replaced are overwritten by other changes, so they are not
saved.

## What is this change?

Changed the way the values are changed inside the `content` value by
using regex. Currently the only values that need to be deleted are for
the years 2023 and 2024. This might change in the future.

## How was this tested?

- [ ] Integration Tests
- [ ] Unit Tests
- [x] Manual Testing
Tested this manually by running the script locally.

## Sample Request(s)

N/A

---------

Co-authored-by: aaronburtle <93220300+aaronburtle@users.noreply.github.com>
## Why make this change?

- Solves issue #3618

## What is this change?

This adds `TargetsForTfmSpecificContentInPackage` and
`IncludeInternalDependenciesInPackage` to create the dependencies from
the Core project as dlls. And uses the `PrivateAssets` to ensure that
those dependencies are not added to the nuspec file.

## How was this tested?

- [ ] Integration Tests
- [ ] Unit Tests
- [X] Manual Tests
Tested by using command `dotnet pack .\Azure.DataApiBuilder.Core.csproj
-c Release` to build nuget package and ensure that all the dependencies
are created as expected.

<img width="828" height="355" alt="image"
src="https://github.com/user-attachments/assets/cb3a72c1-1984-4869-aece-4f1d17bc7519"
/>

## Sample Request(s)

N/A

---------

Co-authored-by: Aniruddh Munde <anmunde@microsoft.com>
Co-authored-by: aaronburtle <93220300+aaronburtle@users.noreply.github.com>
Copilot AI review requested due to automatic review settings May 22, 2026 21:03
@RubenCerna2079 RubenCerna2079 changed the title Dev/rubencerna/cherry pcik/nuget core fixes Cherry-Pick: Add changes to fix Nuget Core Package Creation May 22, 2026
@RubenCerna2079 RubenCerna2079 added this to the May 2026 milestone May 22, 2026
@RubenCerna2079 RubenCerna2079 linked an issue May 22, 2026 that may be closed by this pull request
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Cherry-picks upstream fixes to ensure the Microsoft.DataApiBuilder.Core NuGet package is produced with the expected internal assemblies bundled, and corrects the NOTICE generation script so erroneous copyright lines are reliably removed.

Changes:

  • Updates Azure.DataApiBuilder.Core.csproj pack process to include internal dependency DLLs under lib/<tfm>.
  • Updates notice-generation.ps1 to use a regex-based replacement to remove incorrect year lines.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.

File Description
src/Core/Azure.DataApiBuilder.Core.csproj Adds a pack-time target to include internal dependency DLLs and adjusts project reference metadata intended to control nuspec dependency output.
scripts/notice-generation.ps1 Fixes NOTICE file cleanup logic by replacing a fragile sequence of ReadAllText().Replace(...) calls with a single regex replacement.

Comment thread src/Core/Azure.DataApiBuilder.Core.csproj
Comment thread src/Core/Azure.DataApiBuilder.Core.csproj
Comment thread src/Core/Azure.DataApiBuilder.Core.csproj
Comment thread scripts/notice-generation.ps1
@Aniruddh25 Aniruddh25 merged commit ffd47a8 into release/2.0 May 22, 2026
15 checks passed
@Aniruddh25 Aniruddh25 deleted the dev/rubencerna/cherry-pcik/nuget-core-fixes branch May 22, 2026 23:12
@github-project-automation github-project-automation Bot moved this from Todo to Done in Data API builder May 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Cherry-Pick Nuget Core Package Fixes

4 participants