Update main Version to v2.2 (microsoft#2948)

wangguodong-f · Aug 5, 2022 · 9103253 · 9103253
1 parent 85c4ba1
commit 9103253
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 10 deletions.
diff --git a/.azure/obtemplates/push-vpack.yml b/.azure/obtemplates/push-vpack.yml
@@ -28,7 +28,7 @@ jobs:
       owner: [email protected]
       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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -19,7 +19,7 @@
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleVersion</key>
-    <string>2.1.0</string>
+    <string>2.2.0</string>
     <key>NSHumanReadableCopyright</key>
     <string>MIT</string>
     <key>CFBundleGetInfoString</key>

diff --git 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
@@ -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.
         }