Pull all Websockets changes to main.

.vscode/cspell.json

@@ -11,11 +11,13 @@
     "*.exe",
     "*.a",
     "*.lib",
-    "*.yaml",  
-    "**/libcurl-stress-test/README.md", 
+    "*.yaml",
+    "**/libcurl-stress-test/README.md",
     ".github/CODEOWNERS",
     ".gitignore",
     ".vscode/cspell.json",
+    "ci.yml",
+    "squid.conf*",
     "eng/common/**/*",
     "json.hpp",
     "Dockerfile",
@@ -34,6 +36,8 @@
     "Aloctl",
     "azcore",
     "azsdk",
+    "azsdkengsys",
+    "azurecr",
     "azuresdk",
     "azuresdkforcpp",
     "centralus",
@@ -80,27 +84,31 @@
     "Lohmann",
     "LPBYTE",
     "LPSTR",
+    "LPWSTR",
     "MHSM",
     "moxygen",
     "MSRC",
     "ncus",
     "Niels",
     "nlohmann",
-    "nostd",
     "noclean",
     "NOCLOSE",
     "NOCRLF",
+    "nohup",
     "NOLINT",
     "NOMINMAX",
     "northcentralus",
+    "nostd",
     "NTSTATUS",
     "okhttp",
     "opentelemetry",
     "otel",
     "PBYTE",
     "pdbs",
     "Piotrowski",
+    "pscredential",
     "PUCHAR",
+    "PVOID",
     "pwsh",
     "Ragrs",
     "Ragzrs",
@@ -121,22 +129,22 @@
     "stoll",
     "stoull",
     "STREQ",
+    "uaenorth",
     "uksouth",
     "undeleted",
     "unscoped",
     "unskipped",
     "UPNs",
-    "uaenorth",
     "usgov",
     "usgoviowa",
     "usgovvirginia",
-    "westcentralus",
     "vcpkg",
     "Viet",
     "Viktor",
     "vusg",
     "Wdocumentation",
     "Werror",
+    "westcentralus",
     "westus",
     "Wextra",
     "Wgnu",
@@ -178,6 +186,12 @@
         "SECP"
       ]
     },
