From b4df781da1cd61076e0d8e85db44c2af8fe137f4 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Sun, 17 Nov 2024 08:35:51 +0100 Subject: [PATCH 1/4] Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm, System.Resources.Extensions to 9.0, SRM/S.C.Immutable to 9.0 outside ICSD --- Directory.Packages.props | 36 ++++++++++++++++++++---------------- ILSpy/ILSpy.csproj | 5 +++++ 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 054032035..e2133d770 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,11 +5,11 @@ - + - + @@ -26,31 +26,35 @@ - - + + - + - + - - - - - - - + + + + + + + - - + + + + + + - + \ No newline at end of file diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj index 6bd46530f..e85c97a1e 100644 --- a/ILSpy/ILSpy.csproj +++ b/ILSpy/ILSpy.csproj @@ -93,6 +93,11 @@ + + + + + From 5ba75bfd51645fee4c76e00a1e1d1c2f2bc4eae6 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Sun, 17 Nov 2024 15:04:25 +0100 Subject: [PATCH 2/4] Fix for "Unable to locate dotnet CLI. Ensure that it is on the PATH." https://github.com/microsoft/azure-pipelines-tasks/issues/19162 (then see https://github.com/dotnet/format/pull/2000) --- .github/workflows/build-ilspy.yml | 2 +- BuildTools/pre-commit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ilspy.yml b/.github/workflows/build-ilspy.yml index 10e5d8e9d..f3abfb018 100644 --- a/.github/workflows/build-ilspy.yml +++ b/.github/workflows/build-ilspy.yml @@ -35,7 +35,7 @@ jobs: uses: microsoft/setup-msbuild@v2 - name: Install dotnet-format - run: dotnet tool install -g dotnet-format --version "8.0.453106" --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json + run: dotnet tool install -g dotnet-format --version "8.3.546805" --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json - name: Get Version id: version diff --git a/BuildTools/pre-commit b/BuildTools/pre-commit index eee675c87..1067d5581 100644 --- a/BuildTools/pre-commit +++ b/BuildTools/pre-commit @@ -5,7 +5,7 @@ set -eu -DOTNET_FORMAT_VERSION=8.0.453106 +DOTNET_FORMAT_VERSION=8.3.546805 DOTNET_PATH="$LOCALAPPDATA/ICSharpCode/ILSpy/dotnet-format-$DOTNET_FORMAT_VERSION" if [ ! -d "$DOTNET_PATH" ]; then echo "Downloading dotnet-format $DOTNET_FORMAT_VERSION..." From 25a9693457819db5c029f284bfcad9ed2e64abf8 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Wed, 4 Dec 2024 07:36:45 +0100 Subject: [PATCH 3/4] Roslyn 4.12 --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e2133d770..016f5fcf6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -16,8 +16,8 @@ - - + + From bff20985fc91575e91e0bef5a7d20e745f3082a1 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Mon, 9 Dec 2024 08:50:16 +0100 Subject: [PATCH 4/4] Add DOTNET_ROOT --- .github/workflows/build-ilspy.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-ilspy.yml b/.github/workflows/build-ilspy.yml index f3abfb018..51c2b595c 100644 --- a/.github/workflows/build-ilspy.yml +++ b/.github/workflows/build-ilspy.yml @@ -30,7 +30,10 @@ jobs: with: dotnet-version: '8.0.x' dotnet-quality: 'ga' - + env: + DOTNET_INSTALL_DIR: ${{ runner.temp }}/.dotnet + DOTNET_ROOT: ${{ runner.temp }}/.dotnet + - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2