Merge branch 'main' into lilyydu/vision

microsoft · Apr 16, 2024 · 1d32db8 · 1d32db8
2 parents 35768b4 + 0b03bd3
commit 1d32db8
Show file tree

Hide file tree

Showing 26 changed files with 90 additions and 97 deletions.
diff --git a/.github/workflows/dotnet-codeql.yml b/.github/workflows/dotnet-codeql.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/init@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
         with:
           languages: csharp
       - name: Setup .NET
@@ -50,6 +50,6 @@ jobs:
         working-directory: dotnet/packages/Microsoft.TeamsAI/
         run: dotnet build Microsoft.Teams.AI.sln --configuration Release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/analyze@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
         with:
           category: "/language:csharp"
diff --git a/.github/workflows/js-codeql.yml b/.github/workflows/js-codeql.yml
@@ -38,10 +38,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/init@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
         with:
           languages: javascript
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/analyze@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
         with:
           category: "/language:javascript"
diff --git a/.github/workflows/python-codeql.yml b/.github/workflows/python-codeql.yml
@@ -38,10 +38,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/init@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
         with:
           languages: python
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/analyze@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
         with:
           category: "/language:python"
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -66,6 +66,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/upload-sarif@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
         with:
           sarif_file: results.sarif
diff --git a/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI.Tests/Microsoft.Teams.AI.Tests.csproj b/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI.Tests/Microsoft.Teams.AI.Tests.csproj
@@ -16,8 +16,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/Microsoft.Teams.AI.csproj b/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/Microsoft.Teams.AI.csproj
@@ -43,7 +43,7 @@
     <PackageReference Include="Microsoft.Bot.Builder" Version="4.22.2" />
     <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.22.2" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.2" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.60.1" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.60.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Microsoft.ML.Tokenizers" Version="0.22.0-preview.24179.1" />
     <PackageReference Include="System.Text.Json" Version="7.0.4" />

