Skip to content

Commit

Permalink
Upgrade nugets
Browse files Browse the repository at this point in the history
  • Loading branch information
@nirbar
nirbar committed Dec 1, 2024
1 parent e8497b6 commit d9d7779
Show file tree
Hide file tree
Showing 14 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion src/ext/Bal/dnchost/dnchost.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<PropertyGroup>
<NetHostPlatform>$(Platform)</NetHostPlatform>
<NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform>
<NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.6.0.4\runtimes\win-$(NetHostPlatform)\native\</NetHostPath>
<NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.9.0.0\runtimes\win-$(NetHostPlatform)\native\</NetHostPath>
<ProjectAdditionalIncludeDirectories>$(BaseOutputPath)obj;$(NetHostPath);..\wixstdba\inc</ProjectAdditionalIncludeDirectories>
<ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)libnethost.lib</ProjectAdditionalLinkLibraries>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/ext/Bal/dnchost/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
</packages>
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="9.0.0" targetFramework="native" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="9.0.0" targetFramework="native" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="9.0.0" targetFramework="native" />
</packages>
4 changes: 2 additions & 2 deletions src/ext/NetFx/netcoresearch/netcoresearch.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<PropertyGroup>
<NetHostPlatform>$(Platform)</NetHostPlatform>
<NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform>
<NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.6.0.4\runtimes\win-$(NetHostPlatform)\native\</NetHostPath>
<HostfxrPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.6.0.4\runtimes\win-$(NetHostPlatform)\native\</HostfxrPath>
<NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.9.0.0\runtimes\win-$(NetHostPlatform)\native\</NetHostPath>
<HostfxrPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.9.0.0\runtimes\win-$(NetHostPlatform)\native\</HostfxrPath>
<ProjectAdditionalIncludeDirectories>$(NetHostPath)</ProjectAdditionalIncludeDirectories>
</PropertyGroup>

Expand Down
14 changes: 7 additions & 7 deletions src/ext/NetFx/netcoresearch/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.4" targetFramework="native" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.4" targetFramework="native" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.4" targetFramework="native" />
</packages>
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="9.0.0" targetFramework="native" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="9.0.0" targetFramework="native" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="9.0.0" targetFramework="native" />
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="9.0.0" targetFramework="native" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="9.0.0" targetFramework="native" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="9.0.0" targetFramework="native" />
</packages>
40 changes: 20 additions & 20 deletions src/internal/SetBuildNumber/Directory.Packages.props.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,20 @@
</ItemGroup>

<ItemGroup>
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" />
<PackageVersion Include="System.DirectoryServices" Version="4.7.0" />
<PackageVersion Include="System.DirectoryServices.AccountManagement" Version="4.7.0" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.2" />
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="6.0.2" />
<PackageVersion Include="System.DirectoryServices" Version="6.0.2" />
<PackageVersion Include="System.DirectoryServices.AccountManagement" Version="6.0.1" />
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
<PackageVersion Include="System.Net.NetworkInformation" Version="4.3.0" />
<PackageVersion Include="System.Reflection.Metadata" Version="1.8.1" />
<PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="4.7.1" />
<PackageVersion Include="System.Text.Json" Version="6.0.9" />
<PackageVersion Include="System.Reflection.Metadata" Version="6.0.2" />
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="6.0.1" />
<PackageVersion Include="System.Text.Json" Version="6.0.11" />

<PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" />
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="3.10.2154" />
<PackageVersion Include="Microsoft.AspNetCore.Owin" Version="6.0.0" />
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="3.11.2177" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" />
</ItemGroup>

Expand All @@ -63,16 +63,16 @@
https://github.com/dotnet/roslyn/blob/main/docs/wiki/NuGet-packages.md
-->
<ItemGroup>
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="NuGet.Credentials" Version="6.10.1" />
<PackageVersion Include="NuGet.Protocol" Version="6.10.1" />
<PackageVersion Include="NuGet.Versioning" Version="6.10.1" />
<PackageVersion Include="NuGet.Credentials" Version="6.12.1" />
<PackageVersion Include="NuGet.Protocol" Version="6.12.1" />
<PackageVersion Include="NuGet.Versioning" Version="6.12.1" />
</ItemGroup>

<!--
Expand All @@ -88,12 +88,12 @@
<!-- Keep the following versions in sync with internal\WixInternal.TestSupport.Native\packages.config -->
<ItemGroup>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="GitInfo" Version="2.2.0" />
<PackageVersion Include="GitInfo" Version="2.3.0" />

