Skip to content

Commit afcdcec

Browse files
christophwillechristophwille
authored
Update for .NET 10 Preview 7 packages (#3537)
* 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) * Update to .NET 10 Preview 7 NuGet packages * Update dotnet-format
1 parent 9e0828f commit afcdcec

File tree

12 files changed

+211
-209
lines changed

12 files changed

+211
-209
lines changed

‎.github/workflows/build-ilspy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: Install dotnet-format
4747
env:
48-
DOTNET_FORMAT_VERSION: 10.0.100-preview.6.25358.103
48+
DOTNET_FORMAT_VERSION: 10.0.100-preview.7.25380.108
4949
DOTNET_FORMAT_SOURCE: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json
5050
run: dotnet tool install -g dotnet-format --version "${{env.DOTNET_FORMAT_VERSION}}" --add-source "${{env.DOTNET_FORMAT_SOURCE}}"
5151

‎BuildTools/pre-commit‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -eu
77

8-
DOTNET_FORMAT_VERSION=10.0.100-preview.6.25358.103
8+
DOTNET_FORMAT_VERSION=10.0.100-preview.7.25380.108
99
DOTNET_FORMAT_SOURCE="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json"
1010
DOTNET_PATH="$LOCALAPPDATA/ICSharpCode/ILSpy/dotnet-format-$DOTNET_FORMAT_VERSION"
1111
if [ ! -d "$DOTNET_PATH" ]; then

‎Directory.Packages.props‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageVersion Include="DataGridExtensions" Version="2.6.0" />
1010
<PackageVersion Include="DiffLib" Version="2025.0.0" />
1111
<PackageVersion Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.1" />
12-
<PackageVersion Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="10.0.0-preview.6.25358.103" />
12+
<PackageVersion Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="10.0.0-preview.7.25380.108" />
1313
<PackageVersion Include="Iced" Version="1.21.0" />
1414
<PackageVersion Include="K4os.Compression.LZ4" Version="1.3.8" />
1515
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
@@ -19,32 +19,33 @@
1919
<PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22171-02" />
2020
<PackageVersion Include="Microsoft.DiaSymReader" Version="1.4.0" />
2121
<PackageVersion Include="Microsoft.DiaSymReader.Native" Version="17.0.0-beta1.21524.1" />
22-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0-preview.6.25358.103" />
23-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.6.25358.103" />
24-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-preview.6.25358.103" />
25-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.6.25358.103" />
22+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25380.108" />
23+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25380.108" />
24+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-preview.7.25380.108" />
25+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.7.25380.108" />
2626
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
27-
<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25358.103" />
28-
<PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.6.25358.103" />
29-
<PackageVersion Include="Microsoft.Sbom.Targets" Version="4.0.3" />
27+
<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25380.108" />
28+
<PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.7.25380.108" />
29+
<PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.0" />
3030
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
31-
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.7.3" />
31+
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.2" />
32+
<PackageVersion Include="Microsoft.Testing.Extensions.VSTestBridge" Version="1.8.2" />
3233
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
3334
<PackageVersion Include="Mono.Cecil" Version="0.11.6" />
3435
<PackageVersion Include="NSubstitute" Version="5.3.0" />
3536
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
36-
<PackageVersion Include="NUnit" Version="4.3.2" />
37-
<PackageVersion Include="NUnit3TestAdapter" Version="5.1.0-alpha.3" />
37+
<PackageVersion Include="NUnit" Version="4.4.0" />
38+
<PackageVersion Include="NUnit3TestAdapter" Version="5.1.0" />
3839
<PackageVersion Include="NuGet.Protocol" Version="6.14.0" />
3940
<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
4041
<PackageVersion Include="Shouldly" Version="4.3.0" />
41-
<PackageVersion Include="System.Composition.AttributedModel" Version="10.0.0-preview.6.25358.103" />
42-
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0-preview.6.25358.103" />
42+
<PackageVersion Include="System.Composition.AttributedModel" Version="10.0.0-preview.7.25380.108" />
43+
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0-preview.7.25380.108" />
4344
<PackageVersion Include="System.Memory" Version="4.6.3" />
44-
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.0-preview.6.25358.103" />
45-
<PackageVersion Include="System.Resources.Extensions" Version="10.0.0-preview.6.25358.103" />
45+
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.0-preview.7.25380.108" />
46+
<PackageVersion Include="System.Resources.Extensions" Version="10.0.0-preview.7.25380.108" />
4647
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
47-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.7" />
48+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.8" />
4849
<PackageVersion Include="TomsToolbox.Composition.MicrosoftExtensions" Version="2.22.1" />
4950
<PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.22.0" />
5051
<PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.22.1" />

