Merge branch 'main' into users/makinc/dialog-handle-skipped-cancel-event

ni · Feb 22, 2024 · 73aeb9e · 73aeb9e
2 parents 1f43bdd + fe357da
commit 73aeb9e
Show file tree

Hide file tree

Showing 52 changed files with 957 additions and 100 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,7 +6,6 @@
       "mode": "auto"
     }
   ],
-  "xd.globalEditor": true,
   "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
   "omnisharp.useModernNet": true
 }
diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json
@@ -1,6 +1,66 @@
 {
   "name": "@ni/nimble-angular",
   "entries": [
+    {
+      "date": "Thu, 22 Feb 2024 01:13:03 GMT",
+      "version": "20.2.5",
+      "tag": "@ni/nimble-angular_v20.2.5",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v21.6.2",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 21 Feb 2024 23:32:45 GMT",
+      "version": "20.2.4",
+      "tag": "@ni/nimble-angular_v20.2.4",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v21.6.1",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 21 Feb 2024 21:18:20 GMT",
+      "version": "20.2.3",
+      "tag": "@ni/nimble-angular_v20.2.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v21.6.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 21 Feb 2024 19:48:20 GMT",
+      "version": "20.2.2",
+      "tag": "@ni/nimble-angular_v20.2.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v21.5.5",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Tue, 20 Feb 2024 17:54:12 GMT",
       "version": "20.2.1",

diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md
@@ -1,9 +1,41 @@
 # Change Log - @ni/nimble-angular
 
-This log was last generated on Tue, 20 Feb 2024 17:54:12 GMT and should not be manually modified.
+This log was last generated on Thu, 22 Feb 2024 01:13:03 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 20.2.5
+
+Thu, 22 Feb 2024 01:13:03 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v21.6.2
+
+## 20.2.4
+
+Wed, 21 Feb 2024 23:32:45 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v21.6.1
+
+## 20.2.3
+
+Wed, 21 Feb 2024 21:18:20 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v21.6.0
+
+## 20.2.2
+
+Wed, 21 Feb 2024 19:48:20 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v21.5.5
+
 ## 20.2.1
 
 Tue, 20 Feb 2024 17:54:12 GMT

diff --git a/angular-workspace/projects/ni/nimble-angular/package.json b/angular-workspace/projects/ni/nimble-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-angular",
-  "version": "20.2.1",
+  "version": "20.2.5",
   "description": "Angular components for the NI Nimble Design System",
   "scripts": {
     "invoke-publish": "cd ../../../ && npm run build:library && cd dist/ni/nimble-angular && npm publish"
@@ -31,7 +31,7 @@
     "@angular/forms": "^15.2.10",
     "@angular/localize": "^15.2.10",
     "@angular/router": "^15.2.10",
-    "@ni/nimble-components": "^21.5.4"
+    "@ni/nimble-components": "^21.6.2"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/jasmine-parameterized/CHANGELOG.json b/packages/jasmine-parameterized/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/jasmine-parameterized",
   "entries": [
+    {
+      "date": "Wed, 21 Feb 2024 19:48:20 GMT",
+      "version": "0.2.2",
+      "tag": "@ni/jasmine-parameterized_v0.2.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "jattasNI@users.noreply.github.com",
+            "package": "@ni/jasmine-parameterized",
+            "commit": "a9ba0b6027479fe1cc2267f11957caa329910dfc",
+            "comment": "Add keywords to package metadata and fix typo in examples"
+          }
+        ]
+      }
+    },
     {
       "date": "Tue, 23 Jan 2024 22:00:33 GMT",
       "version": "0.2.1",

diff --git a/packages/jasmine-parameterized/CHANGELOG.md b/packages/jasmine-parameterized/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/jasmine-parameterized
 
-This log was last generated on Tue, 23 Jan 2024 22:00:33 GMT and should not be manually modified.
+This log was last generated on Wed, 21 Feb 2024 19:48:20 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.2.2
+
+Wed, 21 Feb 2024 19:48:20 GMT
+
+### Patches
+
+- Add keywords to package metadata and fix typo in examples ([ni/nimble@a9ba0b6](https://github.com/ni/nimble/commit/a9ba0b6027479fe1cc2267f11957caa329910dfc))
+
 ## 0.2.1
 
 Tue, 23 Jan 2024 22:00:33 GMT