From cfd11b5dfabc937e8f5c32ec94fe055cc9ad9d70 Mon Sep 17 00:00:00 2001 From: Ruben Cerna Date: Tue, 12 May 2026 16:05:41 -0700 Subject: [PATCH 1/6] Add missing changes for nuget package --- scripts/create-manifest-file.ps1 | 24 ++++++++++++++++------- scripts/notice-generation.ps1 | 4 +--- src/Cli/Cli.csproj | 2 +- src/Core/Azure.DataApiBuilder.Core.csproj | 2 +- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/scripts/create-manifest-file.ps1 b/scripts/create-manifest-file.ps1 index bb32d18cf2..51c762dc86 100644 --- a/scripts/create-manifest-file.ps1 +++ b/scripts/create-manifest-file.ps1 @@ -40,11 +40,17 @@ foreach ($targetFramework in $dotnetTargetFrameworks) } # Generating hash for nuget -$nugetFileName = "Microsoft.DataApiBuilder.$DabVersion.nupkg" -$nugetFilePath = "$BuildOutputDir/nupkg/$nugetFileName" -$fileHashInfo = Get-FileHash $nugetFilePath -$nuget_file_hash = $fileHashInfo.Hash -$download_url_nuget = "https://github.com/Azure/data-api-builder/releases/download/$versionTag/$nugetFileName" +$nugetCliFileName = "Microsoft.DataApiBuilder.$DabVersion.nupkg" +$nugetCliFilePath = "$BuildOutputDir/nupkg/$nugetCliFileName" +$fileCliHashInfo = Get-FileHash $nugetCliFilePath +$nuget_cli_file_hash = $fileCliHashInfo.Hash +$download_url_nuget_cli = "https://github.com/Azure/data-api-builder/releases/download/$versionTag/$nugetCliFileName" + +$nugetCoreFileName = "Microsoft.DataApiBuilder.Core.$DabVersion.nupkg" +$nugetCoreFilePath = "$BuildOutputDir/nupkg/$nugetCoreFileName" +$fileCoreHashInfo = Get-FileHash $nugetCoreFilePath +$nuget_core_file_hash = $fileCoreHashInfo.Hash +$download_url_nuget_core = "https://github.com/Azure/data-api-builder/releases/download/$versionTag/$nugetCoreFileName" # Creating new block to insert latest version # String substitution requires hashtable to be wrapped in $( $hashtable['key'] ) to avoid parsing issues. @@ -68,8 +74,12 @@ $latestBlock = @' "sha": "$($frameworkPlatformFileHashMetadata["net8.0_osx-x64"])" }, "nuget": { - "url": "${download_url_nuget}", - "sha": "${nuget_file_hash}" + "url": "${download_url_nuget_cli}", + "sha": "${nuget_cli_file_hash}" + } + "nuget": { + "url": "${download_url_nuget_core}", + "sha": "${nuget_core_file_hash}" } } } diff --git a/scripts/notice-generation.ps1 b/scripts/notice-generation.ps1 index bc67f6e72e..d97f0edf8a 100644 --- a/scripts/notice-generation.ps1 +++ b/scripts/notice-generation.ps1 @@ -2,6 +2,7 @@ # Licensed under the MIT License. param ( + [Parameter (Mandatory=$true)][string] $noticeFilePath, [Parameter (Mandatory=$true)][string] $BuildArtifactStagingDir, [Parameter (Mandatory=$true)][string] $BuildSourcesDir ) @@ -17,9 +18,6 @@ Invoke-WebRequest $chiliCreamLicenseMetadataURL -UseBasicParsing | $sqlClientSNILicenseFilePath = "$BuildSourcesDir/external_licenses/Microsoft.Data.SqlClient.SNI.5.2.0.License.txt" $sqlClientSNILicense = Get-Content -Path $sqlClientSNILicenseFilePath -Raw -# Path of notice file generated in CI/CD pipeline. -$noticeFilePath = "$BuildSourcesDir/NOTICE.txt" - # 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", "") diff --git a/src/Cli/Cli.csproj b/src/Cli/Cli.csproj index 60c405e6a9..85ae1e4ff5 100644 --- a/src/Cli/Cli.csproj +++ b/src/Cli/Cli.csproj @@ -55,7 +55,7 @@ - + diff --git a/src/Core/Azure.DataApiBuilder.Core.csproj b/src/Core/Azure.DataApiBuilder.Core.csproj index 8b32a8682c..c21df99e18 100644 --- a/src/Core/Azure.DataApiBuilder.Core.csproj +++ b/src/Core/Azure.DataApiBuilder.Core.csproj @@ -62,7 +62,7 @@ - + From 91d0c3a2e935521b3a92b55a1f4f4945f79c9f7f Mon Sep 17 00:00:00 2001 From: Ruben Cerna Date: Wed, 13 May 2026 12:00:46 -0700 Subject: [PATCH 2/6] Fix proj path --- src/Core/Azure.DataApiBuilder.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/Azure.DataApiBuilder.Core.csproj b/src/Core/Azure.DataApiBuilder.Core.csproj index c21df99e18..e7386d3787 100644 --- a/src/Core/Azure.DataApiBuilder.Core.csproj +++ b/src/Core/Azure.DataApiBuilder.Core.csproj @@ -62,7 +62,7 @@ - + From 955fa1b0864550a99b2bcceeb6f5f11acd70ddb6 Mon Sep 17 00:00:00 2001 From: Ruben Cerna Date: Wed, 13 May 2026 12:33:32 -0700 Subject: [PATCH 3/6] Fix csproj --- src/Core/Azure.DataApiBuilder.Core.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Core/Azure.DataApiBuilder.Core.csproj b/src/Core/Azure.DataApiBuilder.Core.csproj index e7386d3787..6fd5a3b252 100644 --- a/src/Core/Azure.DataApiBuilder.Core.csproj +++ b/src/Core/Azure.DataApiBuilder.Core.csproj @@ -59,10 +59,10 @@ - + - + From 39ea0ef9c9077544cdf22b992e2c74fe0f4f1d96 Mon Sep 17 00:00:00 2001 From: Ruben Cerna Date: Wed, 13 May 2026 13:42:14 -0700 Subject: [PATCH 4/6] Fix csproj --- src/Core/Azure.DataApiBuilder.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/Azure.DataApiBuilder.Core.csproj b/src/Core/Azure.DataApiBuilder.Core.csproj index 6fd5a3b252..0423b87d8e 100644 --- a/src/Core/Azure.DataApiBuilder.Core.csproj +++ b/src/Core/Azure.DataApiBuilder.Core.csproj @@ -59,7 +59,7 @@ - + From df71e72174f4914e75dca5cd3087f01eec3a7ad8 Mon Sep 17 00:00:00 2001 From: Ruben Cerna Date: Wed, 13 May 2026 14:54:50 -0700 Subject: [PATCH 5/6] Fix manifest script --- scripts/create-manifest-file.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create-manifest-file.ps1 b/scripts/create-manifest-file.ps1 index 51c762dc86..b43c78d646 100644 --- a/scripts/create-manifest-file.ps1 +++ b/scripts/create-manifest-file.ps1 @@ -76,7 +76,7 @@ $latestBlock = @' "nuget": { "url": "${download_url_nuget_cli}", "sha": "${nuget_cli_file_hash}" - } + }, "nuget": { "url": "${download_url_nuget_core}", "sha": "${nuget_core_file_hash}" From d88677e01de00b7d122a092d19ee171260a1e2ef Mon Sep 17 00:00:00 2001 From: Ruben Cerna Date: Wed, 13 May 2026 16:23:31 -0700 Subject: [PATCH 6/6] Edit manifest script --- scripts/create-manifest-file.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create-manifest-file.ps1 b/scripts/create-manifest-file.ps1 index b43c78d646..85e1579ba4 100644 --- a/scripts/create-manifest-file.ps1 +++ b/scripts/create-manifest-file.ps1 @@ -77,7 +77,7 @@ $latestBlock = @' "url": "${download_url_nuget_cli}", "sha": "${nuget_cli_file_hash}" }, - "nuget": { + "nuget-core": { "url": "${download_url_nuget_core}", "sha": "${nuget_core_file_hash}" }