Merge remote-tracking branch 'upstream/dev' into features/upgrade-to-spfx-1.15

stevebeauge · stevebeauge · commit 58aeee058041 · 2022-07-13T17:09:17.000+02:00
diff --git a/CHANGELOG.json b/CHANGELOG.json
@@ -1,5 +1,14 @@
 {
   "versions": [
+    {
+      "version": "3.10.0",
+      "changes": {
+        "new": [],
+        "enhancements": [],
+        "fixes": []
+      },
+      "contributions": []
+    },
     {
       "version": "3.9.0",
       "changes": {
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Releases
 
+## 3.10.0
+
 ## 3.9.0
 
 ### New control(s)
diff --git a/docs/documentation/docs/about/release-notes.md b/docs/documentation/docs/about/release-notes.md
@@ -1,5 +1,7 @@
 # Releases
 
+## 3.10.0
+
 ## 3.9.0
 
 ### New control(s)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@pnp/spfx-controls-react",
   "description": "Reusable React controls for SharePoint Framework solutions",
-  "version": "3.9.0",
+  "version": "3.10.0",
   "scripts": {
     "build": "gulp build",
     "clean": "gulp clean",
diff --git a/src/common/telemetry/version.ts b/src/common/telemetry/version.ts
@@ -1 +1 @@
-export const version: string = "3.9.0";
+export const version: string = "3.10.0";

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@pnp/spfx-controls-react",`
`3`	`3`	`"description": "Reusable React controls for SharePoint Framework solutions",`
`4`		`- "version": "3.9.0",`
	`4`	`+ "version": "3.10.0",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "gulp build",`
`7`	`7`	`"clean": "gulp clean",`