<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageVersion Include="xunit" Version="2.8.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
<PackageVersion Include="xunit.assert" Version="2.8.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="xunit.assert" Version="2.9.2" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<PropertyGroup>
<RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir>
</PropertyGroup>
<Import Project="$(RepoRootDir)\packages\xunit.core.2.8.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.8.1\build\xunit.core.props')" />
<Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.8.1\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.8.1\build\net462\xunit.runner.visualstudio.props')" />
<Import Project="$(RepoRootDir)\packages\xunit.core.2.9.2\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.9.2\build\xunit.core.props')" />
<Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.8.2\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.8.2\build\net462\xunit.runner.visualstudio.props')" />
<PropertyGroup>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
</PropertyGroup>
Expand Down
18 changes: 9 additions & 9 deletions src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@
<HintPath>$(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath>
</Reference>
<Reference Include="xunit.assert">
<HintPath>$(RootPackagesFolder)xunit.assert.2.8.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
<HintPath>$(RootPackagesFolder)xunit.assert.2.9.2\lib\netstandard1.1\xunit.assert.dll</HintPath>
</Reference>
<Reference Include="xunit.core">
<HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.8.1\lib\netstandard1.1\xunit.core.dll</HintPath>
<HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.9.2\lib\netstandard1.1\xunit.core.dll</HintPath>
</Reference>
<Reference Include="xunit.execution.desktop">
<HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.8.1\lib\net452\xunit.execution.desktop.dll</HintPath>
<HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.9.2\lib\net452\xunit.execution.desktop.dll</HintPath>
</Reference>
</ItemGroup>

<Import Project="$(RootPackagesFolder)xunit.core.2.8.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.8.1\build\xunit.core.targets')" />
<Import Project="$(RootPackagesFolder)xunit.core.2.9.2\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.9.2\build\xunit.core.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.8.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.8.1\build\xunit.core.props'))" />
<Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.8.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.8.1\build\xunit.core.targets'))" />
<Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.8.1\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.8.1\build\net462\xunit.runner.visualstudio.props'))" />
<Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.9.2\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.9.2\build\xunit.core.props'))" />
<Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.9.2\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.9.2\build\xunit.core.targets'))" />
<Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.8.2\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.8.2\build\net462\xunit.runner.visualstudio.props'))" />
</Target>

<UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.8.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x86" Condition=" '$(Platform)'!='x64' " />
<UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.8.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x64" Condition=" '$(Platform)'=='x64' " />
<UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.9.2\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x86" Condition=" '$(Platform)'!='x64' " />
<UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.9.2\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x64" Condition=" '$(Platform)'=='x64' " />
<Target Name="Test">
<!-- https://xunit.net/docs/running-tests-in-msbuild -->
<!-- https://github.com/xunit/xunit/issues/2188 -->
Expand Down
12 changes: 6 additions & 6 deletions src/internal/WixInternal.TestSupport.Native/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
when any of these versions are updated.
-->
<package id="xunit.abstractions" version="2.0.3" />
<package id="xunit.assert" version="2.8.1" />
<package id="xunit.core" version="2.8.1" />
<package id="xunit.extensibility.core" version="2.8.1" />
<package id="xunit.extensibility.execution" version="2.8.1" />
<package id="xunit.runner.msbuild" version="2.8.1" />
<package id="xunit.runner.visualstudio" version="2.8.1" />
<package id="xunit.assert" version="2.9.2" />
<package id="xunit.core" version="2.9.2" />
<package id="xunit.extensibility.core" version="2.9.2" />
<package id="xunit.extensibility.execution" version="2.9.2" />
<package id="xunit.runner.msbuild" version="2.9.2" />
<package id="xunit.runner.visualstudio" version="2.8.2" />
</packages>
22 changes: 11 additions & 11 deletions src/test/wix/TestData/CsprojWebApplicationNetFx/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr" version="3.5.0.2" targetFramework="net472" />
<package id="bootstrap" version="3.4.1" targetFramework="net472" />
<package id="jQuery" version="3.4.1" targetFramework="net472" />
<package id="jQuery.Validation" version="1.17.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
<package id="bootstrap" version="5.3.3" targetFramework="net472" />
<package id="jQuery" version="3.7.1" targetFramework="net472" />
<package id="jQuery.Validation" version="1.21.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Mvc" version="5.3.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Razor" version="3.3.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net472" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net472" />
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.11" targetFramework="net472" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
<package id="Microsoft.AspNet.WebPages" version="3.3.0" targetFramework="net472" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net472" />
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="4.0.0" targetFramework="net472" />
<package id="Microsoft.Web.Infrastructure" version="2.0.0" targetFramework="net472" />
<package id="Modernizr" version="2.8.3" targetFramework="net472" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
<package id="WebGrease" version="1.6.0" targetFramework="net472" />
</packages>
</packages>
2 changes: 1 addition & 1 deletion src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/wix/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
2 changes: 1 addition & 1 deletion src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
6 changes: 3 additions & 3 deletions src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ public void CanBuildWixlibWithBinariesFromNamedBindPaths()
var wixlib = Intermediate.Load(wixlibPath);
var binarySymbols = wixlib.Sections.SelectMany(s => s.Symbols).OfType<BinarySymbol>().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");
}
}

Expand Down

0 comments on commit d9d7779

Please sign in to comment.