From f87d7a735eb53aa50963820bcd08d520d39efa59 Mon Sep 17 00:00:00 2001
From: Colen Garoutte-Carson <49173979+Colengms@users.noreply.github.com>
Date: Thu, 8 Jul 2021 18:11:11 -0700
Subject: [PATCH 1/3] Fix issue causing a squiggle in package.json (#7806)

---
 Extension/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Extension/package.json b/Extension/package.json
index 140884f358..b3fe919db4 100644
--- a/Extension/package.json
+++ b/Extension/package.json
@@ -54,7 +54,6 @@
         "id": "cppWelcome",
         "title": "Get Started with C++ Development",
         "description": "Dive into VS Code's rich C++ development experience.",
-        "primary": true,
         "when": "false",
         "steps": [
           {

From 9791061ca2441bf997970c02705119d4fa2b57e5 Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Thu, 8 Jul 2021 21:46:24 -0700
Subject: [PATCH 2/3] Add localization hint. (#7799)

---
 Extension/src/nativeStrings.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Extension/src/nativeStrings.json b/Extension/src/nativeStrings.json
index d5606f24f4..5dbd120227 100644
--- a/Extension/src/nativeStrings.json
+++ b/Extension/src/nativeStrings.json
@@ -229,5 +229,8 @@
     "invoking_nvcc": "Invoking nvcc with command line: {0}",
     "nvcc_host_compile_command_not_found": "Unable to find host compile command in output of nvcc.",
     "unable_to_locate_forced_include": "Unable to locate forced include: {0}",
-    "inline_macro": "Inline macro"
+    "inline_macro": {
+        "text": "Inline macro",
+        "hint": "'Inline' is a command and not an adjective, i.e. like 'Expand macro'."
+    }
 }

From bbe5c42e64f07db041ce7f82db9eac4e0def6753 Mon Sep 17 00:00:00 2001
From: Andrew Wang <waan@microsoft.com>
Date: Fri, 9 Jul 2021 01:52:36 -0700
Subject: [PATCH 3/3] Update Windows Debugger Packages (#7811)

* Fix vsdbg crash on windows x64

Addresses #7808

* Update package version and add CHANGELOG
---
 Extension/CHANGELOG.md |  4 ++++
 Extension/package.json | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
index f4cfe76f63..f01773113f 100644
--- a/Extension/CHANGELOG.md
+++ b/Extension/CHANGELOG.md
@@ -1,5 +1,9 @@
 # C/C++ for Visual Studio Code Change Log
 
+## Version 1.5.1: July 9, 2021
+### Bug Fixes
+* cppvsdbg Debugging becomes no-op between 1.4.1 and 1.5.0 [#7808](https://github.com/microsoft/vscode-cpptools/issues/7808)
+
 ## Version 1.5.0: July 8, 2021
 ### New Feature
 * Add the "Inline macro" code action. [#4183](https://github.com/microsoft/vscode-cpptools/issues/4183)
diff --git a/Extension/package.json b/Extension/package.json
index b3fe919db4..fc5d8b8dc0 100644
--- a/Extension/package.json
+++ b/Extension/package.json
@@ -2,7 +2,7 @@
   "name": "cpptools",
   "displayName": "C/C++",
   "description": "C/C++ IntelliSense, debugging, and code browsing.",
-  "version": "1.5.0-main",
+  "version": "1.5.1-main",
   "publisher": "ms-vscode",
   "icon": "LanguageCCPP_color_128x.png",
   "readme": "README.md",
@@ -3106,7 +3106,7 @@
     },
     {
       "description": "Visual Studio Windows Debugger",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2167487",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2167539",
       "platforms": [
         "win32"
       ],
@@ -3117,11 +3117,11 @@
       "binaries": [
         "./debugAdapters/vsdbg/bin/vsdbg.exe"
       ],
-      "integrity": "BACAD3BC69C548FA5CEC0B15109C8628CB45D0F622F1F6C635A23C29B0B042E1"
+      "integrity": "3E71A1FDD78FBD9FD46ADEE0DF1283349363078B273CAE765978ACF1BA9C2DB1"
     },
     {
       "description": "Visual Studio Windows ARM64 Debugger",
-      "url": "https://go.microsoft.com/fwlink/?linkid=2167488",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2167648",
       "platforms": [
         "win32"
       ],
@@ -3131,7 +3131,7 @@
       "binaries": [
         "./debugAdapters/vsdbg/bin/vsdbg.exe"
       ],
-      "integrity": "64325BABDC9B51E7D51111788083BE91C3CC36DEC80145687D9AB6F988F9071F"
+      "integrity": "698BA3D45B925F998AACE9ED387ADE4927FFE569860408570FD074DD0CD56252"
     }
   ]
 }
\ No newline at end of file