Merge release into master

hayemaxi · Jun 14, 2024 · c1b0a7c · c1b0a7c
2 parents ce8468d + f5032d3
commit c1b0a7c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/toolkit/.changes/3.10.0.json b/packages/toolkit/.changes/3.10.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-06-14",
+	"version": "3.10.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "UX: Amazon Q continues to install even if users uninstall it."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: Dev Environment may time out if user is not authenticated"
+		}
+	]
+}
diff --git a/packages/toolkit/.changes/next-release/Bug Fix-7a3ed468-dad2-4867-933b-1cfc101e99b9.json b/packages/toolkit/.changes/next-release/Bug Fix-7a3ed468-dad2-4867-933b-1cfc101e99b9.json
diff --git a/packages/toolkit/.changes/next-release/Bug Fix-ebea70a6-ac18-4394-a543-c9422ef5ccb7.json b/packages/toolkit/.changes/next-release/Bug Fix-ebea70a6-ac18-4394-a543-c9422ef5ccb7.json
diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 3.10.0 2024-06-14
+
+- **Bug Fix** UX: Amazon Q continues to install even if users uninstall it.
+- **Bug Fix** CodeCatalyst: Dev Environment may time out if user is not authenticated
+
 ## 3.9.0 2024-06-07
 
 - **Feature** Toolkit now supports creating, viewing and editing [Threat Composer](https://github.com/awslabs/threat-composer#readme) threat models (`*.tc.json`)

diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit",
     "description": "Including CodeCatalyst, Application Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.",
-    "version": "3.10.0-SNAPSHOT",
+    "version": "3.11.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],