diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f1415e08e7..c884c33b2e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,18 +3,18 @@ "isRoot": true, "tools": { "dotnet-reportgenerator-globaltool": { - "version": "5.3.11", + "version": "5.5.11", "commands": [ "reportgenerator" ], "rollForward": false }, "dotnet-coverage": { - "version": "18.7.0", + "version": "18.9.0", "commands": [ "dotnet-coverage" ], "rollForward": false } } -} +} \ No newline at end of file diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b956b60819..c38905621b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -32,6 +32,9 @@ updates: ignore: - dependency-name: "*" update-types: ["version-update:semver-major"] + # Pinned at 9.0.16 due to TypeInitializationException on Icu.NativeMethods + # in the net48 test host (PR #1000). Retest procedure: Directory.Packages.props. + - dependency-name: "Microsoft.Extensions.DependencyModel" groups: nuget-minor: patterns: diff --git a/.github/workflows/base-installer-cd.yml b/.github/workflows/base-installer-cd.yml index acc8937090..d01a45034d 100644 --- a/.github/workflows/base-installer-cd.yml +++ b/.github/workflows/base-installer-cd.yml @@ -139,7 +139,7 @@ jobs: } - name: Setup dotnet - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 with: dotnet-version: | 3.1.x @@ -289,7 +289,7 @@ jobs: - name: Tag, Create Release, and Upload artifacts if: ${{ inputs.make_release == 'true' }} - uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b + uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 with: target_commitish: ${{ github.event.inputs.fw_ref || github.ref }} tag_name: build-${{ env.FW_BUILD_NUMBER }} diff --git a/.github/workflows/link-check.yml b/.github/workflows/link-check.yml index 732544d9c7..ea435abf46 100644 --- a/.github/workflows/link-check.yml +++ b/.github/workflows/link-check.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout uses: actions/checkout@v7 - name: Link check with lychee (non-blocking) - uses: lycheeverse/lychee-action@v2.8.0 + uses: lycheeverse/lychee-action@v2.9.0 with: # Limit concurrency and accept 429 (rate-limited) as non-fatal args: >- diff --git a/.github/workflows/patch-installer-cd.yml b/.github/workflows/patch-installer-cd.yml index 0f0279b162..9541bc27fc 100644 --- a/.github/workflows/patch-installer-cd.yml +++ b/.github/workflows/patch-installer-cd.yml @@ -149,7 +149,7 @@ jobs: } - name: Setup dotnet - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 with: dotnet-version: | 3.1.x diff --git a/Build/SilVersions.props b/Build/SilVersions.props index 0ea3730ac4..13b5ee7f00 100644 --- a/Build/SilVersions.props +++ b/Build/SilVersions.props @@ -12,8 +12,8 @@ ============================================================= --> - 11.0.0-beta0173 - 18.0.0-beta0027 + 11.0.0-beta0176 + 18.0.0-beta0030 18.0.0-beta0012 6.0.0-beta0065 3.0.1 diff --git a/Build/Src/Directory.Packages.props b/Build/Src/Directory.Packages.props index f45369d24f..a503313a33 100644 --- a/Build/Src/Directory.Packages.props +++ b/Build/Src/Directory.Packages.props @@ -17,7 +17,10 @@ - + + + diff --git a/Directory.Packages.props b/Directory.Packages.props index 17911b2c02..50880ec3f3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,11 +2,9 @@ true true @@ -15,42 +13,39 @@ - - - - + + + - - + + - + + + + + - - - + + + diff --git a/Src/FwParatextLexiconPlugin/ILRepack.targets b/Src/FwParatextLexiconPlugin/ILRepack.targets index 18bd584edc..27d65fdc02 100644 --- a/Src/FwParatextLexiconPlugin/ILRepack.targets +++ b/Src/FwParatextLexiconPlugin/ILRepack.targets @@ -25,6 +25,19 @@ This software is licensed under the LGPL, version 2.1 or later + + + + +