Use Private Nuget Feed for OneBranch (#4557) (#4559)

Author: nibanks

.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:

.azure/nuget.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="msquic_PublicPackages" value="https://pkgs.dev.azure.com/mscodehub/msquic/_packaging/msquic_PublicPackages/nuget/v3/index.json" />
+  </packageSources>
+</configuration>

.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

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")

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"

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%

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 = @()

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) {

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;

src/distribution/Info.plist

@@ -19,7 +19,7 @@
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleVersion</key>
-    <string>2.4.4</string>
+    <string>2.4.5</string>
     <key>NSHumanReadableCopyright</key>
     <string>MIT</string>
     <key>CFBundleGetInfoString</key>

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

version.json

@@ -1 +1 @@
-{ "major": 2, "minor": 4, "patch": 4 }
+{ "major": 2, "minor": 4, "patch": 5 }