Browse Source

Update NUnit (was: 4.3.2) to 4.4 and MTP (was: 1.7.3) to 1.8.1 (had to add VSTestBridge explicitly to override ref complaints by compiler)

pull/3537/head^2
Christoph Wille 5 months ago
parent
commit
17fde7fded
  1. 11
      Directory.Packages.props
  2. 6
      ICSharpCode.BamlDecompiler/packages.lock.json
  3. 2
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
  4. 2
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  5. 2
      ICSharpCode.Decompiler/Properties/DecompilerVersionInfo.template.cs
  6. 6
      ICSharpCode.Decompiler/packages.lock.json
  7. 6
      ICSharpCode.ILSpyCmd/packages.lock.json
  8. 6
      ICSharpCode.ILSpyX/packages.lock.json
  9. 2
      ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj
  10. 2
      ILSpy.Tests/ILSpy.Tests.csproj

11
Directory.Packages.props

@ -26,15 +26,16 @@ @@ -26,15 +26,16 @@
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25358.103" />
<PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.6.25358.103" />
<PackageVersion Include="Microsoft.Sbom.Targets" Version="4.0.3" />
<PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.7.3" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.1" />
<PackageVersion Include="Microsoft.Testing.Extensions.VSTestBridge" Version="1.8.1" />
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
<PackageVersion Include="Mono.Cecil" Version="0.11.6" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
<PackageVersion Include="NUnit" Version="4.3.2" />
<PackageVersion Include="NUnit3TestAdapter" Version="5.1.0-alpha.3" />
<PackageVersion Include="NUnit" Version="4.4.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="5.1.0" />
<PackageVersion Include="NuGet.Protocol" Version="6.14.0" />
<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
@ -44,7 +45,7 @@ @@ -44,7 +45,7 @@
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.0-preview.6.25358.103" />
<PackageVersion Include="System.Resources.Extensions" Version="10.0.0-preview.6.25358.103" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.7" />
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.8" />
<PackageVersion Include="TomsToolbox.Composition.MicrosoftExtensions" Version="2.22.1" />
<PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.22.0" />
<PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.22.1" />

6
ICSharpCode.BamlDecompiler/packages.lock.json

@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
"net10.0": {
"Microsoft.Sbom.Targets": {
"type": "Direct",
"requested": "[4.0.3, )",
"resolved": "4.0.3",
"contentHash": "xwHbbj9gLj1HZzLVEM2UpQM7ZY7FkiEs/nRkt6G1H7mR/14aNhjsskRoI7K7CezHJA4cASsGxTvqorbUXTI1TQ=="
"requested": "[4.1.0, )",
"resolved": "4.1.0",
"contentHash": "GidfeSVHFtNwZSbD2wmwWiUiGkVdND8QR1z21WpFa+/47Mi3YiDkAzsWF02wXrMx2Xd8j3QSfKOUY1JtnF+7uw=="
},
"TomsToolbox.Composition.Analyzer": {
"type": "Direct",

2
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
<PackageReference Include="NUnit" />
<PackageReference Include="Shouldly" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Microsoft.Testing.Extensions.VSTestBridge" />
<PackageReference Include="System.Memory" />
<PackageReference Include="Mono.Cecil" />
<PackageReference Include="Microsoft.NETCore.ILAsm" />

2
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.0.3">
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
ICSharpCode.Decompiler/Properties/DecompilerVersionInfo.template.cs

@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
public const string Minor = "0";
public const string Build = "0";
public const string Revision = "$INSERTREVISION$";
public const string VersionName = "preview1";
public const string VersionName = "preview2";
public const string FullVersion = Major + "." + Minor + "." + Build + ".$INSERTREVISION$$INSERTBRANCHPOSTFIX$$INSERTVERSIONNAMEPOSTFIX$";
public const string FullVersionWithShortCommitHash = FullVersion + "+$INSERTSHORTCOMMITHASH$";

6
ICSharpCode.Decompiler/packages.lock.json

@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
".NETStandard,Version=v2.0": {
"Microsoft.Sbom.Targets": {
"type": "Direct",
"requested": "[4.0.3, )",
"resolved": "4.0.3",
"contentHash": "xwHbbj9gLj1HZzLVEM2UpQM7ZY7FkiEs/nRkt6G1H7mR/14aNhjsskRoI7K7CezHJA4cASsGxTvqorbUXTI1TQ=="
"requested": "[4.1.0, )",
"resolved": "4.1.0",
"contentHash": "GidfeSVHFtNwZSbD2wmwWiUiGkVdND8QR1z21WpFa+/47Mi3YiDkAzsWF02wXrMx2Xd8j3QSfKOUY1JtnF+7uw=="
},
"Microsoft.SourceLink.GitHub": {
"type": "Direct",

6
ICSharpCode.ILSpyCmd/packages.lock.json

@ -54,9 +54,9 @@ @@ -54,9 +54,9 @@
},
"System.Security.Cryptography.Pkcs": {
"type": "Direct",
"requested": "[9.0.7, )",
"resolved": "9.0.7",
"contentHash": "6LROjtkO4UCv0MVnnR8Z6FwnRryT+Sz5dz8ZefZG6/yz1kQGaVUd6gAdXZtqNPORQwuXFrNGTWvi7f8hWRkiyg=="
"requested": "[9.0.8, )",
"resolved": "9.0.8",
"contentHash": "+mtc8dZnrP9N1HZICncBzLUrX4YBP+WvAWb817auAA5mKOJzHZShuGpCtQiekgV/7N0uS/x0LkdBAezBcSBwVA=="
},
"TomsToolbox.Composition.Analyzer": {
"type": "Direct",

6
ICSharpCode.ILSpyX/packages.lock.json

@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
},
"Microsoft.Sbom.Targets": {
"type": "Direct",
"requested": "[4.0.3, )",
"resolved": "4.0.3",
"contentHash": "xwHbbj9gLj1HZzLVEM2UpQM7ZY7FkiEs/nRkt6G1H7mR/14aNhjsskRoI7K7CezHJA4cASsGxTvqorbUXTI1TQ=="
"requested": "[4.1.0, )",
"resolved": "4.1.0",
"contentHash": "GidfeSVHFtNwZSbD2wmwWiUiGkVdND8QR1z21WpFa+/47Mi3YiDkAzsWF02wXrMx2Xd8j3QSfKOUY1JtnF+7uw=="
},
"Microsoft.SourceLink.GitHub": {
"type": "Direct",

2
ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj

@ -36,11 +36,11 @@ @@ -36,11 +36,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Shouldly" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
<PackageReference Include="Microsoft.Testing.Extensions.VSTestBridge" />
<PackageReference Include="coverlet.collector">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

2
ILSpy.Tests/ILSpy.Tests.csproj

@ -74,7 +74,6 @@ @@ -74,7 +74,6 @@
<PackageReference Include="System.Reflection.Metadata" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="coverlet.collector">
<PrivateAssets>all</PrivateAssets>
@ -83,6 +82,7 @@ @@ -83,6 +82,7 @@
<PackageReference Include="NUnit" />
<PackageReference Include="Shouldly" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
<PackageReference Include="Microsoft.Testing.Extensions.VSTestBridge" />
</ItemGroup>
<ItemGroup>

Loading…
Cancel
Save