‎ICSharpCode.BamlDecompiler/packages.lock.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"net10.0": {
55
"Microsoft.Sbom.Targets": {
66
"type": "Direct",
7-
"requested": "[4.0.3, )",
8-
"resolved": "4.0.3",
9-
"contentHash": "xwHbbj9gLj1HZzLVEM2UpQM7ZY7FkiEs/nRkt6G1H7mR/14aNhjsskRoI7K7CezHJA4cASsGxTvqorbUXTI1TQ=="
7+
"requested": "[4.1.0, )",
8+
"resolved": "4.1.0",
9+
"contentHash": "GidfeSVHFtNwZSbD2wmwWiUiGkVdND8QR1z21WpFa+/47Mi3YiDkAzsWF02wXrMx2Xd8j3QSfKOUY1JtnF+7uw=="
1010
},
1111
"TomsToolbox.Composition.Analyzer": {
1212
"type": "Direct",
@@ -23,13 +23,13 @@
2323
},
2424
"System.Collections.Immutable": {
2525
"type": "CentralTransitive",
26-
"requested": "[10.0.0-preview.6.25358.103, )",
26+
"requested": "[10.0.0-preview.7.25380.108, )",
2727
"resolved": "9.0.0",
2828
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
2929
},
3030
"System.Reflection.Metadata": {
3131
"type": "CentralTransitive",
32-
"requested": "[10.0.0-preview.6.25358.103, )",
32+
"requested": "[10.0.0-preview.7.25380.108, )",
3333
"resolved": "9.0.0",
3434
"contentHash": "ANiqLu3DxW9kol/hMmTWbt3414t9ftdIuiIU7j80okq2YzAueo120M442xk1kDJWtmZTqWQn7wHDvMRipVOEOQ=="
3535
}

‎ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<PackageReference Include="NUnit" />
7575
<PackageReference Include="Shouldly" />
7676
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
77-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
77+
<PackageReference Include="Microsoft.Testing.Extensions.VSTestBridge" />
7878
<PackageReference Include="System.Memory" />
7979
<PackageReference Include="Mono.Cecil" />
8080
<PackageReference Include="Microsoft.NETCore.ILAsm" />

‎ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
</PropertyGroup>
8181

8282
<ItemGroup>
83-
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.0.3">
83+
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.0">
8484
<PrivateAssets>all</PrivateAssets>
8585
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8686
</PackageReference>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
public const string Minor = "0";
55
public const string Build = "0";
66
public const string Revision = "$INSERTREVISION$";
7-
public const string VersionName = "preview1";
7+
public const string VersionName = "preview2";
88

99
public const string FullVersion = Major + "." + Minor + "." + Build + ".$INSERTREVISION$$INSERTBRANCHPOSTFIX$$INSERTVERSIONNAMEPOSTFIX$";
1010
public const string FullVersionWithShortCommitHash = FullVersion + "+$INSERTSHORTCOMMITHASH$";

‎ICSharpCode.Decompiler/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
".NETStandard,Version=v2.0": {
55
"Microsoft.Sbom.Targets": {
66
"type": "Direct",
7-
"requested": "[4.0.3, )",
8-
"resolved": "4.0.3",
9-
"contentHash": "xwHbbj9gLj1HZzLVEM2UpQM7ZY7FkiEs/nRkt6G1H7mR/14aNhjsskRoI7K7CezHJA4cASsGxTvqorbUXTI1TQ=="
7+
"requested": "[4.1.0, )",
8+
"resolved": "4.1.0",
9+
"contentHash": "GidfeSVHFtNwZSbD2wmwWiUiGkVdND8QR1z21WpFa+/47Mi3YiDkAzsWF02wXrMx2Xd8j3QSfKOUY1JtnF+7uw=="
1010
},
1111
"Microsoft.SourceLink.GitHub": {
1212
"type": "Direct",

0 commit comments

Comments
 (0)