Skip to content

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

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
Aniruddh25 merged 2 commits into from
May 22, 2026
+24 −5
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbd5723
Fix notice-generation script (#3617)
RubenCerna2079 May 20, 2026
48bc00e
Fix Package Requirements for Nuget Core Package (#3620)
RubenCerna2079 May 22, 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
3 changes: 1 addition & 2 deletions scripts/notice-generation.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", ""
Comment thread
RubenCerna2079 marked this conversation as resolved.

# Prepare license content for writing to file.
$sqlClientSNIComponentName = "`r`nMICROSOFT.DATA.SQLCLIENT.SNI`r`n`r`n"
Expand Down
26 changes: 23 additions & 3 deletions src/Core/Azure.DataApiBuilder.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Comment thread
RubenCerna2079 marked this conversation as resolved.
<ProjectReference Include="..\Config\Azure.DataApiBuilder.Config.csproj">
<PrivateAssets Condition="'$(PrivatizeAssets)' == 'true'">all</PrivateAssets>
</ProjectReference>
Comment thread
RubenCerna2079 marked this conversation as resolved.
<ProjectReference Include="..\Service.GraphQLBuilder\Azure.DataApiBuilder.Service.GraphQLBuilder.csproj">
<PrivateAssets Condition="'$(PrivatizeAssets)' == 'true'">all</PrivateAssets>
</ProjectReference>
Comment thread
RubenCerna2079 marked this conversation as resolved.
</ItemGroup>

<ItemGroup>
Expand All @@ -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>
Loading