Update feature/websockets to match main.

.github/CODEOWNERS

@@ -6,7 +6,7 @@
 ################
 
 # Git Hub integration and bot rules
-/.github/                @AlexGhiondea @jsquire @rickwinter
+/.github/                @jsquire @rickwinter
 
 ###########
 # SDK
@@ -23,20 +23,20 @@
 /sdk/core/               @rickwinter @ahsonkhan @antkmsft @vhvb1989 @gearama @LarryOsterman
 
 # PRLabel: %Azure.Identity
-/sdk/identity/           @antkmsft @schaabs @ahsonkhan @rickwinter @vhvb1989 @gearama
+/sdk/identity/           @antkmsft @schaabs @ahsonkhan @rickwinter @vhvb1989 @gearama @LarryOsterman
 
 ###########
 # Client SDKs
 ###########
 
 # PRLabel: %Attestation
-/sdk/attestation/        @LarryOsterman @gkostal @anilba06 @kroshkina-ms
+/sdk/attestation/        @LarryOsterman @gkostal @anilba06 @kroshkina-ms @ahmadmsft @rickwinter @ahsonkhan @antkmsft @vhvb1989 @gearama
 
 # PRLabel: %KeyVault
 /sdk/keyvault/           @vhvb1989 @gearama @antkmsft @rickwinter
 
 # PRLabel: %Storage
-/sdk/storage/            @vinjiang @katmsft @Jinming-Hu @antkmsft @vhvb1989 @gearama @LarryOsterman
+/sdk/storage/            @vinjiang @katmsft @Jinming-Hu @EmmaZhu @antkmsft @vhvb1989 @gearama @LarryOsterman
 
 # PRLabel: %EngSys
 /sdk/template/           @danieljurek @weshaggard

.vscode/cspell.json

@@ -19,6 +19,7 @@
     "Dockerfile",
     "*nlohmann-json*",
     "eng/docs/api/assets/**/*",
+    "eng/CredScanSuppression.json",
     "**/test/ut/recordings/*.json"
   ],
   // * Unless configured otherwise, these words are not case sensitive
@@ -42,9 +43,11 @@
     "cuse",
     "CUSEUAP",
     "DCMAKE",
+    "DDISABLE",
     "deserializers",
     "Deserializes",
     "DFETCH",
+    "DMSVC",
     "docfx",
     "DPAPI",
     "DRUN",
@@ -67,6 +70,8 @@
     "Intel",
     "itfactor",
     "iusg",
+    "jepio",
+    "Jeremi",
     "Kirilov",
     "lcov",
     "LIBCMTD",
@@ -79,6 +84,7 @@
     "ncus",
     "Niels",
     "nlohmann",
+    "nostd",
     "noclean",
     "NOCLOSE",
     "NOCRLF",
@@ -87,8 +93,11 @@
     "northcentralus",
     "NTSTATUS",
     "okhttp",
+    "opentelemetry",
+    "otel",
     "PBYTE",
     "pdbs",
+    "Piotrowski",
     "PUCHAR",
     "pwsh",
     "Ragrs",
@@ -146,7 +155,9 @@
         "issecret",
         "PSScriptRoot",
         "BUILDID",
-        "cppvcpkgcache"
+        "cppvcpkgcache",
+        "cmakegenerate",
+        "cmakesourcegenerate"
       ]
     },
     {

CMakeLists.txt

@@ -55,21 +55,31 @@ if(MSVC_USE_STATIC_CRT AND MSVC)
   #
   # 5. We "replace with empty string" (i.e. remove) first, then add, so that '/MT'
   # will be present (and present once) even if '/MD' was not.
-
+  message(STATUS "Configuring Static Runtime Library.")
+  if(${CMAKE_CXX_FLAGS} MATCHES ".*/MD.*")
   string(REGEX REPLACE "/MD" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MT")
+  endif()
 
+  if(${CMAKE_CXX_FLAGS_RELEASE} MATCHES ".*/MD.*")
   string(REGEX REPLACE "/MD" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
-
+  endif()
+
+  if(${CMAKE_CXX_FLAGS_RELWITHDEBINFO} MATCHES ".*/MD.*")
   string(REGEX REPLACE "/MD" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
+  endif()
 
+  if(${CMAKE_CXX_FLAGS_MINSIZEREL} MATCHES ".*/MD.*")
   string(REGEX REPLACE "/MD" "" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}")
   set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MT")
+  endif()
 
+  if(${CMAKE_CXX_FLAGS_DEBUG} MATCHES ".*/MD.*")
   string(REGEX REPLACE "/MDd" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+  endif()
 endif()
 
 if(BUILD_TESTING)
@@ -91,6 +101,7 @@ include(AzureVersion)
 
 if(BUILD_SAMPLES)
   add_subdirectory(samples/helpers/get-env)
+  add_subdirectory(samples/helpers/service)
 endif()
 
 # sub-projects
@@ -102,6 +113,5 @@ add_subdirectory(sdk/storage)
 add_subdirectory(sdk/template)
 
 if(BUILD_SAMPLES)
-  add_subdirectory(samples/integration/vcpkg-keyvault)
   add_subdirectory(samples/integration/vcpkg-all-smoke)
 endif()

CMakeSettings.json

@@ -15,6 +15,11 @@
           "name": "VCPKG_TARGET_TRIPLET",
           "value": "x64-windows-static",
           "type": "STRING"
+        },
+        {
+          "name": "MSVC_USE_STATIC_CRT",
+          "value": "True",
+          "type": "BOOL"
         }
       ]
     },
@@ -33,6 +38,11 @@
           "name": "VCPKG_TARGET_TRIPLET",
           "value": "x64-windows-static",
           "type": "STRING"
+        },
+        {
+          "name": "MSVC_USE_STATIC_CRT",
+          "value": "True",
+          "type": "BOOL"
         }
       ]
     },
@@ -51,6 +61,11 @@
           "name": "VCPKG_TARGET_TRIPLET",
           "value": "x86-windows-static",
           "type": "STRING"
+        },
+        {
+          "name": "MSVC_USE_STATIC_CRT",
+          "value": "True",
+          "type": "BOOL"
         }
       ]
     },
@@ -70,6 +85,11 @@
           "value": "True",
           "type": "BOOL"
         },
+        {
+          "name": "MSVC_USE_STATIC_CRT",
+          "value": "True",
+          "type": "BOOL"
+        },
         {
           "name": "BUILD_TRANSPORT_CURL",
           "value": "True",
@@ -210,6 +230,28 @@
           "type": "BOOL"
         }
       ]
+    },
+    {
+      "name": "x64-DebugWithPerfTest",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "-DINSTALL_GTEST=OFF -DBUILD_TESTING=ON -DBUILD_TRANSPORT_CURL=ON -DBUILD_SAMPLES=ON -DBUILD_PERFORMANCE_TESTS=ON",
+      "buildCommandArgs": "-v",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "variables": [
+        {
+          "name": "VCPKG_TARGET_TRIPLET",
+          "value": "x64-windows-static",
+          "type": "STRING"
+        },
+        {
+          "name": "MSVC_USE_STATIC_CRT",
+          "value": "True",
+          "type": "BOOL"
+        }
+      ]
     }
   ]
 }