diff --git a/Directory.Packages.props b/Directory.Packages.props index 4aa51ddaf..c773eb54c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -44,6 +44,7 @@ + diff --git a/ICSharpCode.BamlDecompiler/packages.lock.json b/ICSharpCode.BamlDecompiler/packages.lock.json index 936f71efe..4c922d638 100644 --- a/ICSharpCode.BamlDecompiler/packages.lock.json +++ b/ICSharpCode.BamlDecompiler/packages.lock.json @@ -17,33 +17,21 @@ "icsharpcode.decompiler": { "type": "Project", "dependencies": { - "System.Collections.Immutable": "[6.0.0, )", - "System.Reflection.Metadata": "[6.0.0, )" + "System.Collections.Immutable": "[9.0.0, )", + "System.Reflection.Metadata": "[9.0.0, )" } }, "System.Collections.Immutable": { "type": "CentralTransitive", "requested": "[10.0.0-preview.6.25358.103, )", - "resolved": "6.0.0", - "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "9.0.0", + "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" }, "System.Reflection.Metadata": { "type": "CentralTransitive", "requested": "[10.0.0-preview.6.25358.103, )", - "resolved": "6.0.0", - "contentHash": "sffDOcex1C3HO5kDolOYcWXTwRpZY/LvJujM6SMjn63fWMJWchYAAmkoAJXlbpZ5yf4d+KMgxd+LeETa4gD9sQ==", - "dependencies": { - "System.Collections.Immutable": "6.0.0" - } - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "CentralTransitive", - "requested": "[6.1.2, )", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "9.0.0", + "contentHash": "ANiqLu3DxW9kol/hMmTWbt3414t9ftdIuiIU7j80okq2YzAueo120M442xk1kDJWtmZTqWQn7wHDvMRipVOEOQ==" } } } diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj index 5c5dce460..1993cc873 100644 --- a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj +++ b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj @@ -20,7 +20,8 @@ True - $(NoWarn);1701;1702;1705,67,169,1058,728,1720,649,168,251,660,661,675;1998;162;8632;626;8618;8714;8602;8981 + + $(NoWarn);1701;1702;1705,67,169,1058,728,1720,649,168,251,660,661,675;1998;162;8632;626;8618;8714;8602;8981;NU1902;NU1903 ROSLYN;ROSLYN2;ROSLYN3;ROSLYN4;NET60;CS60;CS70;CS71;CS72;CS73;CS80;CS90;CS100;CS110;CS120;CS130 False diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index 2e0954af3..e77212602 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -84,8 +84,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ICSharpCode.Decompiler/packages.lock.json b/ICSharpCode.Decompiler/packages.lock.json index 90d8e948b..26928c8d8 100644 --- a/ICSharpCode.Decompiler/packages.lock.json +++ b/ICSharpCode.Decompiler/packages.lock.json @@ -29,21 +29,22 @@ }, "System.Collections.Immutable": { "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==", "dependencies": { - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Reflection.Metadata": { "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "sffDOcex1C3HO5kDolOYcWXTwRpZY/LvJujM6SMjn63fWMJWchYAAmkoAJXlbpZ5yf4d+KMgxd+LeETa4gD9sQ==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "ANiqLu3DxW9kol/hMmTWbt3414t9ftdIuiIU7j80okq2YzAueo120M442xk1kDJWtmZTqWQn7wHDvMRipVOEOQ==", "dependencies": { - "System.Collections.Immutable": "6.0.0" + "System.Collections.Immutable": "9.0.0", + "System.Memory": "4.5.5" } }, "TunnelVisionLabs.ReferenceAssemblyAnnotator": { @@ -74,8 +75,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { "System.Buffers": "4.5.1", "System.Numerics.Vectors": "4.4.0", diff --git a/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj b/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj index c97313f7f..516b6d957 100644 --- a/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj +++ b/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj @@ -62,6 +62,7 @@ + diff --git a/ICSharpCode.ILSpyCmd/packages.lock.json b/ICSharpCode.ILSpyCmd/packages.lock.json index 718285ff5..79a7b81a7 100644 --- a/ICSharpCode.ILSpyCmd/packages.lock.json +++ b/ICSharpCode.ILSpyCmd/packages.lock.json @@ -52,6 +52,12 @@ "NuGet.Packaging": "6.14.0" } }, + "System.Security.Cryptography.Pkcs": { + "type": "Direct", + "requested": "[9.0.7, )", + "resolved": "9.0.7", + "contentHash": "6LROjtkO4UCv0MVnnR8Z6FwnRryT+Sz5dz8ZefZG6/yz1kQGaVUd6gAdXZtqNPORQwuXFrNGTWvi7f8hWRkiyg==" + }, "TomsToolbox.Composition.Analyzer": { "type": "Direct", "requested": "[2.22.1, )", @@ -336,19 +342,6 @@ "resolved": "10.0.0-preview.6.25358.103", "contentHash": "JNwN+0tuqtHnELPl7P2T/OjWlgCdqB9fNuwAOh46W7t/2Z5HU+1ROqkiJCupwSVrXjSfV46lcas6HqhUC8BpYQ==" }, - "System.Formats.Asn1": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T6fD00dQ3NTbPDy31m4eQUwKW84s03z0N2C8HpOklyeaDgaJPa/TexP4/SkORMSOwc7WhKifnA6Ya33AkzmafA==" - }, - "System.Security.Cryptography.Pkcs": { - "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "LGbXi1oUJ9QgCNGXRO9ndzBL/GZgANcsURpMhNR8uO+rca47SZmciS3RSQUvlQRwK3QHZSHNOXzoMUASKA+Anw==", - "dependencies": { - "System.Formats.Asn1": "6.0.0" - } - }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", "resolved": "4.4.0", @@ -357,8 +350,8 @@ "icsharpcode.decompiler": { "type": "Project", "dependencies": { - "System.Collections.Immutable": "[6.0.0, )", - "System.Reflection.Metadata": "[6.0.0, )" + "System.Collections.Immutable": "[9.0.0, )", + "System.Reflection.Metadata": "[9.0.0, )" } }, "icsharpcode.ilspyx": { @@ -424,8 +417,8 @@ "System.Collections.Immutable": { "type": "CentralTransitive", "requested": "[10.0.0-preview.6.25358.103, )", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" + "resolved": "9.0.0", + "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" }, "System.Composition.AttributedModel": { "type": "CentralTransitive", diff --git a/ICSharpCode.ILSpyX/packages.lock.json b/ICSharpCode.ILSpyX/packages.lock.json index 1c61b3b66..894559474 100644 --- a/ICSharpCode.ILSpyX/packages.lock.json +++ b/ICSharpCode.ILSpyX/packages.lock.json @@ -67,18 +67,15 @@ "icsharpcode.decompiler": { "type": "Project", "dependencies": { - "System.Collections.Immutable": "[6.0.0, )", - "System.Reflection.Metadata": "[6.0.0, )" + "System.Collections.Immutable": "[9.0.0, )", + "System.Reflection.Metadata": "[9.0.0, )" } }, "System.Collections.Immutable": { "type": "CentralTransitive", "requested": "[10.0.0-preview.6.25358.103, )", - "resolved": "6.0.0", - "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "9.0.0", + "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" } } } diff --git a/debugbuild.bat b/debugbuild.bat index 2fa964d7e..4d817e42f 100644 --- a/debugbuild.bat +++ b/debugbuild.bat @@ -1,13 +1 @@ -@setlocal enabledelayedexpansion -@set MSBUILD= -@for /D %%M in ("%ProgramFiles%\Microsoft Visual Studio\2022"\*) do @( - @if exist "%%M\MSBuild\Current\Bin\MSBuild.exe" ( - @set "MSBUILD=%%M\MSBuild\Current\Bin\MSBuild.exe" - ) -) -@if "%MSBUILD%" == "" ( - @echo Could not find VS2022 MSBuild - @exit /b 1 -) -@nuget restore ILSpy.sln || (pause && exit /b 1) -"%MSBUILD%" ILSpy.sln /p:Configuration=Debug "/p:Platform=Any CPU" || (pause && exit /b 1) +dotnet build ILSpy.sln /p:Configuration=Debug "/p:Platform=Any CPU" %* || (pause && exit /b 1) diff --git a/releasebuild.bat b/releasebuild.bat index 084e88a0d..58b8f542d 100644 --- a/releasebuild.bat +++ b/releasebuild.bat @@ -1,13 +1 @@ -@setlocal enabledelayedexpansion -@set MSBUILD= -@for /D %%M in ("%ProgramFiles%\Microsoft Visual Studio\2022"\*) do @( - @if exist "%%M\MSBuild\Current\Bin\MSBuild.exe" ( - @set "MSBUILD=%%M\MSBuild\Current\Bin\MSBuild.exe" - ) -) -@if "%MSBUILD%" == "" ( - @echo Could not find VS2022 MSBuild - @exit /b 1 -) -@nuget restore ILSpy.sln || (pause && exit /b 1) -"%MSBUILD%" ILSpy.sln /p:Configuration=Release "/p:Platform=Any CPU" || (pause && exit /b 1) +dotnet build ILSpy.sln /p:Configuration=Release "/p:Platform=Any CPU" %* || (pause && exit /b 1)