From 8a0bf9f704f81a116a00f8e6dab5b63e39915d79 Mon Sep 17 00:00:00 2001
From: samatstarion <s.gerene@stariongroup.eu>
Date: Thu, 15 Aug 2024 16:10:54 +0200
Subject: [PATCH] [Update] dependencies to resolve transitive dep vulnerability

---
 .../COMET.Web.Common.Test.csproj              |   6 +-
 .../COMET.Web.Common.Tests.csproj             |   4 +
 COMET.Web.Common/COMET.Web.Common.csproj      | 151 +++++++++---------
 3 files changed, 87 insertions(+), 74 deletions(-)

diff --git a/COMET.Web.Common.Test/COMET.Web.Common.Test.csproj b/COMET.Web.Common.Test/COMET.Web.Common.Test.csproj
index 0da9b24b..0bb85037 100644
--- a/COMET.Web.Common.Test/COMET.Web.Common.Test.csproj
+++ b/COMET.Web.Common.Test/COMET.Web.Common.Test.csproj
@@ -29,10 +29,14 @@
 
   <ItemGroup>
     <PackageReference Include="bunit.web" Version="1.26.64" />
-    <PackageReference Include="DevExpress.Blazor" Version="23.2.7" />
+    <PackageReference Include="DevExpress.Blazor" Version="23.2.8" />
     <PackageReference Include="Moq" Version="4.20.70" />
   </ItemGroup>
 
+    <ItemGroup Label="override transitive vulnerable dependency">
+        <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    </ItemGroup>
+
     <ItemGroup>
         <None Include="..\README.md" Pack="true" PackagePath="\" />
         <None Include="..\cdp4-icon.png" Pack="true" PackagePath="\" />
diff --git a/COMET.Web.Common.Tests/COMET.Web.Common.Tests.csproj b/COMET.Web.Common.Tests/COMET.Web.Common.Tests.csproj
index 57423198..4a69e357 100644
--- a/COMET.Web.Common.Tests/COMET.Web.Common.Tests.csproj
+++ b/COMET.Web.Common.Tests/COMET.Web.Common.Tests.csproj
@@ -62,6 +62,10 @@
         <PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
     </ItemGroup>
 
+    <ItemGroup Label="override transitive vulnerable dependency">
+        <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\COMET.Web.Common.Test\COMET.Web.Common.Test.csproj" />
         <ProjectReference Include="..\COMET.Web.Common\COMET.Web.Common.csproj" />
