Skip to content

Commit

Permalink
CG work item fix for System.Text.JSON package (#1871)
Browse files Browse the repository at this point in the history
Updated System.Text.Json to 8.0.5 to address
GHSA-hh2w-p6rv-4g7w. This will fix CG
issue https://dev.azure.com/mseng/1ES/_workitems/edit/2221678/?view=edit
Along with this updated its root dependencies to latest.

**NOTE: After updating the version, test case was failing in pipeline
with below error**

**Error Log:**
Failed AllDropFilesAreAccountedFor [136 ms]

**Error Message:**
Assert.IsFalse failed. 1 drop files are missing from "ProductComponent"
of WXS: Microsoft.Bcl.TimeProvider.dll
  
**Stack Trace:
at MsiFileTests.WxsValidationTests.CompareWxsSectionToDropPath(String
repoRoot, String relativeDropPath, String wxsFile, String
wxsComponentId, HashSet`1 intentionalExclusions) in
D:\a\_work\1\s\src\MsiFileTests\WxsValidationTests.cs:line 48
at MsiFileTests.WxsValidationTests.AllDropFilesAreAccountedFor() in
D:\a\_work\1\s\src\MsiFileTests\WxsValidationTests.cs:line 25**
Results File:
D:\a\_work\_temp\TestResults\cloudtest_d22066dec000000_2024-10-17_06_24_32.trx

To fix above, made changes in **Product.wxs** as below

**Added below code to fix the error in pipeline:**
`<File Id="Microsoft.Bcl.TimeProvider.dll"
Source="Microsoft.Bcl.TimeProvider.dll" />`
  • Loading branch information
v-rakeshsh authored Oct 27, 2024
1 parent 22c8f98 commit 5f7860f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@
<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.66" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.65.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.3" />
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="7.6.3" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.6.3" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="8.1.2" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.1.2" />
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="19.227.0-preview" />
<PackageReference Include="Microsoft.VisualStudio.Services.Client" Version="19.227.0-preview" />
<PackageReference Include="Microsoft.VisualStudio.Services.InteractiveClient" Version="19.227.0-preview" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.6.3" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.1.2" />
<PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<ProjectReference Include="..\AccessibilityInsights.CommonUxComponents\CommonUxComponents.csproj" />
<ProjectReference Include="..\AccessibilityInsights.Extensions\Extensions.csproj" />
Expand Down
1 change: 1 addition & 0 deletions src/MSI/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
<File Id="Microsoft.Azure.DevOps.Comments.WebApi.dll" Source="Microsoft.Azure.DevOps.Comments.WebApi.dll" />
<File Id="Microsoft.Azure.Pipelines.WebApi.dll" Source="Microsoft.Azure.Pipelines.WebApi.dll" />
<File Id="Microsoft.Bcl.AsyncInterfaces.dll" Source="Microsoft.Bcl.AsyncInterfaces.dll" />
<File Id="Microsoft.Bcl.TimeProvider.dll" Source="Microsoft.Bcl.TimeProvider.dll" />
<File Id="WixToolset.Dtf.WindowsInstaller.dll" Source="WixToolset.Dtf.WindowsInstaller.dll" />
<File Id="Microsoft.Identity.Client.dll" Source="Microsoft.Identity.Client.dll" />
<File Id="Microsoft.Identity.Client.Extensions.Msal.dll" Source="Microsoft.Identity.Client.Extensions.Msal.dll" />
Expand Down

0 comments on commit 5f7860f

Please sign in to comment.