From a076b9d72486328d8dc95675daae417a3c07d6d6 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 27 Dec 2024 13:57:09 -0800 Subject: Audit all transitive dependencies and fix latest vulnerabilities Also, standardize .NET Core TFMs listed before .NET Framework TFMs for no reason but to be consistent --- src/Directory.Build.props | 4 ++- ...ixToolsetTest.BootstrapperApplicationApi.csproj | 4 --- .../SetBuildNumber/Directory.Packages.props.pp | 40 ++++++++++++++-------- src/internal/WixInternal.TestSupport/Builder.cs | 8 ++--- src/internal/WixInternal.TestSupport/TestData.cs | 4 +-- .../WixInternal.TestSupport.csproj | 2 +- src/test/burn/TestBA/TestBA.csproj | 2 +- src/test/burn/TestBA/TestBA_x64.csproj | 2 +- src/test/burn/TestExe/TestExe.csproj | 2 +- .../burn/WixToolset.WixBA/WixToolset.WixBA.csproj | 2 +- .../WixToolset.WixBA/WixToolset.WixBA_x64.csproj | 2 +- .../CsprojClassLibraryMultiTarget.csproj | 2 +- src/tools/heat/heat.csproj | 1 + .../WixToolsetTest.HeatTasks.csproj | 4 +-- .../WixInternal.Core.TestPackage.csproj | 2 +- 15 files changed, 45 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/Directory.Build.props b/src/Directory.Build.props index c4e52834..2de04127 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -32,7 +32,9 @@ https://wixtoolset.org/ wix.png - version.txt + true + all + low diff --git a/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj b/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj index a3d9930d..1a8014a4 100644 --- a/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj +++ b/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj @@ -12,8 +12,4 @@ - - - - diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp index 4085568f..8cf271d7 100644 --- a/src/internal/SetBuildNumber/Directory.Packages.props.pp +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp @@ -1,4 +1,13 @@ + + true + + + + + + + @@ -43,35 +52,36 @@ - - - - - + + + + + - + - - - - + + + + + - + - - - + + + - + diff --git a/src/internal/WixInternal.TestSupport/Builder.cs b/src/internal/WixInternal.TestSupport/Builder.cs index eec51797..aee5a8cf 100644 --- a/src/internal/WixInternal.TestSupport/Builder.cs +++ b/src/internal/WixInternal.TestSupport/Builder.cs @@ -64,7 +64,7 @@ namespace WixInternal.TestSupport foreach (var ext in this.ExtensionTypes) { args.Add("-ext"); - args.Add(Path.GetFullPath(new Uri(ext.Assembly.CodeBase).LocalPath)); + args.Add(Path.GetFullPath(ext.Assembly.Location)); } args.AddRange(sourceFiles); @@ -126,7 +126,7 @@ namespace WixInternal.TestSupport foreach (var ext in this.ExtensionTypes) { firstBuildArgs.Add("-ext"); - firstBuildArgs.Add(Path.GetFullPath(new Uri(ext.Assembly.CodeBase).LocalPath)); + firstBuildArgs.Add(Path.GetFullPath(ext.Assembly.Location)); } firstBuildArgs.AddRange(sourceFiles); @@ -171,7 +171,7 @@ namespace WixInternal.TestSupport foreach (var ext in this.ExtensionTypes) { decompileArgs.Add("-ext"); - decompileArgs.Add(Path.GetFullPath(new Uri(ext.Assembly.CodeBase).LocalPath)); + decompileArgs.Add(Path.GetFullPath(ext.Assembly.Location)); } decompileFunc(decompileArgs.ToArray()); @@ -188,7 +188,7 @@ namespace WixInternal.TestSupport foreach (var ext in this.ExtensionTypes) { secondBuildArgs.Add("-ext"); - secondBuildArgs.Add(Path.GetFullPath(new Uri(ext.Assembly.CodeBase).LocalPath)); + secondBuildArgs.Add(Path.GetFullPath(ext.Assembly.Location)); } secondBuildArgs.Add("-bindpath"); diff --git a/src/internal/WixInternal.TestSupport/TestData.cs b/src/internal/WixInternal.TestSupport/TestData.cs index 05691e8c..1b169699 100644 --- a/src/internal/WixInternal.TestSupport/TestData.cs +++ b/src/internal/WixInternal.TestSupport/TestData.cs @@ -44,13 +44,13 @@ namespace WixInternal.TestSupport public static string Get(params string[] paths) { - var localPath = Path.GetDirectoryName(new Uri(Assembly.GetCallingAssembly().CodeBase).LocalPath); + var localPath = AppDomain.CurrentDomain.BaseDirectory; return Path.Combine(localPath, Path.Combine(paths)); } public static string GetUnitTestLogsFolder([CallerFilePath] string path = "", [CallerMemberName] string method = "") { - var startingPath = Path.GetDirectoryName(new Uri(Assembly.GetCallingAssembly().CodeBase).LocalPath); + var startingPath = AppDomain.CurrentDomain.BaseDirectory; var buildPath = startingPath; while (!String.IsNullOrEmpty(buildPath)) diff --git a/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj b/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj index 4e1c3c26..1b713a0d 100644 --- a/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj +++ b/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj @@ -4,7 +4,7 @@ - netstandard2.0;net472 + net6.0;net472 true embedded true diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj index 6db83b20..ec60adc8 100644 --- a/src/test/burn/TestBA/TestBA.csproj +++ b/src/test/burn/TestBA/TestBA.csproj @@ -3,7 +3,7 @@ - net462;net6.0-windows + net6.0-windows;net462 WinExe TestBA WixToolset.Test.BA diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj index 9d8dc330..1e2ed69d 100644 --- a/src/test/burn/TestBA/TestBA_x64.csproj +++ b/src/test/burn/TestBA/TestBA_x64.csproj @@ -3,7 +3,7 @@ - net462;net6.0-windows + net6.0-windows;net462 WinExe TestBA WixToolset.Test.BA diff --git a/src/test/burn/TestExe/TestExe.csproj b/src/test/burn/TestExe/TestExe.csproj index 9209dfd7..9a80aa92 100644 --- a/src/test/burn/TestExe/TestExe.csproj +++ b/src/test/burn/TestExe/TestExe.csproj @@ -3,7 +3,7 @@ - net462;net6.0 + net6.0;net462 TestExe TestExe Exe diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj index e87501e9..4371d0d6 100644 --- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj +++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj @@ -3,7 +3,7 @@ - net472;net6.0-windows + net6.0-windows;net472 WinExe WixToolset.WixBA WixToolset.WixBA diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj index 3437119c..597e108d 100644 --- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj +++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj @@ -3,7 +3,7 @@ - net472;net6.0-windows + net6.0-windows;net472 WinExe WixToolset.WixBA WixToolset.WixBA diff --git a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj index e2fa94f5..9e55d157 100644 --- a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj +++ b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj @@ -1,7 +1,7 @@ - net472;net6.0 + net6.0;net472 diff --git a/src/tools/heat/heat.csproj b/src/tools/heat/heat.csproj index dfcc9126..362d5c21 100644 --- a/src/tools/heat/heat.csproj +++ b/src/tools/heat/heat.csproj @@ -39,5 +39,6 @@ + diff --git a/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj b/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj index 390154de..1d808f53 100644 --- a/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj +++ b/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj @@ -14,7 +14,7 @@ - - + + diff --git a/src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj b/src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj index 9d242b6c..99ffe620 100644 --- a/src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj +++ b/src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + net6.0;net472 Internal WiX Toolset Test Package embedded true -- cgit v1.2.3-55-g6feb