Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions src/internal/SetBuildNumber/Directory.Packages.props.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>

<!-- Pinned versions to address security vulnerabilities in transitive dependencies. Review as dependencies update. -->
<ItemGroup>
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="WixToolset.Dtf.Compression" Version="{packageversion}" />
<PackageVersion Include="WixToolset.Dtf.Compression.Cab" Version="{packageversion}" />
Expand Down Expand Up @@ -52,31 +47,39 @@
</ItemGroup>

<ItemGroup>
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
<PackageVersion Include="System.DirectoryServices" Version="8.0.0" />
<PackageVersion Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
<PackageVersion Include="System.DirectoryServices.AccountManagement" Version="8.0.0" />
<PackageVersion Include="System.Management" Version="8.0.0" />
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.6" />

<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageVersion Include="System.Net.NetworkInformation" Version="4.3.0" />
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.1" />
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.6" />
<PackageVersion Include="System.Memory" Version="4.6.3" />

<PackageVersion Include="Microsoft.AspNetCore.Owin" Version="8.0.21" />
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="3.14.2075" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />

<!-- Pin System.Private.Uri address security vulnerabilities in transitive dependencies. Review as dependencies update. -->
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />

<!-- Use System.Memory v4.5.5 as it is compatible with VS2022 -->
<PackageVersion Include="System.Memory" Version="4.5.5" />
</ItemGroup>

<!-- NuGet stack -->
<ItemGroup>
<PackageVersion Include="NuGet.Credentials" Version="6.13.2" />
<PackageVersion Include="NuGet.Protocol" Version="6.13.2" />
<PackageVersion Include="NuGet.Versioning" Version="6.13.2" />
</ItemGroup>

<!-- MSBuild (aligned with VS 17.13 toolset) -->
<ItemGroup>
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.13.26" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/wix/WixToolset.BuildTasks/ResolveWixReferences.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public override bool Execute()
}

/// <summary>
/// Resolves a single reference item by searcheing for referenced items using the specified SearchPaths.
/// Resolves a single reference item by searching for referenced items using the specified SearchPaths.
/// This method is made public so the resolution logic can be reused by other tasks.
/// </summary>
/// <param name="reference">The referenced item.</param>
Expand Down