From 66ddc271efc0096411144a6732b6afe3bd2855dd Mon Sep 17 00:00:00 2001 From: Nick Banks Date: Thu, 26 Sep 2024 08:14:31 -0400 Subject: [PATCH] Use Private Nuget Feed for OneBranch (#4557) (#4559) --- .azure/OneBranch.Package.yml | 2 +- .azure/nuget.config | 7 +++++++ .azure/obtemplates/build-winkernel.yml | 8 ++++++++ CMakeLists.txt | 2 +- Cargo.toml | 2 +- scripts/onebranch-build-kernel.cmd | 1 - scripts/package-distribution.ps1 | 2 +- scripts/package-nuget.ps1 | 2 +- scripts/write-versions.ps1 | 2 +- src/distribution/Info.plist | 2 +- src/inc/msquic.ver | 2 +- version.json | 2 +- 12 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 .azure/nuget.config diff --git a/.azure/OneBranch.Package.yml b/.azure/OneBranch.Package.yml index 46a17fcec2..482a031c0b 100644 --- a/.azure/OneBranch.Package.yml +++ b/.azure/OneBranch.Package.yml @@ -95,7 +95,7 @@ extends: ob_createvpack_owneralias: quicdev ob_createvpack_description: msquic.$(Build.SourceBranchName) ob_createvpack_versionAs: string - ob_createvpack_version: 2.4.4-$(Build.BuildId) + ob_createvpack_version: 2.4.5-$(Build.BuildId) steps: - task: DownloadPipelineArtifact@2 inputs: diff --git a/.azure/nuget.config b/.azure/nuget.config new file mode 100644 index 0000000000..3f2e5ecdb5 --- /dev/null +++ b/.azure/nuget.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.azure/obtemplates/build-winkernel.yml b/.azure/obtemplates/build-winkernel.yml index 0c0d406db9..47ed91803c 100644 --- a/.azure/obtemplates/build-winkernel.yml +++ b/.azure/obtemplates/build-winkernel.yml @@ -13,6 +13,14 @@ jobs: ob_sdl_codeSignValidation_excludes: -|**\*.sys # Disable signing requirements for KM builds ob_spgo_enabled: true # Enable SPGO steps: + - task: NuGetCommand@2 + displayName: Nuget Restore + target: windows_build_container2 + inputs: + command: 'restore' + restoreSolution: msquic.kernel.sln + feedsToUse: 'config' + nugetConfigPath: .\.azure\nuget.config - script: scripts\onebranch-build-kernel.cmd ${{ parameters.config }} x64 displayName: x64 target: windows_build_container2 diff --git a/CMakeLists.txt b/CMakeLists.txt index c20dcd1a1b..e8942a2f56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ message(STATUS "Platform version: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") message(STATUS "Build type: ${CMAKE_BUILD_TYPE}") set(QUIC_MAJOR_VERSION 2) -set(QUIC_FULL_VERSION 2.4.4) +set(QUIC_FULL_VERSION 2.4.5) if (WIN32) set(CX_PLATFORM "windows") diff --git a/Cargo.toml b/Cargo.toml index 5a30f3abd6..50ff95c284 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "msquic" -version = "2.4.4-beta" +version = "2.4.5-beta" edition = "2018" authors = ["Microsoft"] description = "Microsoft implementation of the IETF QUIC protocol" diff --git a/scripts/onebranch-build-kernel.cmd b/scripts/onebranch-build-kernel.cmd index dd93a199d6..5520b7cc41 100644 --- a/scripts/onebranch-build-kernel.cmd +++ b/scripts/onebranch-build-kernel.cmd @@ -1,3 +1,2 @@ call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat -msbuild msquic.kernel.sln -t:restore -p:RestorePackagesConfig=true /p:Configuration=%1 /p:Platform=%2 msbuild msquic.kernel.sln -p:ONEBRANCH_BUILD=true /p:Configuration=%1 /p:Platform=%2 /p:QUIC_VER_SUFFIX=-official /p:QUIC_VER_BUILD_ID=%BUILD_BUILDID% /p:QUIC_VER_GIT_HASH=%BUILD_SOURCEVERSION% diff --git a/scripts/package-distribution.ps1 b/scripts/package-distribution.ps1 index c5c1c09eab..23bc065f65 100644 --- a/scripts/package-distribution.ps1 +++ b/scripts/package-distribution.ps1 @@ -24,7 +24,7 @@ $ArtifactsBinDir = Join-Path $BaseArtifactsDir "bin" # All direct subfolders are OS's $Platforms = Get-ChildItem -Path $ArtifactsBinDir -$Version = "2.4.4" +$Version = "2.4.5" $WindowsBuilds = @() $AllBuilds = @() diff --git a/scripts/package-nuget.ps1 b/scripts/package-nuget.ps1 index d74cbf9fa4..1076b78096 100644 --- a/scripts/package-nuget.ps1 +++ b/scripts/package-nuget.ps1 @@ -153,7 +153,7 @@ $DistDir = Join-Path $BaseArtifactsDir "dist" $CurrentCommitHash = Get-GitHash -RepoDir $RootDir $RepoRemote = Get-GitRemote -RepoDir $RootDir -$Version = "2.4.4" +$Version = "2.4.5" $BuildId = $env:BUILD_BUILDID if ($null -ne $BuildId) { diff --git a/scripts/write-versions.ps1 b/scripts/write-versions.ps1 index 55d412b644..8aa7bf844c 100644 --- a/scripts/write-versions.ps1 +++ b/scripts/write-versions.ps1 @@ -26,7 +26,7 @@ $ArtifactsDir = $BuildConfig.ArtifactsDir $SourceVersion = $env:BUILD_SOURCEVERSION; $SourceBranch = $env:BUILD_SOURCEBRANCH; $BuildId = $env:BUILD_BUILDID; -$VersionNumber = "2.4.4"; +$VersionNumber = "2.4.5"; class BuildData { [string]$SourceVersion; diff --git a/src/distribution/Info.plist b/src/distribution/Info.plist index 6b8f47cf8b..600d55c06b 100644 --- a/src/distribution/Info.plist +++ b/src/distribution/Info.plist @@ -19,7 +19,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleVersion - 2.4.4 + 2.4.5 NSHumanReadableCopyright MIT CFBundleGetInfoString diff --git a/src/inc/msquic.ver b/src/inc/msquic.ver index fb198f1ad9..ac64dc3156 100644 --- a/src/inc/msquic.ver +++ b/src/inc/msquic.ver @@ -12,7 +12,7 @@ #endif #ifndef VER_PATCH -#define VER_PATCH 4 +#define VER_PATCH 5 #endif #ifndef VER_BUILD_ID diff --git a/version.json b/version.json index a07c62f6f6..055e09ec1d 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{ "major": 2, "minor": 4, "patch": 4 } +{ "major": 2, "minor": 4, "patch": 5 }