From d9d77794b495b35d3e1cd96d36f79a5123b03a37 Mon Sep 17 00:00:00 2001 From: Nir Bar Date: Thu, 28 Nov 2024 18:40:00 +0200 Subject: [PATCH] Upgrade nugets --- src/ext/Bal/dnchost/dnchost.vcxproj | 2 +- src/ext/Bal/dnchost/packages.config | 8 ++-- .../NetFx/netcoresearch/netcoresearch.vcxproj | 4 +- src/ext/NetFx/netcoresearch/packages.config | 14 +++---- .../Directory.Packages.props.pp | 40 +++++++++---------- .../WixInternal.TestSupport.Native.props | 4 +- .../WixInternal.TestSupport.Native.targets | 18 ++++----- .../packages.config | 12 +++--- .../CsprojWebApplicationNetFx/packages.config | 22 +++++----- .../ConverterIntegrationFixture.cs | 2 +- .../UIExtensionFixture.cs | 2 +- .../BundleExtractionFixture.cs | 2 +- .../BundleFixture.cs | 2 +- .../WixlibFixture.cs | 6 +-- 14 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/ext/Bal/dnchost/dnchost.vcxproj b/src/ext/Bal/dnchost/dnchost.vcxproj index 4aba0accf..a8df3128b 100644 --- a/src/ext/Bal/dnchost/dnchost.vcxproj +++ b/src/ext/Bal/dnchost/dnchost.vcxproj @@ -49,7 +49,7 @@ $(Platform) x86 - ..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.6.0.4\runtimes\win-$(NetHostPlatform)\native\ + ..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.9.0.0\runtimes\win-$(NetHostPlatform)\native\ $(BaseOutputPath)obj;$(NetHostPath);..\wixstdba\inc shlwapi.lib;$(NetHostPath)libnethost.lib diff --git a/src/ext/Bal/dnchost/packages.config b/src/ext/Bal/dnchost/packages.config index 1c7505e7b..caefde380 100644 --- a/src/ext/Bal/dnchost/packages.config +++ b/src/ext/Bal/dnchost/packages.config @@ -1,6 +1,6 @@ - - - - \ No newline at end of file + + + + diff --git a/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj b/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj index 3bd0978b1..c40c9ffd9 100644 --- a/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj +++ b/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj @@ -42,8 +42,8 @@ $(Platform) x86 - ..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.6.0.4\runtimes\win-$(NetHostPlatform)\native\ - ..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.6.0.4\runtimes\win-$(NetHostPlatform)\native\ + ..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.9.0.0\runtimes\win-$(NetHostPlatform)\native\ + ..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.9.0.0\runtimes\win-$(NetHostPlatform)\native\ $(NetHostPath) diff --git a/src/ext/NetFx/netcoresearch/packages.config b/src/ext/NetFx/netcoresearch/packages.config index ad26db1ce..edfb53513 100644 --- a/src/ext/NetFx/netcoresearch/packages.config +++ b/src/ext/NetFx/netcoresearch/packages.config @@ -1,9 +1,9 @@ - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp index e9438d065..567fe83ff 100644 --- a/src/internal/SetBuildNumber/Directory.Packages.props.pp +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp @@ -41,20 +41,20 @@ - - - - + + + + - - - - + + + + - - + + @@ -63,16 +63,16 @@ https://github.com/dotnet/roslyn/blob/main/docs/wiki/NuGet-packages.md --> - + - + - - - + + + - + - - - - + + + + diff --git a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props index 2362a8deb..f52e800d5 100644 --- a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props +++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props @@ -5,8 +5,8 @@ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore)) - - + + v4.7.2 diff --git a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets index a882ad8de..d452a8986 100644 --- a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets +++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets @@ -22,28 +22,28 @@ $(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll - $(RootPackagesFolder)xunit.assert.2.8.1\lib\netstandard1.1\xunit.assert.dll + $(RootPackagesFolder)xunit.assert.2.9.2\lib\netstandard1.1\xunit.assert.dll - $(RootPackagesFolder)xunit.extensibility.core.2.8.1\lib\netstandard1.1\xunit.core.dll + $(RootPackagesFolder)xunit.extensibility.core.2.9.2\lib\netstandard1.1\xunit.core.dll - $(RootPackagesFolder)xunit.extensibility.execution.2.8.1\lib\net452\xunit.execution.desktop.dll + $(RootPackagesFolder)xunit.extensibility.execution.2.9.2\lib\net452\xunit.execution.desktop.dll - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + - - + + diff --git a/src/internal/WixInternal.TestSupport.Native/packages.config b/src/internal/WixInternal.TestSupport.Native/packages.config index 21567bf36..2e726f11d 100644 --- a/src/internal/WixInternal.TestSupport.Native/packages.config +++ b/src/internal/WixInternal.TestSupport.Native/packages.config @@ -7,10 +7,10 @@ when any of these versions are updated. --> - - - - - - + + + + + + diff --git a/src/test/wix/TestData/CsprojWebApplicationNetFx/packages.config b/src/test/wix/TestData/CsprojWebApplicationNetFx/packages.config index 40f85c9ef..34d1feced 100644 --- a/src/test/wix/TestData/CsprojWebApplicationNetFx/packages.config +++ b/src/test/wix/TestData/CsprojWebApplicationNetFx/packages.config @@ -1,17 +1,17 @@  - - - - - + + + + + - - - - + + + + - + - \ No newline at end of file + diff --git a/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs b/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs index be2bd41ce..2682d926b 100644 --- a/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs @@ -162,7 +162,7 @@ public void DetectUnconvertableQtExecCmdTimeout() var result = RunConversion(targetFile); Assert.Equal(13, result.ExitCode); - Assert.Single(result.Messages.Where(message => message.ToString().EndsWith("(QtExecCmdTimeoutAmbiguous)"))); + Assert.Single(result.Messages, message => message.ToString().EndsWith("(QtExecCmdTimeoutAmbiguous)")); var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); diff --git a/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs b/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs index 168751f43..dec0e98b5 100644 --- a/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs @@ -134,7 +134,7 @@ public void FixValidatePathCustomAction() var actual = UnformattedDocumentLines(document); WixAssert.CompareLineByLine(expected, actual); - Assert.Single(messaging.Messages.Where(m => m.Id == 65)); + Assert.Single(messaging.Messages, m => m.Id == 65); Assert.Equal(2, errors); } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs index 5a248027b..c6cd3a7b0 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs @@ -38,7 +38,7 @@ public void CanExtractBundleWithDetachedContainer() }); result.AssertSuccess(); - Assert.Empty(result.Messages.Where(m => m.Level == MessageLevel.Warning)); + Assert.DoesNotContain(result.Messages, m => m.Level == MessageLevel.Warning); Assert.True(File.Exists(exePath)); diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index 840334b19..6f55c619b 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs @@ -100,7 +100,7 @@ public void CanBuildSimpleBundle() }); result.AssertSuccess(); - Assert.Empty(result.Messages.Where(m => m.Level == MessageLevel.Warning)); + Assert.DoesNotContain(result.Messages, m => m.Level == MessageLevel.Warning); Assert.True(File.Exists(exePath)); Assert.True(File.Exists(pdbPath)); diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs index 0cd8a5426..50f8111d2 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs @@ -125,9 +125,9 @@ public void CanBuildWixlibWithBinariesFromNamedBindPaths() var wixlib = Intermediate.Load(wixlibPath); var binarySymbols = wixlib.Sections.SelectMany(s => s.Symbols).OfType().ToList(); Assert.Equal(3, binarySymbols.Count); - Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll")); - Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-1")); - Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-2")); + Assert.Single(binarySymbols, t => t.Data.Path == "wix-ir/foo.dll"); + Assert.Single(binarySymbols, t => t.Data.Path == "wix-ir/foo.dll-1"); + Assert.Single(binarySymbols, t => t.Data.Path == "wix-ir/foo.dll-2"); } }