Forked release/2.5 Branch (#5102)

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.5.0-$(Build.BuildId)
+          ob_createvpack_version: 2.6.0-$(Build.BuildId)
         steps:
         - task: DownloadPipelineArtifact@2
           inputs:

CMakeLists.txt

@@ -57,7 +57,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.5.0)
+set(QUIC_FULL_VERSION 2.6.0)
 
 if (WIN32)
     set(CX_PLATFORM "windows")

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "msquic"
-version = "2.5.0-beta"
+version = "2.6.0-beta"
 edition = "2021"
 authors = ["Microsoft"]
 description = "Microsoft implementation of the IETF QUIC protocol"

docs/Release.md

@@ -39,6 +39,7 @@ This table describes all officially supported MsQuic releases.
 | -- | -- | -- | -- | -- | -- | -- |
 | SAC | [release/2.3](https://github.com/microsoft/msquic/tree/release/2.3) | [Windows Server 2025](https://techcommunity.microsoft.com/t5/windows-server-news-and-best/introducing-windows-server-2025/ba-p/4026374)<br>[Windows 11](https://www.microsoft.com/software-download/windows11) | Jan 26 2024 | Mar 12 2024 | Sept 12 2025 | Windows, Linux |
 | SAC | [release/2.4](https://github.com/microsoft/msquic/tree/release/2.4) | [Windows Server 2025](https://techcommunity.microsoft.com/t5/windows-server-news-and-best/introducing-windows-server-2025/ba-p/4026374)<br>[Windows 11](https://www.microsoft.com/software-download/windows11)<br>[.NET 9.0](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) | Aug 5 2024 | Aug 16 2024 | Feb 16 2026 | Windows, Linux |
+| SAC | [release/2.5](https://github.com/microsoft/msquic/tree/release/2.5) | TBD | May 15 2025 | TBD | TBD | Windows, Linux |
 
 <br>\* Future **Release Dates** are subject to change.
 <br>\** **End of Support** dates do not include possible [extended support](https://docs.microsoft.com/en-us/windows-server/get-started-19/servicing-channels-19#long-term-servicing-channel-ltsc) extensions.

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.5.0"
+$Version = "2.6.0"
 
 $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.5.0"
+$Version = "2.6.0"
 
 $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.5.0";
+$VersionNumber = "2.6.0";
 
 class BuildData {
     [string]$SourceVersion;

src/distribution/Info.plist

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

src/inc/msquic.ver

@@ -8,7 +8,7 @@
 #endif
 
 #ifndef VER_MINOR
-#define VER_MINOR 5
+#define VER_MINOR 6
 #endif
 
 #ifndef VER_PATCH

version.json

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