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"
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 @@
true
true
NU1603
+
+
+ $(TargetsForTfmSpecificContentInPackage);IncludeInternalDependenciesInPackage
@@ -54,9 +57,15 @@
-
-
-
+
+ all
+
+
+ all
+
+
+ all
+
@@ -66,4 +75,15 @@
+
+
+ <_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" />
+
+
+
+
+