From c705eca6b16392af132c2cd673466bb188da28c2 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sat, 26 Apr 2025 20:18:59 +0200 Subject: [PATCH] Disable package pruning by force --- .github/workflows/build-frontends.yml | 2 +- .github/workflows/build-ilspy.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- ICSharpCode.ILSpyCmd/packages.lock.json | 9 +++------ ICSharpCode.ILSpyX/packages.lock.json | 12 ++++++------ 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-frontends.yml b/.github/workflows/build-frontends.yml index 5db371487..55f6413eb 100644 --- a/.github/workflows/build-frontends.yml +++ b/.github/workflows/build-frontends.yml @@ -25,7 +25,7 @@ jobs: dotnet-quality: 'preview' - name: Install dependencies - run: dotnet restore ILSpy.XPlat.slnf + run: dotnet restore ILSpy.XPlat.slnf -p:RestoreEnablePackagePruning=false - name: Build Debug run: dotnet msbuild ILSpy.XPlat.slnf -p:Configuration=Debug -bl:Debug.binlog diff --git a/.github/workflows/build-ilspy.yml b/.github/workflows/build-ilspy.yml index 967db1129..c684ff8c0 100644 --- a/.github/workflows/build-ilspy.yml +++ b/.github/workflows/build-ilspy.yml @@ -57,7 +57,7 @@ jobs: Get-ChildItem Env: | Where-Object {$_.Name -Match "^ILSPY_"} | %{ echo "$($_.Name)=$($_.Value)" } | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append - name: Restore the application - run: msbuild ILSpy.sln /t:Restore /p:Configuration=${{ matrix.configuration }} /p:Platform=$env:BuildPlatform + run: msbuild ILSpy.sln /t:Restore /p:RestoreEnablePackagePruning=false /p:Configuration=${{ matrix.configuration }} /p:Platform=$env:BuildPlatform - name: Build run: msbuild ILSpy.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=$env:BuildPlatform /m diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 64593341d..d40870c16 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -41,7 +41,7 @@ jobs: dotnet-quality: 'preview' - name: Build - run: dotnet build ILSpy.XPlat.slnf --configuration Release + run: dotnet build ILSpy.XPlat.slnf --configuration Release -p:RestoreEnablePackagePruning=false - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/ICSharpCode.ILSpyCmd/packages.lock.json b/ICSharpCode.ILSpyCmd/packages.lock.json index 5b63ee7c5..5449e0bd4 100644 --- a/ICSharpCode.ILSpyCmd/packages.lock.json +++ b/ICSharpCode.ILSpyCmd/packages.lock.json @@ -425,8 +425,8 @@ "System.Collections.Immutable": { "type": "CentralTransitive", "requested": "[9.0.4, )", - "resolved": "9.0.4", - "contentHash": "wfm2NgK22MmBe5qJjp52qzpkeDZKb4l9LbdubhZSehY1z4LS+lld6R+B+UQNb2AZRHu/QJlHxEUcRst5hIEejg==" + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" }, "System.Composition.AttributedModel": { "type": "CentralTransitive", @@ -438,10 +438,7 @@ "type": "CentralTransitive", "requested": "[9.0.4, )", "resolved": "9.0.4", - "contentHash": "qeJNsMmZPc/Lieg0Md+D4F6LoLcxV3b9QsUNmBRXc2ZVOkMbAcwuO9l2jbQFv3n+fLiHJilN8v6i5aJNivjrCQ==", - "dependencies": { - "System.Collections.Immutable": "9.0.4" - } + "contentHash": "qeJNsMmZPc/Lieg0Md+D4F6LoLcxV3b9QsUNmBRXc2ZVOkMbAcwuO9l2jbQFv3n+fLiHJilN8v6i5aJNivjrCQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "CentralTransitive", diff --git a/ICSharpCode.ILSpyX/packages.lock.json b/ICSharpCode.ILSpyX/packages.lock.json index 08db0ba75..d17894185 100644 --- a/ICSharpCode.ILSpyX/packages.lock.json +++ b/ICSharpCode.ILSpyX/packages.lock.json @@ -40,10 +40,7 @@ "type": "Direct", "requested": "[9.0.4, )", "resolved": "9.0.4", - "contentHash": "qeJNsMmZPc/Lieg0Md+D4F6LoLcxV3b9QsUNmBRXc2ZVOkMbAcwuO9l2jbQFv3n+fLiHJilN8v6i5aJNivjrCQ==", - "dependencies": { - "System.Collections.Immutable": "9.0.4" - } + "contentHash": "qeJNsMmZPc/Lieg0Md+D4F6LoLcxV3b9QsUNmBRXc2ZVOkMbAcwuO9l2jbQFv3n+fLiHJilN8v6i5aJNivjrCQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Direct", @@ -77,8 +74,11 @@ "System.Collections.Immutable": { "type": "CentralTransitive", "requested": "[9.0.4, )", - "resolved": "9.0.4", - "contentHash": "wfm2NgK22MmBe5qJjp52qzpkeDZKb4l9LbdubhZSehY1z4LS+lld6R+B+UQNb2AZRHu/QJlHxEUcRst5hIEejg==" + "resolved": "6.0.0", + "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } } } }