Merge branch 'dev' into qinezh/testtool

OfficeDev · Nov 7, 2023 · bdd7311 · bdd7311
2 parents c9e42f3 + a902a3d
commit bdd7311
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/.config/samples-config-v3.json b/.config/samples-config-v3.json
@@ -1,15 +1,16 @@
 {
     "filterOptions": {
-        "types": [
+        "capabilities": [
             "Tab",
             "Bot",
-            "Message extension"
+            "Message Extension",
+            "Meeting"
         ],
         "languages": [
-            "JS",
-            "TS"
+            "JavaScript",
+            "TypeScript"
         ],
-        "techniques": [
+        "technologies": [
             "Azure",
             "Adaptive Cards",
             "SSO",
@@ -186,7 +187,12 @@
             "thumbnailPath": "images/send-proactive-messages.gif",
             "gifPath": "images/send-proactive-messages.gif",
             "suggested": false,
-            "downloadUrl": "https://github.com/OfficeDev/Microsoft-Teams-Samples/tree/main/samples/bot-proactive-messaging-teamsfx"
+            "downloadUrlInfo": {
+                "owner": "OfficeDev",
+                "repository": "Microsoft-Teams-Samples",
+                "ref": "main",
+                "dir": "samples/bot-proactive-messaging-teamsfx"
+            }
         },
         {
             "id": "adaptive-card-notification",
@@ -419,7 +425,12 @@
             "thumbnailPath": "assets/outlook-set-signature-overview.png",
             "gifPath": "assets/outlook-set-signature-overview.png",
             "suggested": false,
-            "downloadUrl": "https://github.com/OfficeDev/Office-Add-in-samples/tree/main/Samples/outlook-set-signature"
+            "downloadUrlInfo": {
+                "owner": "OfficeDev",
+                "repository": "Office-Add-in-samples",
+                "ref": "main",
+                "dir": "Samples/outlook-set-signature"
+            }
         },
         {
             "id": "developer-assist-dashboard",

diff --git a/.github/workflows/ci-sample-validation.yml b/.github/workflows/ci-sample-validation.yml
@@ -45,7 +45,7 @@ jobs:
           # This script runs the validation tool against all samples in the samples-config-v3.json file.
           # External samples are excluded from the validation.
           exceptions=("incoming-webhook-notification")
-          samples=`jq -r ".samples | .[] | select(has(\"downloadUrl\") | not) | .id" .config/samples-config-v3.json`
+          samples=`jq -r ".samples | .[] | select(has(\"downloadUrlInfo\") | not) | .id" .config/samples-config-v3.json`
           validationFailed="validation failed"
           validationResult=true
           while IFS= read -r line; do

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,7 +23,7 @@ Before your start, you might want to know whether you will need to commit your s
 Some explaination of how to perform each step in above process:
 1. Submit your source code by creating a pull request to our repo (target `dev` branch by default), a typical project is in below structure. Make sure you have the `thumbnail.png` and `README.md` files included in your source code. 
 
-> You can run the [Sample Validatioin Tool](https://github.com/OfficeDev/TeamsFx-Samples/tree/dev/validation-tool) before raising the PR to make sure your sample satisfies our requirements.
+> You can run the [Sample Validation Tool](https://github.com/OfficeDev/TeamsFx-Samples/tree/dev/validation-tool) before raising the PR to make sure your sample satisfies our requirements.
 
 ```
 - sampleTeamsProject