Skip to content

Commit a488a2b

Browse files
Roopan-MicrosoftRoopan-Microsoft
authored
Merge pull request #430 from microsoft/dev
fix: merging dev to main
2 parents 19fe7d9 + 1ee2c16 commit a488a2b

File tree

24 files changed

+3811
-3405
lines changed

24 files changed

+3811
-3405
lines changed

‎.github/workflows/Create-Release.yml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
on:
2+
push:
3+
branches:
4+
- main
5+
6+
permissions:
7+
contents: write
8+
pull-requests: write
9+
10+
name: Create-Release
11+
12+
jobs:
13+
create-release:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
with:
19+
ref: ${{ github.event.workflow_run.head_sha }}
20+
21+
- uses: codfish/semantic-release-action@v3
22+
id: semantic
23+
with:
24+
tag-format: 'v${version}'
25+
additional-packages: |
26+
['conventional-changelog-conventionalcommits@7']
27+
plugins: |
28+
[
29+
[
30+
"@semantic-release/commit-analyzer",
31+
{
32+
"preset": "conventionalcommits"
33+
}
34+
],
35+
[
36+
"@semantic-release/release-notes-generator",
37+
{
38+
"preset": "conventionalcommits",
39+
"presetConfig": {
40+
"types": [
41+
{ type: 'feat', section: 'Features', hidden: false },
42+
{ type: 'fix', section: 'Bug Fixes', hidden: false },
43+
{ type: 'perf', section: 'Performance Improvements', hidden: false },
44+
{ type: 'revert', section: 'Reverts', hidden: false },
45+
{ type: 'docs', section: 'Other Updates', hidden: false },
46+
{ type: 'style', section: 'Other Updates', hidden: false },
47+
{ type: 'chore', section: 'Other Updates', hidden: false },
48+
{ type: 'refactor', section: 'Other Updates', hidden: false },
49+
{ type: 'test', section: 'Other Updates', hidden: false },
50+
{ type: 'build', section: 'Other Updates', hidden: false },
51+
{ type: 'ci', section: 'Other Updates', hidden: false }
52+
]
53+
}
54+
}
55+
],
56+
'@semantic-release/github'
57+
]
58+
env:
59+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
60+
- run: echo ${{ steps.semantic.outputs.release-version }}
61+
62+
- run: echo "$OUTPUTS"
63+
env:
64+
OUTPUTS: ${{ toJson(steps.semantic.outputs) }}
65+

‎App/backend-api/Microsoft.GS.DPS.Host/Microsoft.GS.DPS.Host.csproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -12,23 +12,23 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="AutoMapper" Version="14.0.0" />
15-
<PackageReference Include="Azure.Data.AppConfiguration" Version="1.5.0" />
16-
<PackageReference Include="Azure.Identity" Version="1.13.2" />
17-
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.6" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
21-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
22-
<PackageReference Include="Microsoft.KernelMemory.WebClient" Version="0.79.241014.2" />
23-
<PackageReference Include="Microsoft.SemanticKernel" Version="1.32.0" />
15+
<PackageReference Include="Azure.Data.AppConfiguration" Version="1.6.1" />
16+
<PackageReference Include="Azure.Identity" Version="1.14.1" />
17+
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.12.0" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.2.0" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.6" />
21+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.6" />
22+
<PackageReference Include="Microsoft.KernelMemory.WebClient" Version="0.98.250508.3" />
23+
<PackageReference Include="Microsoft.SemanticKernel" Version="1.59.0" />
2424
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
2525
<PackageReference Include="MimeTypesMap" Version="1.0.9" />
26-
<PackageReference Include="MongoDB.Bson" Version="2.29.0" />
27-
<PackageReference Include="MongoDB.Driver" Version="2.29.0" />
28-
<PackageReference Include="MongoDB.Driver.Core" Version="2.29.0" />
29-
<PackageReference Include="NSwag.AspNetCore" Version="14.2.0" />
30-
<PackageReference Include="NSwag.Core" Version="14.2.0" />
31-
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
26+
<PackageReference Include="MongoDB.Bson" Version="2.29.0" />
27+
<PackageReference Include="MongoDB.Driver" Version="2.29.0" />
28+
<PackageReference Include="MongoDB.Driver.Core" Version="2.29.0" />
29+
<PackageReference Include="NSwag.AspNetCore" Version="14.4.0" />
30+
<PackageReference Include="NSwag.Core" Version="14.4.0" />
31+
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.1" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

