From 910325327a4e32b7b55227f6f4f2405d290b2f12 Mon Sep 17 00:00:00 2001 From: Nick Banks Date: Fri, 5 Aug 2022 10:59:45 -0400 Subject: [PATCH] Update main Version to v2.2 (#2948) --- .azure/obtemplates/push-vpack.yml | 2 +- .azure/templates/test-distribution.yml | 2 +- CMakeLists.txt | 2 +- Cargo.toml | 2 +- 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 +- src/test/lib/ApiTest.cpp | 1 - 10 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.azure/obtemplates/push-vpack.yml b/.azure/obtemplates/push-vpack.yml index b29fd4c1b..9f49b81ad 100644 --- a/.azure/obtemplates/push-vpack.yml +++ b/.azure/obtemplates/push-vpack.yml @@ -28,7 +28,7 @@ jobs: owner: quicdev@microsoft.com vpackToken: $(VPACK_PAT) majorVer: 2 - minorVer: 1 + minorVer: 2 patchVer: 0 prereleaseVer: $(Build.BuildId) diff --git a/.azure/templates/test-distribution.yml b/.azure/templates/test-distribution.yml index 504d0245e..ca1e857b4 100644 --- a/.azure/templates/test-distribution.yml +++ b/.azure/templates/test-distribution.yml @@ -26,7 +26,7 @@ jobs: sudo apt-add-repository ppa:lttng/stable-2.12 sudo apt-get update sudo apt-get install -y lttng-tools - sudo dpkg -i $(Build.SourcesDirectory)/distribution/libmsquic_2.1.0_amd64.deb + sudo dpkg -i $(Build.SourcesDirectory)/distribution/libmsquic_2.2.0_amd64.deb - pwsh: | chmod +x $(Build.SourcesDirectory)/artifacts/bin/linux/x64_Release_openssl/msquictest $(Build.SourcesDirectory)/artifacts/bin/linux/x64_Release_openssl/msquictest --gtest_filter=ParameterValidation.ValidateApi diff --git a/CMakeLists.txt b/CMakeLists.txt index 5579a9726..e14395b7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,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.1.0) +set(QUIC_FULL_VERSION 2.2.0) if (WIN32) set(CX_PLATFORM "windows") diff --git a/Cargo.toml b/Cargo.toml index 1b83dcafc..f27668de0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "msquic" -version = "2.1.0-beta" +version = "2.2.0-beta" edition = "2018" authors = ["Microsoft"] description = "Microsoft implementation of the IETF QUIC protocol" diff --git a/scripts/package-distribution.ps1 b/scripts/package-distribution.ps1 index b31b4d7ac..bee7b90b9 100644 --- a/scripts/package-distribution.ps1 +++ b/scripts/package-distribution.ps1 @@ -19,7 +19,7 @@ $ArtifactsBinDir = Join-Path $BaseArtifactsDir "bin" # All direct subfolders are OS's $Platforms = Get-ChildItem -Path $ArtifactsBinDir -$Version = "2.1.0" +$Version = "2.2.0" $WindowsBuilds = @() $AllBuilds = @() diff --git a/scripts/package-nuget.ps1 b/scripts/package-nuget.ps1 index b39ff3244..6fcf9ddcc 100644 --- a/scripts/package-nuget.ps1 +++ b/scripts/package-nuget.ps1 @@ -155,7 +155,7 @@ $DistDir = Join-Path $BaseArtifactsDir "dist" $CurrentCommitHash = Get-GitHash -RepoDir $RootDir $RepoRemote = Get-GitRemote -RepoDir $RootDir -$Version = "2.1.0" +$Version = "2.2.0" $BuildId = $env:BUILD_BUILDID if ($null -ne $BuildId) { diff --git a/scripts/write-versions.ps1 b/scripts/write-versions.ps1 index e9e83e0b7..8ef87dd49 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.1.0"; +$VersionNumber = "2.2.0"; class BuildData { [string]$SourceVersion; diff --git a/src/distribution/Info.plist b/src/distribution/Info.plist index b1534f780..99b31b3fd 100644 --- a/src/distribution/Info.plist +++ b/src/distribution/Info.plist @@ -19,7 +19,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleVersion - 2.1.0 + 2.2.0 NSHumanReadableCopyright MIT CFBundleGetInfoString diff --git a/src/inc/msquic.ver b/src/inc/msquic.ver index 1e44a5a86..1cddf3134 100644 --- a/src/inc/msquic.ver +++ b/src/inc/msquic.ver @@ -8,7 +8,7 @@ #endif #ifndef VER_MINOR -#define VER_MINOR 1 +#define VER_MINOR 2 #endif #ifndef VER_PATCH diff --git a/src/test/lib/ApiTest.cpp b/src/test/lib/ApiTest.cpp index bf7b55eba..e8e52af33 100644 --- a/src/test/lib/ApiTest.cpp +++ b/src/test/lib/ApiTest.cpp @@ -2295,7 +2295,6 @@ void QuicTestGlobalParam() &Length, &ActualVersion)); TEST_EQUAL(ActualVersion[0], 2); - TEST_EQUAL(ActualVersion[1], 1); // value of idx 2 and 3 are decided at build time. // it is hard to verify the values at runtime. }