diff --git a/.github/workflows/build-ilspy.yml b/.github/workflows/build-ilspy.yml index 10e5d8e9d..51c2b595c 100644 --- a/.github/workflows/build-ilspy.yml +++ b/.github/workflows/build-ilspy.yml @@ -30,12 +30,15 @@ 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 - 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..." diff --git a/Directory.Packages.props b/Directory.Packages.props index 1a17a10a2..72b5cb578 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,19 +5,19 @@ - + - + - - + + @@ -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 @@ + + + + +