diff --git a/.github/workflows/build-ilspy.yml b/.github/workflows/build-ilspy.yml index 03bc37cc4..8ce3864f3 100644 --- a/.github/workflows/build-ilspy.yml +++ b/.github/workflows/build-ilspy.yml @@ -44,7 +44,10 @@ jobs: uses: microsoft/setup-msbuild@v2 - name: Install dotnet-format - run: dotnet tool install -g dotnet-format --version "9.0.520307" --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json + env: + DOTNET_FORMAT_VERSION: 10.0.100-preview.6.25358.103 + DOTNET_FORMAT_SOURCE: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json + run: dotnet tool install -g dotnet-format --version "${{env.DOTNET_FORMAT_VERSION}}" --add-source "${{env.DOTNET_FORMAT_SOURCE}}" - name: Install wix (locked version) run: dotnet tool install --global wix --version 6.0.0 diff --git a/BuildTools/pre-commit b/BuildTools/pre-commit index 8d455651a..dcaa14e0d 100644 --- a/BuildTools/pre-commit +++ b/BuildTools/pre-commit @@ -5,11 +5,12 @@ set -eu -DOTNET_FORMAT_VERSION=9.0.520307 +DOTNET_FORMAT_VERSION=10.0.100-preview.6.25358.103 +DOTNET_FORMAT_SOURCE="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" DOTNET_PATH="$LOCALAPPDATA/ICSharpCode/ILSpy/dotnet-format-$DOTNET_FORMAT_VERSION" if [ ! -d "$DOTNET_PATH" ]; then echo "Downloading dotnet-format $DOTNET_FORMAT_VERSION..." - dotnet tool install --tool-path "$DOTNET_PATH" dotnet-format --version "$DOTNET_FORMAT_VERSION" --add-source "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" + dotnet tool install --tool-path "$DOTNET_PATH" dotnet-format --version "$DOTNET_FORMAT_VERSION" --add-source "$DOTNET_FORMAT_SOURCE" fi "$DOTNET_PATH/dotnet-format.exe" --version