From 9035b213d3d12cec52a06acb18429e0e9fe30ffc Mon Sep 17 00:00:00 2001
From: dibarbet <dibarbet@users.noreply.github.com>
Date: Fri, 2 Aug 2024 23:05:47 +0000
Subject: [PATCH 1/9] Update main version

---
 version.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.json b/version.json
index 8fcdcb14f..67a13ecbe 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "2.42",
+    "version": "2.43",
     "publicReleaseRefSpec": [
         "^refs/heads/release$",
         "^refs/heads/prerelease$",

From 95932b8461d2d46f6872b0847a95041016403477 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Wed, 7 Aug 2024 20:02:36 -0700
Subject: [PATCH 2/9] Update Roslyn to 4.12.0-2.24407.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2aa0d15d4..4d2aef52f 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     }
   },
   "defaults": {
-    "roslyn": "4.12.0-2.24401.2",
+    "roslyn": "4.12.0-2.24407.3",
     "omniSharp": "1.39.11",
     "razor": "9.0.0-preview.24366.2",
     "razorOmnisharp": "7.0.0-preview.23363.1",

From 0af8e39d29b99640e6c9ee07399b95ce9de16b12 Mon Sep 17 00:00:00 2001
From: Evgeny Tvorun <evgenyt@microsoft.com>
Date: Thu, 8 Aug 2024 09:07:59 -0700
Subject: [PATCH 3/9] Bump xamlTools version

---
 CHANGELOG.md | 2 +-
 package.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d783b6f9..82dbd729d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
   * Modify ISyntaxFacts methods to allocate less (PR: [#74596](https://github.com/dotnet/roslyn/pull/74596))
   * Fix cases where unused private members were not grayed out (PR: [#74589](https://github.com/dotnet/roslyn/pull/74589))
   * Fix URI handling when comparing encoded and unencoded URIs (PR: [#74544](https://github.com/dotnet/roslyn/pull/74544))
-* Bump xamltools to 17.12.35131.21 (PR: [#7409](https://github.com/dotnet/vscode-csharp/pull/7409))
+* Bump xamltools to 17.12.35208.23 (PR: [#7409](https://github.com/dotnet/vscode-csharp/pull/7409))
 
 # 2.41.x
 * Bump Roslyn to 4.12.0-1.24376.3 (PR: [#7393](https://github.com/dotnet/vscode-csharp/pull/7393))
diff --git a/package.json b/package.json
index 2aa0d15d4..13f183e80 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "omniSharp": "1.39.11",
     "razor": "9.0.0-preview.24366.2",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.12.35131.21"
+    "xamlTools": "17.12.35208.23"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",
@@ -5575,4 +5575,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}

From 73e0d36f724abfabd48a9cf3aad1ccb423091d6f Mon Sep 17 00:00:00 2001
From: Evgeny Tvorun <evgenyt@microsoft.com>
Date: Thu, 8 Aug 2024 09:09:06 -0700
Subject: [PATCH 4/9] Update PR info

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82dbd729d..f9af90d27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
   * Modify ISyntaxFacts methods to allocate less (PR: [#74596](https://github.com/dotnet/roslyn/pull/74596))
   * Fix cases where unused private members were not grayed out (PR: [#74589](https://github.com/dotnet/roslyn/pull/74589))
   * Fix URI handling when comparing encoded and unencoded URIs (PR: [#74544](https://github.com/dotnet/roslyn/pull/74544))
-* Bump xamltools to 17.12.35208.23 (PR: [#7409](https://github.com/dotnet/vscode-csharp/pull/7409))
+* Bump xamltools to 17.12.35208.23 (PR: [#7422](https://github.com/dotnet/vscode-csharp/pull/7422))
 
 # 2.41.x
 * Bump Roslyn to 4.12.0-1.24376.3 (PR: [#7393](https://github.com/dotnet/vscode-csharp/pull/7393))

From 661eb1d3218518274cec28e40551a0e5294e3e41 Mon Sep 17 00:00:00 2001
From: Marco Goertz <mgoertz@microsoft.com>
Date: Thu, 8 Aug 2024 16:08:48 -0700
Subject: [PATCH 5/9] Added onEnterRules for the following cases:

```xaml
<Button>|</Button>
=>
<Button>
    |
</Button>
```

and

```xaml
<Button Width="100" |
=>
<Button Width="100"
    |
```

Everything else will get the previous indent as before.
---
 src/xaml/language-configuration.json | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/xaml/language-configuration.json b/src/xaml/language-configuration.json
index 294b4dbad..086e48314 100644
--- a/src/xaml/language-configuration.json
+++ b/src/xaml/language-configuration.json
@@ -55,5 +55,20 @@
 	},
 	"wordPattern": {
 		"pattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\#\\$\\%\\^\\&\\*\\(\\)\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\?\\s]+)"
-	}
+	},
+  "onEnterRules": [
+    {
+      "beforeText": "^\\s*(<([A-Za-z0-9_.-]+)([^/>]*(?!/)>)[^<]*)(?!.*<\\/\\2>)$",
+      "afterText": "^\\s*<\\/([A-Za-z0-9_.-]+)[^>]*>$",
+      "action": {
+        "indent": "indentOutdent"
+      }
+    },
+    {
+      "beforeText": "^\\s*(<([A-Za-z0-9_.-]+)[^</]*)$",
+      "action": {
+        "indent": "indent"
+      }
+    },
+  ]
 }

From 8caf84469702bb42fbf61d61fba89236ab3e8a42 Mon Sep 17 00:00:00 2001
From: Evgeny Tvorun <evgenyt@microsoft.com>
Date: Thu, 8 Aug 2024 16:10:45 -0700
Subject: [PATCH 6/9] Update version again

---
 CHANGELOG.md | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9af90d27..e7ebb99ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
   * Modify ISyntaxFacts methods to allocate less (PR: [#74596](https://github.com/dotnet/roslyn/pull/74596))
   * Fix cases where unused private members were not grayed out (PR: [#74589](https://github.com/dotnet/roslyn/pull/74589))
   * Fix URI handling when comparing encoded and unencoded URIs (PR: [#74544](https://github.com/dotnet/roslyn/pull/74544))
-* Bump xamltools to 17.12.35208.23 (PR: [#7422](https://github.com/dotnet/vscode-csharp/pull/7422))
+* Bump xamltools to 17.12.35208.31 (PR: [#7422](https://github.com/dotnet/vscode-csharp/pull/7422))
 
 # 2.41.x
 * Bump Roslyn to 4.12.0-1.24376.3 (PR: [#7393](https://github.com/dotnet/vscode-csharp/pull/7393))
diff --git a/package.json b/package.json
index 13f183e80..e7a099402 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "omniSharp": "1.39.11",
     "razor": "9.0.0-preview.24366.2",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.12.35208.23"
+    "xamlTools": "17.12.35208.31"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",

From f561d94a32f00ff12c5a8ed643f70f7df5e3a2a4 Mon Sep 17 00:00:00 2001
From: Evgeny Tvorun <evgenyt@microsoft.com>
Date: Fri, 9 Aug 2024 07:36:10 -0700
Subject: [PATCH 7/9] Bump xamlTools to 17.12.35209.18

---
 CHANGELOG.md | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7ebb99ce..007575fc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
   * Modify ISyntaxFacts methods to allocate less (PR: [#74596](https://github.com/dotnet/roslyn/pull/74596))
   * Fix cases where unused private members were not grayed out (PR: [#74589](https://github.com/dotnet/roslyn/pull/74589))
   * Fix URI handling when comparing encoded and unencoded URIs (PR: [#74544](https://github.com/dotnet/roslyn/pull/74544))
-* Bump xamltools to 17.12.35208.31 (PR: [#7422](https://github.com/dotnet/vscode-csharp/pull/7422))
+* Bump xamltools to 17.12.35209.18 (PR: [#7428](https://github.com/dotnet/vscode-csharp/pull/7428))
 
 # 2.41.x
 * Bump Roslyn to 4.12.0-1.24376.3 (PR: [#7393](https://github.com/dotnet/vscode-csharp/pull/7393))
diff --git a/package.json b/package.json
index 3ade86955..23720261a 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "omniSharp": "1.39.11",
     "razor": "9.0.0-preview.24366.2",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.12.35208.31"
+    "xamlTools": "17.12.35209.18"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",

From 68f686ff79ef4e593519b066d1bd8aa50d9ddcfc Mon Sep 17 00:00:00 2001
From: David Barbet <dabarbet@microsoft.com>
Date: Fri, 9 Aug 2024 13:52:34 -0700
Subject: [PATCH 8/9] Update Roslyn to 4.12.0-2.24408.4 and update changelog

---
 CHANGELOG.md | 6 +++++-
 package.json | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 007575fc4..6153faae7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,13 +4,17 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # Latest
-* Bump Roslyn to 4.12.0-2.24401.2 (PR: [#7413](https://github.com/dotnet/vscode-csharp/pull/7413))
+* Bump Roslyn to 4.12.0-2.24408.4 (PR: [#7429](https://github.com/dotnet/vscode-csharp/pull/7429))
   * Reduce allocations in SyntaxEquivalence.AreEquivalent by using a more appropriate pooling mechanism for the stack it uses to walk trees. (PR: [#74610](https://github.com/dotnet/roslyn/pull/74610))
   * Reduce allocations in SyntaxNodeExtensions.GetMembers to instead execute a given lambda over the collection. (PR: [#74628](https://github.com/dotnet/roslyn/pull/74628))
   * Modify ISyntaxFacts methods to allocate less (PR: [#74596](https://github.com/dotnet/roslyn/pull/74596))
   * Fix cases where unused private members were not grayed out (PR: [#74589](https://github.com/dotnet/roslyn/pull/74589))
   * Fix URI handling when comparing encoded and unencoded URIs (PR: [#74544](https://github.com/dotnet/roslyn/pull/74544))
+  * Only report project load events for initial load in VSCode (PR: [#74688](https://github.com/dotnet/roslyn/pull/74688))
+  * Reduce allocations in AbstractSymbolCompletionProvider.CreateItems (PR: [#74670](https://github.com/dotnet/roslyn/pull/74670))
 * Bump xamltools to 17.12.35209.18 (PR: [#7428](https://github.com/dotnet/vscode-csharp/pull/7428))
+* Task 2187810: [VS Code] Add OnEnter rules to indent tags (PR: [#7426](https://github.com/dotnet/vscode-csharp/pull/7426))
+* Fix completion handler bug that causes language server to crash (#7401) (PR: [#7406](https://github.com/dotnet/vscode-csharp/pull/7406))
 
 # 2.41.x
 * Bump Roslyn to 4.12.0-1.24376.3 (PR: [#7393](https://github.com/dotnet/vscode-csharp/pull/7393))
diff --git a/package.json b/package.json
index 23720261a..06620ab3d 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     }
   },
   "defaults": {
-    "roslyn": "4.12.0-2.24407.3",
+    "roslyn": "4.12.0-2.24408.4",
     "omniSharp": "1.39.11",
     "razor": "9.0.0-preview.24366.2",
     "razorOmnisharp": "7.0.0-preview.23363.1",

From c01efc04f50f086411cbd6764a1cf592c8cbbed8 Mon Sep 17 00:00:00 2001
From: Andrew Wang <waan@microsoft.com>
Date: Fri, 9 Aug 2024 13:58:51 -0700
Subject: [PATCH 9/9] Fix Attach to .NET Process before Roslyn LSP is ready
 (#7427)

* Fix Attach to .NET Process before Roslyn LSP is ready

This PR passes the roslynServerStartedProcess to the coreClrDebug
activate call as the Roslyn Server registers the 'coreclr'
DebugConfigurationProvider that will handle the process listing for the
user to select the process ID.

If the configuration provider is not registered but the adapter factory
is, it will send it to the debugger without a processName or processId
and will fail with that error.
---
 l10n/bundle.l10n.json        |  1 +
 src/coreclrDebug/activate.ts | 16 +++++++++++++++-
 src/main.ts                  |  3 ++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/l10n/bundle.l10n.json b/l10n/bundle.l10n.json
index 83003ec4d..23fab989f 100644
--- a/l10n/bundle.l10n.json
+++ b/l10n/bundle.l10n.json
@@ -191,6 +191,7 @@
   "Unexpected message received from debugger.": "Unexpected message received from debugger.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[ERROR]: C# Extension failed to install the debugger package.",
   "Could not find a process id to attach.": "Could not find a process id to attach.",
+  "Unable to launch Attach to Process dialog: ": "Unable to launch Attach to Process dialog: ",
   "[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'",
   "[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.",
   "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.",
diff --git a/src/coreclrDebug/activate.ts b/src/coreclrDebug/activate.ts
index 11380f51c..3cb7fa5e2 100644
--- a/src/coreclrDebug/activate.ts
+++ b/src/coreclrDebug/activate.ts
@@ -26,7 +26,8 @@ export async function activate(
     context: vscode.ExtensionContext,
     platformInformation: PlatformInformation,
     eventStream: EventStream,
-    csharpOutputChannel: vscode.OutputChannel
+    csharpOutputChannel: vscode.OutputChannel,
+    languageServerStartedPromise: Promise<any> | undefined
 ) {
     const disposables = new CompositeDisposable();
 
@@ -66,6 +67,19 @@ export async function activate(
     // Register a command to fire attach to process for the coreclr debug engine.
     disposables.add(
         vscode.commands.registerCommand('csharp.attachToProcess', async () => {
+            // Ensure dotnetWorkspaceConfigurationProvider is registered
+            if (languageServerStartedPromise) {
+                try {
+                    await languageServerStartedPromise;
+                } catch (e: any) {
+                    if (e as Error) {
+                        throw new Error(vscode.l10n.t('Unable to launch Attach to Process dialog: ') + e.message);
+                    } else {
+                        throw e;
+                    }
+                }
+            }
+
             vscode.debug.startDebugging(
                 undefined,
                 {
diff --git a/src/main.ts b/src/main.ts
index e2433a315..0fa150161 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -323,7 +323,8 @@ export async function activate(
             context,
             platformInfo,
             eventStream,
-            csharpChannel
+            csharpChannel,
+            roslynLanguageServerStartedPromise ?? omnisharpLangServicePromise
         );
     }