From fbd5723d79c37d5dbfd37133e4af3a66a162d329 Mon Sep 17 00:00:00 2001
From: RubenCerna2079 <32799214+RubenCerna2079@users.noreply.github.com>
Date: Wed, 20 May 2026 16:40:42 -0700
Subject: [PATCH 1/2] Fix notice-generation script (#3617)

## 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>
---
 scripts/notice-generation.ps1 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/notice-generation.ps1 b/scripts/notice-generation.ps1
index d97f0edf8a..3b263a4b8f 100644
--- a/scripts/notice-generation.ps1
+++ b/scripts/notice-generation.ps1
@@ -19,8 +19,7 @@ $sqlClientSNILicenseFilePath = "$BuildSourcesDir/external_licenses/Microsoft.Dat
 $sqlClientSNILicense = Get-Content -Path $sqlClientSNILicenseFilePath -Raw
 
 # Replace erroneous copyright, using [System.IO.File] for better performance than Get-Content and Set-Content
-$content = [System.IO.File]::ReadAllText($noticeFilePath).Replace("(c) Microsoft 2023`r`n", "")
-$content = [System.IO.File]::ReadAllText($noticeFilePath).Replace("(c) Microsoft 2024`r`n", "")
+$content = [System.IO.File]::ReadAllText($noticeFilePath) -replace "\(c\) Microsoft (2023|2024)`r`n", ""
 
 # Prepare license content for writing to file.
 $sqlClientSNIComponentName = "`r`nMICROSOFT.DATA.SQLCLIENT.SNI`r`n`r`n"

From 48bc00ef4264741c919ee6b0976e4f724f2a8ea6 Mon Sep 17 00:00:00 2001
From: RubenCerna2079 <32799214+RubenCerna2079@users.noreply.github.com>
Date: Fri, 22 May 2026 13:56:05 -0700
Subject: [PATCH 2/2] Fix Package Requirements for Nuget Core Package (#3620)

## 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>
---
 src/Core/Azure.DataApiBuilder.Core.csproj | 26 ++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/Core/Azure.DataApiBuilder.Core.csproj b/src/Core/Azure.DataApiBuilder.Core.csproj
index 756e45f984..cd6aae6ec4 100644
--- a/src/Core/Azure.DataApiBuilder.Core.csproj
+++ b/src/Core/Azure.DataApiBuilder.Core.csproj
@@ -20,6 +20,9 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <NoWarn>NU1603</NoWarn>
+
+    <!-- Run custom target during pack to add dependency files into the package. -->
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludeInternalDependenciesInPackage</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 
   <ItemGroup>
@@ -54,9 +57,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Auth\Azure.DataApiBuilder.Auth.csproj" />
-    <ProjectReference Include="..\Config\Azure.DataApiBuilder.Config.csproj" />
-    <ProjectReference Include="..\Service.GraphQLBuilder\Azure.DataApiBuilder.Service.GraphQLBuilder.csproj" />
+    <ProjectReference Include="..\Auth\Azure.DataApiBuilder.Auth.csproj">
+      <PrivateAssets Condition="'$(PrivatizeAssets)' == 'true'">all</PrivateAssets>
+    </ProjectReference>
+    <ProjectReference Include="..\Config\Azure.DataApiBuilder.Config.csproj">
+      <PrivateAssets Condition="'$(PrivatizeAssets)' == 'true'">all</PrivateAssets>
+    </ProjectReference>
+    <ProjectReference Include="..\Service.GraphQLBuilder\Azure.DataApiBuilder.Service.GraphQLBuilder.csproj">
+      <PrivateAssets Condition="'$(PrivatizeAssets)' == 'true'">all</PrivateAssets>
+    </ProjectReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -66,4 +75,15 @@
     <None Include="..\..\nuget_core\NOTICE.txt" Pack="true" PackagePath="\" Condition="Exists('..\..\nuget_core\NOTICE.txt')" />
   </ItemGroup>
 
+  <Target Name="IncludeInternalDependenciesInPackage">
+    <ItemGroup>
+      <_InternalAssembly Include="$(OutputPath)Azure.DataApiBuilder.Auth.dll" />
+      <_InternalAssembly Include="$(OutputPath)Azure.DataApiBuilder.Config.dll" />
+      <_InternalAssembly Include="$(OutputPath)Azure.DataApiBuilder.Service.GraphQLBuilder.dll" />
+      <_InternalAssembly Include="$(OutputPath)Azure.DataApiBuilder.Product.dll" />
+
+      <TfmSpecificPackageFile Include="@(_InternalAssembly)" PackagePath="lib/$(TargetFramework)" />
+    </ItemGroup>
+  </Target>
+
 </Project>