Backport Infra and Test Fixes to release/2.0 (#3086)

microsoft · Sep 27, 2022 · 858cf81 · 858cf81
1 parent 030273f
commit 858cf81
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 28 deletions.
diff --git a/.azure/azure-pipelines.ci.yml b/.azure/azure-pipelines.ci.yml
@@ -489,15 +489,15 @@ stages:
       tls: schannel
       logProfile: Full.Light
       config: Release
-      extraArgs: -SkipUnitTests -EnableTcpipVerifier -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ConnectClientCertificate*
+      extraArgs: -SkipUnitTests -EnableSystemVerifier -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ConnectClientCertificate*
   - template: ./templates/run-bvt.yml
     parameters:
       pool: MsQuic-Win-Latest
       platform: windows
       tls: schannel
       logProfile: Full.Light
       config: Release
-      extraArgs: -SkipUnitTests -EnableTcpipVerifier
+      extraArgs: -SkipUnitTests
 
 - stage: test_bvt_winkernel_release
   displayName: BVT Windows Kernel Release
@@ -514,7 +514,7 @@ stages:
       config: Release
       kernel: true
       testCerts: true
-      extraArgs: -Kernel -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ClientCertificate*:*LoadBalanced*
+      extraArgs: -Kernel -EnableSystemVerifier -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ClientCertificate*:*LoadBalanced*
   - template: ./templates/run-bvt.yml
     parameters:
       pool: MsQuic-Win-Latest
@@ -542,7 +542,7 @@ stages:
       platform: windows
       tls: schannel
       logProfile: Full.Light
-      extraArgs: -Kernel -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ClientCertificate*:*LoadBalanced*:*NthAllocFail*
+      extraArgs: -Kernel -EnableSystemVerifier -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ClientCertificate*:*LoadBalanced*:*NthAllocFail*
       kernel: true
       testCerts: true
   - template: ./templates/run-bvt.yml

diff --git a/.azure/azure-pipelines.qns.yml b/.azure/azure-pipelines.qns.yml
@@ -60,7 +60,7 @@ jobs:
         ${{ if eq(variables['Build.Reason'], 'BatchedCI') }}:
           tags: |
             latest
-            v2.0.3.$(Build.BuildId)
+            v2.0.4.$(Build.BuildId)
         ${{ if ne(variables['Build.Reason'], 'BatchedCI') }}:
           tags: custom-$(Build.BuildId)
 - template: .\templates\run-qns.yml

diff --git a/.azure/obtemplates/push-vpack.yml b/.azure/obtemplates/push-vpack.yml
@@ -29,7 +29,7 @@ jobs:
       vpackToken: $(VPACK_PAT)
       majorVer: 2
       minorVer: 0
-      patchVer: 3
+      patchVer: 4
       prereleaseVer: $(Build.BuildId)
 
   - publish: $(XES_VPACKMANIFESTDIRECTORY)

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.0.3_amd64.deb
+      sudo dpkg -i $(Build.SourcesDirectory)/distribution/libmsquic_2.0.4_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.0.3)
+set(QUIC_FULL_VERSION 2.0.4)
 
 if (WIN32)
     set(CX_PLATFORM "windows")

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "msquic"
-version = "2.0.3-beta"
+version = "2.0.4-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.0.3"
+$Version = "2.0.4"
 
 $WindowsBuilds = @()
 $AllBuilds = @()

diff --git a/scripts/package-nuget.ps1 b/scripts/package-nuget.ps1
@@ -141,7 +141,7 @@ $DistDir = Join-Path $BaseArtifactsDir "dist"
 $CurrentCommitHash = Get-GitHash -RepoDir $RootDir
 $RepoRemote = Get-GitRemote -RepoDir $RootDir
 