+    {
+      "filename": "**/sdk/core/azure-core/**",
+      "words": [
+        "TEAMPROJECTID"
+      ]
+    },
     {
       "filename": "**/sdk/core/azure-core/README.md",
       "words": [
@@ -227,10 +241,10 @@
       ]
     },
     {
-       "filename": "**/sdk/storage/azure-storage-files-shares/**/*",
-       "words": [
-         "mibps"
-        ]
+      "filename": "**/sdk/storage/azure-storage-files-shares/**/*",
+      "words": [
+        "mibps"
+      ]
     },
     {
       "filename": "**/cmake-modules/**/*",

CMakeSettings.json

@@ -56,12 +56,65 @@
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "inheritEnvironments": [ "msvc_x86" ],
+      "variables": [
+        {
+          "name": "BUILD_TESTING",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "VCPKG_TARGET_TRIPLET",
+          "value": "x86-windows-static",
+          "type": "STRING"
+        },
+        {
+          "name": "MSVC_USE_STATIC_CRT",
+          "value": "True",
+          "type": "BOOL"
+        }
+      ]
+    },
+    {
+      "name": "x86-Release-static_curl",
+      "generator": "Ninja",
+      "configurationType": "MinSizeRel",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x86" ],
       "variables": [
         {
           "name": "VCPKG_TARGET_TRIPLET",
           "value": "x86-windows-static",
           "type": "STRING"
         },
+        {
+          "name": "BUILD_TESTING",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "DISABLE_PROXY_TESTS",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_PERFORMANCE_TESTS",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "RUN_LONG_UNIT_TESTS",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_TRANSPORT_CURL",
+          "value": "True",
+          "type": "BOOL"
+        },
         {
           "name": "MSVC_USE_STATIC_CRT",
           "value": "True",

eng/pipelines/templates/jobs/archetype-sdk-client.yml

@@ -32,6 +32,12 @@ parameters:
   - name: TestEnv
     type: object
     default: []
+  - name: PreTestSteps
+    type: stepList
+    default: []
+  - name: PostTestSteps
+    type: stepList
+    default: []
 
 jobs:
   - template: /eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
@@ -53,6 +59,8 @@ jobs:
         LineCoverageTarget: ${{ parameters.LineCoverageTarget }}
         BranchCoverageTarget: ${{ parameters.BranchCoverageTarget }}
         TestEnv: ${{ parameters.TestEnv }}
+        PreTestSteps: ${{ parameters.PreTestSteps }}
+        PostTestSteps: ${{ parameters.PostTestSteps }}
 
   # Disable build for cpp - client
   - ${{ if ne(parameters.ServiceDirectory, 'not-specified' )}}:

eng/pipelines/templates/jobs/ci.tests.yml

@@ -46,6 +46,13 @@ parameters:
   - name: UsePlatformContainer
     type: boolean
     default: false
+  - name: PreTestSteps
+    type: stepList
+    default: []
+  - name: PostTestSteps
+    type: stepList
+    default: []
+
 
 jobs:
   - job:
@@ -137,6 +144,8 @@ jobs:
           BuildArgs: "$(BuildArgs)"
           Env: "$(CmakeEnvArg)"
 
+      - ${{ parameters.PreTestSteps }}
+
       - pwsh: |
           ctest `
             -C Debug `
@@ -147,6 +156,8 @@ jobs:
             -T Test
         workingDirectory: build
         displayName: Test
+
+      - ${{ parameters.PostTestSteps }}
 
       - task: PublishTestResults@2
         inputs:

eng/pipelines/templates/jobs/live.tests.yml

@@ -36,6 +36,12 @@ parameters:
 - name: UsePlatformContainer
   type: boolean
   default: false
+- name: PreTestSteps
+  type: stepList
+  default: []
+- name: PostTestSteps
+  type: stepList
+  default: []
 
 jobs:
 - job: ValidateLive
@@ -126,6 +132,8 @@ jobs:
         Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
       SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
 
+  - ${{ parameters.PreTestSteps }}
+
     # For non multi-config generator use the same build configuration to run tests
     # We don't need to set it to invoke ctest
     # Visual Studio generator used in CI is a multi-config generator.
@@ -141,6 +149,8 @@ jobs:
       succeeded(),
       ne(variables['RunSamples'], '1'))
 
+  - ${{ parameters.PostTestSteps }}
+
   - task: PublishTestResults@2
     inputs:
       testResultsFormat: cTest

eng/pipelines/templates/stages/archetype-sdk-client.yml

@@ -67,6 +67,12 @@ parameters:
 - name: UnsupportedClouds
   type: string
   default: ''
+- name: PreTestSteps
+  type: stepList
+  default: []
+- name: PostTestSteps
+  type: stepList
+  default: []
 
 
 stages:
@@ -96,6 +102,8 @@ stages:
           ${{ if eq(parameters.ServiceDirectory, 'template') }}:
             TestPipeline: true
           TestEnv: ${{ parameters.TestEnv }}
+          PreTestSteps: ${{ parameters.PreTestSteps }}
+          PostTestSteps: ${{ parameters.PostTestSteps }}
 
   - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(parameters.LiveTestCtestRegex, '')) }}:
     - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
@@ -110,6 +118,8 @@ stages:
         Clouds: ${{ parameters.Clouds }}
         SupportedClouds: ${{ parameters.SupportedClouds }}
         UnsupportedClouds: ${{ parameters.UnsupportedClouds }}
+        PreTestSteps: ${{ parameters.PreTestSteps }}
+        PostTestSteps: ${{ parameters.PostTestSteps }}
 
   - ${{ if and(eq(variables['System.TeamProject'], 'internal'), not(endsWith(variables['Build.DefinitionName'], ' - tests'))) }}:
     - template: archetype-cpp-release.yml

eng/pipelines/templates/stages/archetype-sdk-tests.yml

@@ -29,6 +29,12 @@ parameters:
 - name: UnsupportedClouds
   type: string
   default: ''
+- name: PreTestSteps
+  type: stepList
+  default: []
+- name: PostTestSteps
+  type: stepList
+  default: []
 
 stages:
 - ${{ each cloud in parameters.CloudConfig }}:
@@ -57,3 +63,5 @@ stages:
                 Coverage: ${{ parameters.Coverage}}
                 CoverageReportPath: ${{ parameters.CoverageReportPath}}
                 TimeoutInMinutes: ${{ parameters.TimeoutInMinutes}}
+                PreTestSteps: ${{ parameters.PreTestSteps }}
+                PostTestSteps: ${{ parameters.PostTestSteps }}