‎App/backend-api/Microsoft.GS.DPS/Microsoft.GS.DPS.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -8,15 +8,15 @@
88

99
<ItemGroup>
1010
<PackageReference Include="AutoMapper" Version="14.0.0" />
11-
<PackageReference Include="Azure.Search.Documents" Version="11.6.0" />
12-
<PackageReference Include="FluentValidation" Version="11.11.0" />
13-
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
14-
<PackageReference Include="Microsoft.KernelMemory.WebClient" Version="0.79.241014.2" />
15-
<PackageReference Include="Microsoft.Maui.Graphics" Version="9.0.40" />
16-
<PackageReference Include="Microsoft.Maui.Graphics.Skia" Version="9.0.40" />
11+
<PackageReference Include="Azure.Search.Documents" Version="11.6.1" />
12+
<PackageReference Include="FluentValidation" Version="12.0.0" />
13+
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
14+
<PackageReference Include="Microsoft.KernelMemory.WebClient" Version="0.98.250508.3" />
15+
<PackageReference Include="Microsoft.Maui.Graphics" Version="9.0.81" />
16+
<PackageReference Include="Microsoft.Maui.Graphics.Skia" Version="9.0.81" />
1717
<PackageReference Include="MongoDB.Driver" Version="2.29.0" />
1818
<PackageReference Include="MongoDB.Driver.Core" Version="2.29.0" />
19-
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.116.1" />
19+
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.119.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎App/frontend-app/package.json‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -13,82 +13,82 @@
1313
"test": "jest --coverage --detectOpenHandles"
1414
},
1515
"dependencies": {
16-
"@azure/msal-browser": "^2.39.0",
17-
"@azure/msal-react": "^1.5.13",
16+
"@azure/msal-browser": "^4.14.0",
17+
"@azure/msal-react": "^3.0.14",
1818
"@fluentai/attachments": "^0.7.1",
1919
"@fluentai/react-copilot": "^0.11.3",
2020
"@fluentai/react-copilot-chat": "^0.5.2",
2121
"@fluentai/reference": "^0.8.2",
2222
"@fluentai/textarea": "^0.5.1",
23-
"@fluentui/react": "^8.122.11",
24-
"@fluentui/react-components": "^9.60.0",
25-
"@fluentui/react-datepicker-compat": "^0.5.0",
26-
"@fluentui/react-file-type-icons": "^8.12.8",
27-
"@fluentui/react-icons": "^2.0.274",
23+
"@fluentui/react": "^8.123.0",
24+
"@fluentui/react-components": "^9.66.5",
25+
"@fluentui/react-datepicker-compat": "^0.6.5",
26+
"@fluentui/react-file-type-icons": "^8.13.2",
27+
"@fluentui/react-icons": "^2.0.305",
2828
"@fluentui/react-tags-preview": "^0.4.0",
29-
"@microsoft/applicationinsights-react-js": "^17.3.5",
30-
"@microsoft/applicationinsights-web": "^3.3.5",
29+
"@microsoft/applicationinsights-react-js": "^19.3.6",
30+
"@microsoft/applicationinsights-web": "^3.3.9",
3131
"@react-pdf-viewer/core": "^3.12.0",
3232
"@react-pdf-viewer/default-layout": "^3.12.0",
3333
"date-fns": "^4.1.0",
3434
"dropzone": "^6.0.0-beta.2",
35-
"i18next": "^24.2.2",
36-
"i18next-browser-languagedetector": "^8.0.4",
35+
"i18next": "^25.3.0",
36+
"i18next-browser-languagedetector": "^8.2.0",
3737
"i18next-http-backend": "^3.0.2",
3838
"km-app": "file:",
39-
"marked": "^15.0.7",
39+
"marked": "^16.0.0",
4040
"notistack": "^3.0.2",
4141
"pdfjs-dist": "^4.7.76",
42-
"react": "^18.2.0",
43-
"react-dom": "^18.2.0",
42+
"react": "^19.1.0",
43+
"react-dom": "^19.1.0",
4444
"react-dropzone": "^14.3.5",
45-
"react-i18next": "^15.4.1",
46-
"react-markdown": "^10.0.1",
47-
"react-router-dom": "^7.2.0",
45+
"react-i18next": "^15.5.3",
46+
"react-markdown": "^10.1.0",
47+
"react-router-dom": "^7.6.3",
4848
"react-tiff": "^0.0.14",
4949
"react-uploader": "^3.43.0",
50-
"use-debounce": "^10.0.4"
50+
"use-debounce": "^10.0.5"
5151
},
5252
"devDependencies": {
5353
"@testing-library/jest-dom": "^6.6.3",
54-
"@testing-library/react": "^15.0.7",
55-
"@types/cors": "^2.8.13",
56-
"@types/express": "^4.17.17",
57-
"@types/jest": "^29.5.14",
58-
"@types/react": "^18.2.13",
59-
"@types/react-dom": "^18.2.6",
54+
"@testing-library/react": "^16.3.0",
55+
"@types/cors": "^2.8.19",
56+
"@types/express": "^5.0.3",
57+
"@types/jest": "^30.0.0",
58+
"@types/react": "^19.1.8",
59+
"@types/react-dom": "^19.1.6",
6060
"@types/react-router-dom": "^5.3.3",
61-
"@typescript-eslint/eslint-plugin": "^7.0.0",
62-
"@typescript-eslint/parser": "^6.15.0",
63-
"@vitejs/plugin-basic-ssl": "^2.0.0",
64-
"@vitejs/plugin-react": "^4.3.4",
65-
"autoprefixer": "^10.4.20",
66-
"body-parser": "^1.20.3",
67-
"concurrently": "^9.1.2",
61+
"@typescript-eslint/eslint-plugin": "^8.35.1",
62+
"@typescript-eslint/parser": "^8.35.1",
63+
"@vitejs/plugin-basic-ssl": "^2.1.0",
64+
"@vitejs/plugin-react": "^4.6.0",
65+
"autoprefixer": "^10.4.21",
66+
"body-parser": "^2.2.0",
67+
"concurrently": "^9.2.0",
6868
"cors": "^2.8.5",
69-
"eslint": "^8.53.0",
70-
"eslint-config-prettier": "^10.0.2",
71-
"eslint-import-resolver-typescript": "^3.8.3",
72-
"eslint-plugin-import": "^2.29.1",
69+
"eslint": "^9.30.1",
70+
"eslint-config-prettier": "^10.1.5",
71+
"eslint-import-resolver-typescript": "^4.4.4",
72+
"eslint-plugin-import": "^2.32.0",
7373
"eslint-plugin-jsx-a11y": "^6.10.2",
74-
"eslint-plugin-react": "^7.37.4",
74+
"eslint-plugin-react": "^7.37.5",
7575
"eslint-plugin-react-hooks": "^5.2.0",
76-
"eslint-plugin-react-refresh": "^0.4.16",
77-
"express": "^4.21.2",
78-
"jest": "^29.7.0",
79-
"jest-environment-jsdom": "^29.7.0",
80-
"nodemon": "^3.1.9",
81-
"postcss": "^8.4.49",
82-
"prettier": "^3.5.3",
83-
"prettier-plugin-tailwindcss": "^0.6.11",
76+
"eslint-plugin-react-refresh": "^0.4.20",
77+
"express": "^5.1.0",
78+
"jest": "^30.0.3",
79+
"jest-environment-jsdom": "^30.0.2",
80+
"nodemon": "^3.1.10",
81+
"postcss": "^8.5.6",
82+
"prettier": "^3.6.2",
83+
"prettier-plugin-tailwindcss": "^0.6.13",
8484
"react-tiff": "^0.0.14",
85-
"sass": "^1.85.1",
85+
"sass": "^1.89.2",
8686
"tailwindcss": "^3.4.17",
87-
"ts-jest": "^29.2.6",
87+
"ts-jest": "^29.4.0",
8888
"ts-node": "^10.9.2",
8989
"tslib": "^2.6.2",
90-
"typescript": "^5.8.2",
91-
"vite": "^6.2.6"
90+
"typescript": "^5.8.3",
91+
"vite": "^6.2.0"
9292
},
9393
"volta": {
9494
"node": "18.16.0",

‎App/frontend-app/src/assets/icons/azureIcon.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22

3-
export function AzureIcon({ className }: { className?: string }): JSX.Element {
3+
export function AzureIcon({ className }: { className?: string }): React.JSX.Element {
44
return (
55
<svg className={className} fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
66
<path

‎App/frontend-app/src/assets/icons/gitHubLogoIcon.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22

3-
export function GitHubIcon({ className }: { className?: string }): JSX.Element {
3+
export function GitHubIcon({ className }: { className?: string }): React.JSX.Element {
44
return (
55
<svg className={className} fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
66
<path d="M12 .3a11.97 11.97 0 0 1 6.05 1.63c.88.53 1.69 1.16 2.42 1.88.74.72 1.37 1.53 1.89 2.42a12.08 12.08 0 0 1-.62 13.08c-.73 1-1.6 1.88-2.6 2.63a11.8 11.8 0 0 1-3.45 1.76h-.1a.6.6 0 0 1-.45-.16.59.59 0 0 1-.16-.43v-3.29c0-.4-.05-.8-.17-1.21-.11-.4-.33-.75-.63-1.02.9-.1 1.7-.29 2.38-.55a4.6 4.6 0 0 0 2.74-2.88 8.2 8.2 0 0 0 .35-2.49 4.85 4.85 0 0 0-1.23-3.22 3.37 3.37 0 0 0 .25-1.38 4.37 4.37 0 0 0-.37-1.8.34.34 0 0 0-.12-.02h-.13c-.25 0-.51.04-.79.12-.27.08-.54.18-.8.3A10.73 10.73 0 0 0 15 6.5a11.07 11.07 0 0 0-6 0 12.97 12.97 0 0 0-1.44-.82 7.35 7.35 0 0 0-.82-.3 2.7 2.7 0 0 0-.79-.13h-.13c-.04 0-.09 0-.12.02a5.94 5.94 0 0 0-.37 1.8 4.27 4.27 0 0 0 .25 1.38 4.6 4.6 0 0 0-1.23 3.22c0 .95.11 1.78.34 2.47a4.56 4.56 0 0 0 2.74 2.9c.68.28 1.47.47 2.38.56a2 2 0 0 0-.52.73c-.11.28-.2.57-.24.88a3.22 3.22 0 0 1-1.37.31c-.5 0-.92-.11-1.25-.35a3.4 3.4 0 0 1-.88-.96 3.38 3.38 0 0 0-.77-.84 2.13 2.13 0 0 0-.5-.28c-.18-.07-.37-.11-.57-.12h-.14a.44.44 0 0 0-.17.03l-.17.07c-.05.03-.07.07-.07.12 0 .1.06.18.17.27l.27.21.03.03a6.17 6.17 0 0 1 .8.76c.1.14.2.29.27.44l.27.55c.26.61.64 1.05 1.11 1.33a3.5 3.5 0 0 0 1.72.42 5.32 5.32 0 0 0 1.22-.14v2.04a.6.6 0 0 1-.16.44c-.11.11-.26.17-.46.17h-.1a11.55 11.55 0 0 1-6.05-4.38A12.17 12.17 0 0 1 .43 9.1c.28-1.03.69-1.98 1.22-2.86.53-.89 1.16-1.7 1.88-2.43.71-.73 1.52-1.36 2.42-1.89A12.08 12.08 0 0 1 12 .3z" />

‎App/frontend-app/src/assets/icons/mailIcon.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22

3-
export function MailIcon({ className }: { className?: string }): JSX.Element {
3+
export function MailIcon({ className }: { className?: string }): React.JSX.Element {
44
return (
55
<svg className={className} fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
66
<path d="M5.25 4h13.5a3.25 3.25 0 0 1 3.245 3.066L22 7.25v9.5a3.25 3.25 0 0 1-3.066 3.245L18.75 20H5.25a3.25 3.25 0 0 1-3.245-3.066L2 16.75v-9.5a3.25 3.25 0 0 1 3.066-3.245L5.25 4h13.5-13.5ZM20.5 9.373l-8.15 4.29a.75.75 0 0 1-.603.043l-.096-.042L3.5 9.374v7.376a1.75 1.75 0 0 0 1.606 1.744l.144.006h13.5a1.75 1.75 0 0 0 1.744-1.607l.006-.143V9.373ZM18.75 5.5H5.25a1.75 1.75 0 0 0-1.744 1.606L3.5 7.25v.429l8.5 4.473 8.5-4.474V7.25a1.75 1.75 0 0 0-1.607-1.744L18.75 5.5Z" />

‎App/frontend-app/src/components/chat/OptionsPanel.css‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
.options-panel-container {
22
padding-bottom: 20px; /* Add more padding below the toggle */
33
margin-top: 2px;
4+
width: 100%;
5+
display: flex;
6+
flex-direction: column;
7+
align-items: center;
48
}
59

610
.options-panel-container.sticky {
@@ -25,7 +29,8 @@
2529
position: relative;
2630
background-color: #ffffff;
2731
border-radius: 9999px;
28-
width: 300px;
32+
width: 100%;
33+
max-width: 320px;
2934
height: 40px;
3035
display: flex;
3136
align-items: center;

0 commit comments

Comments
 (0)