-$Version = "2.0.3"
+$Version = "2.0.4"
 
 $BuildId = $env:BUILD_BUILDID
 if ($null -ne $BuildId) {

diff --git a/scripts/prepare-machine.ps1 b/scripts/prepare-machine.ps1
@@ -352,6 +352,7 @@ if ($IsWindows) {
             sudo apt-get install -y cppcheck clang-tidy
             # used for packaging
             sudo apt-get install -y ruby ruby-dev rpm
+            sudo gem install public_suffix -v 4.0.7
             sudo gem install fpm
         }
         "Test" {

diff --git a/scripts/run-gtest.ps1 b/scripts/run-gtest.ps1
@@ -47,7 +47,7 @@ as necessary.
 .Parameter EnableAppVerifier
     Enables all basic Application Verifier checks on the test binary.
 
-.Parameter EnableTcpipVerifier
+.Parameter EnableSystemVerifier
     Enables TCPIP verifier in user mode tests.
 
 .Parameter CodeCoverage
@@ -107,7 +107,7 @@ param (
     [switch]$EnableAppVerifier = $false,
 
     [Parameter(Mandatory = $false)]
-    [switch]$EnableTcpipVerifier = $false,
+    [switch]$EnableSystemVerifier = $false,
 
     [Parameter(Mandatory = $false)]
     [switch]$CodeCoverage = $false,
@@ -285,7 +285,7 @@ function Start-TestExecutable([String]$Arguments, [String]$OutputDir) {
     $pinfo = New-Object System.Diagnostics.ProcessStartInfo
     if ($IsWindows) {
         if ($Debugger) {
-            $pinfo.FileName = "windbg"
+            $pinfo.FileName = "windbgx"
             if ($InitialBreak) {
                 $pinfo.Arguments = "-G $($Path) $($Arguments)"
             } else {
@@ -674,17 +674,19 @@ if ($Kernel -ne "") {
     if ($LastExitCode) {
         Log ("sc.exe " + $LastExitCode)
     }
-    verifier.exe /volatile /adddriver msquicpriv.sys msquictestpriv.sys /flags 0x9BB
-    if ($LastExitCode) {
-        Log ("verifier.exe " + $LastExitCode)
+    if ($EnableSystemVerifier) {
+        verifier.exe /volatile /adddriver msquicpriv.sys msquictestpriv.sys /flags 0x9BB
+        if ($LastExitCode) {
+            Log ("verifier.exe " + $LastExitCode)
+        }
     }
     net.exe start msquicpriv
     if ($LastExitCode) {
         Log ("net.exe " + $LastExitCode)
     }
 }
 
-if ($IsWindows -and ($EnableTcpipVerifier -or $Kernel)) {
+if ($IsWindows -and $EnableSystemVerifier) {
     verifier.exe /volatile /adddriver afd.sys netio.sys tcpip.sys /flags 0x9BB
     if ($LastExitCode) {
         Log ("verifier.exe " + $LastExitCode)
@@ -758,11 +760,13 @@ try {
         net.exe stop msquicpriv /y | Out-Null
         sc.exe delete msquictestpriv | Out-Null
         sc.exe delete msquicpriv | Out-Null
-        verifier.exe /volatile /removedriver msquicpriv.sys msquictestpriv.sys
-        verifier.exe /volatile /flags 0x0
     }
 
-    if ($IsWindows -and ($EnableTcpipVerifier -or $Kernel)) {
+    if ($IsWindows -and $EnableSystemVerifier) {
+        if ($Kernel -ne "") {
+            verifier.exe /volatile /removedriver msquicpriv.sys msquictestpriv.sys
+            verifier.exe /volatile /flags 0x0
+        }
         verifier.exe /volatile /removedriver afd.sys netio.sys tcpip.sys
         verifier.exe /volatile /flags 0x0
     }

diff --git a/scripts/test.ps1 b/scripts/test.ps1
@@ -139,7 +139,7 @@ param (
     [switch]$EnableAppVerifier = $false,
 
     [Parameter(Mandatory = $false)]
-    [switch]$EnableTcpipVerifier = $false,
+    [switch]$EnableSystemVerifier = $false,
 
     [Parameter(Mandatory = $false)]
     [switch]$CodeCoverage = $false,
@@ -292,8 +292,8 @@ if ($NoProgress) {
 if ($EnableAppVerifier) {
     $TestArguments += " -EnableAppVerifier"
 }
-if ($EnableTcpipVerifier) {
-    $TestArguments += " -EnableTcpipVerifier"
+if ($EnableSystemVerifier) {
+    $TestArguments += " -EnableSystemVerifier"
 }
 if ($CodeCoverage) {
     $TestArguments += " -CodeCoverage"

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.0.3";
+$VersionNumber = "2.0.4";
 
 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.0.3</string>
+    <string>2.0.4</string>
     <key>NSHumanReadableCopyright</key>
     <string>MIT</string>
     <key>CFBundleGetInfoString</key>

diff --git a/src/inc/msquic.ver b/src/inc/msquic.ver
@@ -12,7 +12,7 @@
 #endif
 
 #ifndef VER_PATCH
-#define VER_PATCH 3
+#define VER_PATCH 4
 #endif
 
 #ifndef VER_BUILD_ID

diff --git a/src/inc/msquicp.h b/src/inc/msquicp.h
@@ -87,7 +87,7 @@ typedef struct QUIC_TEST_DATAPATH_HOOKS {
 #endif
 
 typedef struct QUIC_PRIVATE_TRANSPORT_PARAMETER {
-    uint16_t Type;
+    uint32_t Type;
     uint16_t Length;
     _Field_size_(Length)
     const uint8_t* Buffer;