diff --git a/COMET.Web.Common/COMET.Web.Common.csproj b/COMET.Web.Common/COMET.Web.Common.csproj
index 007a10ef..7b31eb47 100644
--- a/COMET.Web.Common/COMET.Web.Common.csproj
+++ b/COMET.Web.Common/COMET.Web.Common.csproj
@@ -1,76 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>Latest</LangVersion>
-    <Version>5.0.1</Version>
-    <AssemblyVersion>5.0.1</AssemblyVersion>
-    <FileVersion>5.0.1</FileVersion>
-    <Title>CDP4 WEB Common</Title>
-    <Description>A Common Library for any Blazor based application related to ECSS-E-TM-10-25</Description>
-    <Company>Starion Group S.A.</Company>
-    <Copyright>Copyright 2023-2024 Starion Group S.A.</Copyright>
-    <PackageId>CDP4.WEB.Common</PackageId>
-    <AssemblyTitle>COMET.WEB.Common</AssemblyTitle>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <Authors>Sam, Alex, Alexander, Antoine, Jaime, Nabil</Authors>
-    <RepositoryType>Git</RepositoryType>
-    <RepositoryUrl>https://github.com/STARIONGROUP/COMET-WEB-Community-Edition.git</RepositoryUrl>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageIcon>cdp4-icon.png</PackageIcon>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <PackageReleaseNotes>
-        [Update] all common view-viewmodels
-        [Update] business logic
-        [Update] to Starion Group S.A.
-    </PackageReleaseNotes>
-  </PropertyGroup>
-  <ItemGroup>
-	<PackageReference Include="AsyncEnumerator" Version="4.0.2" />
-	<PackageReference Include="Blazored.FluentValidation" Version="2.2.0" />
-	<PackageReference Include="CDP4ServicesDal-CE" Version="27.2.3" />
-	<PackageReference Include="CDP4Web-CE" Version="27.2.3" />
-    <PackageReference Include="DevExpress.Blazor" Version="23.2.7" />
-    <PackageReference Include="FluentResults" Version="3.16.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageReference Include="ReactiveUI" Version="20.1.1" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
-    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\README.md" Pack="true" PackagePath="\" />
-    <None Include="..\cdp4-icon.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
-  <ItemGroup>
-    <InternalsVisibleTo Include="COMET.Web.Common.Tests" />
-    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Update="Components\BookEditor\InputEditor.razor">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-    </Content>
-    <Content Update="wwwroot\DefaultTextConfiguration.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="wwwroot\server_configuration.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <UpToDateCheckInput Remove="Components\SingleThingApplicationTemplate.razor" />
-  </ItemGroup>
-  <ItemGroup>
-    <_ContentIncludedByDefault Remove="Components\Applications\ApplicationTemplate.razor" />
-    <_ContentIncludedByDefault Remove="Components\SingleThingApplicationTemplate.razor" />
-  </ItemGroup>
-  <ItemGroup>
-    <UpToDateCheckInput Remove="Components\Applications\ApplicationTemplate.razor" />
-  </ItemGroup>
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <LangVersion>Latest</LangVersion>
+        <Version>5.0.1</Version>
+        <AssemblyVersion>5.0.1</AssemblyVersion>
+        <FileVersion>5.0.1</FileVersion>
+        <Title>CDP4 WEB Common</Title>
+        <Description>A Common Library for any Blazor based application related to ECSS-E-TM-10-25</Description>
+        <Company>Starion Group S.A.</Company>
+        <Copyright>Copyright 2023-2024 Starion Group S.A.</Copyright>
+        <PackageId>CDP4.WEB.Common</PackageId>
+        <AssemblyTitle>COMET.WEB.Common</AssemblyTitle>
+        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <Authors>Sam, Alex, Alexander, Antoine, Jaime, Nabil</Authors>
+        <RepositoryType>Git</RepositoryType>
+        <RepositoryUrl>https://github.com/STARIONGROUP/COMET-WEB-Community-Edition.git</RepositoryUrl>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <PackageIcon>cdp4-icon.png</PackageIcon>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <PackageReleaseNotes>
+            [Update] to CDP4-SDK 27.2.3
+            [Update] to DevExpress.Blazor 23.2.8
+        </PackageReleaseNotes>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="AsyncEnumerator" Version="4.0.2" />
+        <PackageReference Include="Blazored.FluentValidation" Version="2.2.0" />
+        <PackageReference Include="CDP4ServicesDal-CE" Version="27.2.3" />
+        <PackageReference Include="CDP4Web-CE" Version="27.2.3" />
+        <PackageReference Include="DevExpress.Blazor" Version="23.2.8" />
+        <PackageReference Include="FluentResults" Version="3.16.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.8" />
+        <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.8" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
+        <PackageReference Include="ReactiveUI" Version="20.1.1" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
+        <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+    </ItemGroup>
+
+    <ItemGroup Label="override transitive vulnerable dependency">
+        <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="..\README.md" Pack="true" PackagePath="\" />
+        <None Include="..\cdp4-icon.png" Pack="true" PackagePath="\" />
+    </ItemGroup>
+    <ItemGroup>
+        <InternalsVisibleTo Include="COMET.Web.Common.Tests" />
+        <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+    </ItemGroup>
+    <ItemGroup>
+        <Content Update="Components\BookEditor\InputEditor.razor">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+        </Content>
+        <Content Update="wwwroot\DefaultTextConfiguration.json">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </Content>
+        <Content Update="wwwroot\server_configuration.json">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
+    <ItemGroup>
+        <UpToDateCheckInput Remove="Components\SingleThingApplicationTemplate.razor" />
+    </ItemGroup>
+    <ItemGroup>
+        <_ContentIncludedByDefault Remove="Components\Applications\ApplicationTemplate.razor" />
+        <_ContentIncludedByDefault Remove="Components\SingleThingApplicationTemplate.razor" />
+    </ItemGroup>
+    <ItemGroup>
+        <UpToDateCheckInput Remove="Components\Applications\ApplicationTemplate.razor" />
+    </ItemGroup>
 </Project>
\ No newline at end of file