Skip to content

Commit 2b9caea

Browse files
Merge pull request #148 from microsoft/fix/dependabotchanges-issues
fix: Fixed package conflicts and dependency issues in dependabotchanges branch
2 parents 53dddfa + a49dc2b commit 2b9caea

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<PackageReference Include="Microsoft.SemanticKernel" Version="1.32.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="3.1.0" />
26+
<PackageReference Include="MongoDB.Bson" Version="2.29.0" />
2727
<PackageReference Include="MongoDB.Driver" Version="2.29.0" />
2828
<PackageReference Include="MongoDB.Driver.Core" Version="2.29.0" />
2929
<PackageReference Include="NSwag.AspNetCore" Version="14.2.0" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<PackageReference Include="Microsoft.KernelMemory.WebClient" Version="0.79.241014.2" />
1515
<PackageReference Include="Microsoft.Maui.Graphics" Version="9.0.21" />
1616
<PackageReference Include="Microsoft.Maui.Graphics.Skia" Version="8.0.90" />
17-
<PackageReference Include="MongoDB.Driver" Version="3.0.0" />
18-
<PackageReference Include="MongoDB.Driver.Core" Version="2.30.0" />
17+
<PackageReference Include="MongoDB.Driver" Version="2.29.0" />
18+
<PackageReference Include="MongoDB.Driver.Core" Version="2.29.0" />
1919
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.116.1" />
2020
</ItemGroup>
2121

App/frontend-app/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use the official Node.js image from the Docker Hub
2-
FROM node:18
2+
FROM node:20
33

44
# Set the working directory inside the container
55
WORKDIR /app

App/frontend-app/src/index.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
@use "./assets/scss/global.scss";
2+
13
@tailwind base;
24
@tailwind components;
35
@tailwind utilities;
46

5-
@import "./assets/scss/global.scss";

0 commit comments

Comments
 (0)