diff --git a/js/package.json b/js/package.json
@@ -24,14 +24,14 @@
         "openai": "4.28.4"
     },
     "devDependencies": {
-        "@azure/logger": "^1.1.1",
+        "@azure/logger": "^1.1.2",
         "@azure/ms-rest-js": "2.7.0",
-        "@microsoft/api-extractor": "^7.43.0",
+        "@microsoft/api-extractor": "^7.43.1",
         "@standardlabs/is-private": "^1.0.1",
         "@types/jsonwebtoken": "9.0.4",
         "@types/lodash": "^4.17.0",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.12.5",
+        "@types/node": "^20.12.7",
         "@types/sinon": "^10.0.19",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
@@ -42,7 +42,7 @@
         "eslint-config-prettier": "^8.10.0",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-jsdoc": "^46.10.1",
-        "eslint-plugin-mocha": "^10.4.1",
+        "eslint-plugin-mocha": "^10.4.2",
         "eslint-plugin-only-warn": "^1.1.0",
         "eslint-plugin-prettier": "^5.1.3",
         "eslint": "^8.57.0",

diff --git a/js/packages/teams-ai/package.json b/js/packages/teams-ai/package.json
@@ -29,7 +29,7 @@
         "openai": "4.28.4"
     },
     "dependencies": {
-        "@azure/msal-node": "^2.6.6",
+        "@azure/msal-node": "^2.7.0",
         "axios": "^1.6.8",
         "botbuilder-dialogs": "^4.22.1",
         "botframework-connector": "^4.22.1",
@@ -49,7 +49,7 @@
         "@types/express": "^4.17.21",
         "@types/jsonwebtoken": "^9.0.4",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.12.5",
+        "@types/node": "^20.12.7",
         "@types/uuid": "^9.0.8",
         "botbuilder-core": "^4.22.1",
         "eslint": "^8.57.0",

diff --git a/js/samples/01.getting-started/a.echoBot/package.json b/js/samples/01.getting-started/a.echoBot/package.json
@@ -27,7 +27,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/02.teams-features/a.messageExtensions.searchCommand/package.json b/js/samples/02.teams-features/a.messageExtensions.searchCommand/package.json
@@ -28,7 +28,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/package.json b/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/package.json
@@ -28,7 +28,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/03.ai-concepts/a.twentyQuestions/package.json b/js/samples/03.ai-concepts/a.twentyQuestions/package.json
@@ -27,7 +27,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/03.ai-concepts/b.AI-messageExtensions/package.json b/js/samples/03.ai-concepts/b.AI-messageExtensions/package.json
@@ -27,7 +27,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/03.ai-concepts/c.actionMapping-lightBot/package.json b/js/samples/03.ai-concepts/c.actionMapping-lightBot/package.json
@@ -27,7 +27,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/restify": "8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/03.ai-concepts/d.chainedActions-listBot/package.json b/js/samples/03.ai-concepts/d.chainedActions-listBot/package.json
@@ -27,7 +27,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/jsonwebtoken": "^9.0.4",
         "@types/restify": "8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",

diff --git a/js/samples/03.ai-concepts/e.customModel-LLAMA/package.json b/js/samples/03.ai-concepts/e.customModel-LLAMA/package.json
@@ -30,7 +30,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/restify": "8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/03.ai-concepts/f.chatModeration/package.json b/js/samples/03.ai-concepts/f.chatModeration/package.json
@@ -29,7 +29,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/04.ai-apps/a.teamsChefBot/package.json b/js/samples/04.ai-apps/a.teamsChefBot/package.json
@@ -22,7 +22,7 @@
     "dependencies": {
         "@microsoft/teams-ai": "~1.1.3",
         "@microsoft/teamsfx": "^2.3.1",
-        "@microsoft/teams-js": "^2.21.0",
+        "@microsoft/teams-js": "^2.22.0",
         "botbuilder": "^4.22.1",
         "dotenv": "^16.4.5",
         "openai": "4.28.4",
@@ -32,7 +32,7 @@
     },
     "devDependencies": {
         "@types/jsonwebtoken": "^9.0.6",
-        "@types/node": "^20.12.5",
+        "@types/node": "^20.12.7",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/04.ai-apps/b.devOpsBot/package.json b/js/samples/04.ai-apps/b.devOpsBot/package.json
@@ -28,7 +28,7 @@
     },
     "devDependencies": {
         "@types/jsonwebtoken": "^9.0.6",
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/04.ai-apps/c.vision-cardGazer/package.json b/js/samples/04.ai-apps/c.vision-cardGazer/package.json
@@ -29,7 +29,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.5",
+        "@types/node": "^20.12.7",
         "@types/restify": "8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/04.ai-apps/d.assistants-mathBot/package.json b/js/samples/04.ai-apps/d.assistants-mathBot/package.json
@@ -29,7 +29,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/04.ai-apps/e.assistants-orderBot/package.json b/js/samples/04.ai-apps/e.assistants-orderBot/package.json
@@ -29,7 +29,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/jsonwebtoken": "^9.0.4",
         "@types/restify": "8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",

diff --git a/js/samples/04.ai-apps/f.whoBot/package.json b/js/samples/04.ai-apps/f.whoBot/package.json
@@ -28,7 +28,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/jsonwebtoken": "^8.5.4",
         "@types/restify": "8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",

diff --git a/js/samples/04.ai-apps/g.datasource-azureAISearch/package.json b/js/samples/04.ai-apps/g.datasource-azureAISearch/package.json
@@ -41,7 +41,7 @@
     "devDependencies": {
         "@types/debug": "^4.1.12",
         "@types/jsonwebtoken": "^8.5.0",
-        "@types/node": "^20.12.5",
+        "@types/node": "^20.12.7",
         "@types/restify": "8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

diff --git a/js/samples/04.ai-apps/h.datasource-azureOpenAI/package.json b/js/samples/04.ai-apps/h.datasource-azureOpenAI/package.json
@@ -38,7 +38,7 @@
     "devDependencies": {
         "@types/debug": "^4.1.12",
         "@types/jsonwebtoken": "^8.5.0",
-        "@types/node": "^20.12.5",
+        "@types/node": "^20.12.7",
         "@types/restify": "8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",