Merge branch 'microsoft:main' into main

s-o-w · Oct 23, 2023 · d7e48d1 · d7e48d1
2 parents 22b0690 + e139555
commit d7e48d1
Show file tree

Hide file tree

Showing 3 changed files with 1,067 additions and 1,064 deletions.
diff --git a/webapi/CopilotChatWebApi.csproj b/webapi/CopilotChatWebApi.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.35.4" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.15.1" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.15.3" />
     <PackageReference Include="Microsoft.SemanticKernel" Version="0.24.230918.1-preview" />
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.AI.OpenAI" Version="0.24.230918.1-preview" />
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.Memory.AzureCognitiveSearch" Version="0.24.230918.1-preview" />

diff --git a/webapp/package.json b/webapp/package.json
@@ -17,7 +17,7 @@
   "dependencies": {
     "@azure/msal-browser": "^2.38.2",
     "@azure/msal-react": "^1.5.11",
-    "@fluentui/react-components": "^9.34.1",
+    "@fluentui/react-components": "^9.36.0",
     "@fluentui/react-icons": "^2.0.220",
     "@fluentui/react-northstar": "^0.66.4",
     "@microsoft/signalr": "^7.0.11",
@@ -27,18 +27,18 @@
     "microsoft-cognitiveservices-speech-sdk": "^1.32.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-markdown": "^8.0.7",
+    "react-markdown": "^9.0.0",
     "react-redux": "^8.1.3",
-    "remark-gfm": "^3.0.1"
+    "remark-gfm": "^4.0.0"
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@types/debug": "^4.1.7",
     "@types/node": "^20.8.6",
     "@types/react": "^18.2.24",
-    "@types/react-dom": "^18.2.11",
-    "@typescript-eslint/eslint-plugin": "^6.7.3",
-    "@typescript-eslint/parser": "^6.7.5",
+    "@types/react-dom": "^18.2.14",
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
     "eslint": "^8.51.0",
     "prettier": "^3.0.3",
     "react-scripts": "^5.0.1",