From b02d92a94cff5aaaf92da04c7fd555eb88c0939f Mon Sep 17 00:00:00 2001 From: jketema <93738568+jketema@users.noreply.github.com> Date: Thu, 29 Oct 2026 15:29:32 +0000 Subject: [PATCH] Update patched rules_dotnet to 0.22.2 Replace the old registry version with 0.22.2-codeql.1, carrying forward the NuGet archive fix, and update the CodeQL module dependency. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- MODULE.bazel | 2 +- .../MODULE.bazel | 21 ++++++++++++------- ...rt_additional_files_in_nuget_archive.patch | 0 .../source.json | 6 +++--- .../modules/rules_dotnet/metadata.json | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) rename misc/bazel/registry/modules/rules_dotnet/{0.21.5-codeql.1 => 0.22.2-codeql.1}/MODULE.bazel (77%) rename misc/bazel/registry/modules/rules_dotnet/{0.21.5-codeql.1 => 0.22.2-codeql.1}/patches/revert_additional_files_in_nuget_archive.patch (100%) rename misc/bazel/registry/modules/rules_dotnet/{0.21.5-codeql.1 => 0.22.2-codeql.1}/source.json (57%) diff --git a/MODULE.bazel b/MODULE.bazel index 9061e9929a44..15ec16e48324 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1", repo_name = "json") bazel_dep(name = "fmt", version = "12.1.0-codeql.1") bazel_dep(name = "rules_kotlin", version = "2.2.2-codeql.1") bazel_dep(name = "gazelle", version = "0.54.0") -bazel_dep(name = "rules_dotnet", version = "0.21.5-codeql.1") +bazel_dep(name = "rules_dotnet", version = "0.22.2-codeql.1") bazel_dep(name = "googletest", version = "1.17.0.bcr.2") bazel_dep(name = "rules_rust", version = "0.74.0") bazel_dep(name = "rules_swift", version = "4.0.0-rc5-codeql.3") diff --git a/misc/bazel/registry/modules/rules_dotnet/0.21.5-codeql.1/MODULE.bazel b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/MODULE.bazel similarity index 77% rename from misc/bazel/registry/modules/rules_dotnet/0.21.5-codeql.1/MODULE.bazel rename to misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/MODULE.bazel index 9ad1005a8508..a0561d09ace8 100644 --- a/misc/bazel/registry/modules/rules_dotnet/0.21.5-codeql.1/MODULE.bazel +++ b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/MODULE.bazel @@ -2,16 +2,20 @@ module( name = "rules_dotnet", - version = "0.21.5-codeql.1", + version = "0.22.2-codeql.1", bazel_compatibility = [">=8.0.0"], compatibility_level = 0, ) dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet") -dotnet.toolchain(dotnet_version = "10.0.100") +dotnet.toolchain(dotnet_version = "10.0.201") + +# This toolchain is used for building the apphost shimmer only. The apphost shimmer +# can not be buit with the toolchain that the end-user picks because the apphost builder +# always targets the latest SDK and the end-user can pick an older SDK that is incompatible with the apphost builder. dotnet.toolchain( name = "dotnet_apphost", - dotnet_version = "10.0.100", + dotnet_version = "10.0.201", ) use_repo(dotnet, "dotnet_toolchains") @@ -43,13 +47,13 @@ use_repo(apphost_packs_extension, "dotnet.apphost_packs") bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "platforms", version = "1.0.0") bazel_dep(name = "bazel_lib", version = "3.0.0") -bazel_dep(name = "rules_shell", version = "0.6.1") +bazel_dep(name = "rules_shell", version = "0.5.0") # Dev dependencies bazel_dep(name = "rules_pkg", version = "1.1.0", dev_dependency = True) -bazel_dep(name = "gazelle", version = "0.44.0", dev_dependency = True, repo_name = "bazel_gazelle") -bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.7.1", dev_dependency = True) -bazel_dep(name = "rules_cc", version = "0.1.2", dev_dependency = True) +bazel_dep(name = "gazelle", version = "0.51.3", dev_dependency = True, repo_name = "bazel_gazelle") +bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.9.0", dev_dependency = True) +bazel_dep(name = "rules_cc", version = "0.2.19", dev_dependency = True) bazel_dep(name = "rules_testing", version = "0.8.0", dev_dependency = True) bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True) bazel_dep(name = "dotnet_test_resources_other_repo", version = "", dev_dependency = True) @@ -67,5 +71,8 @@ use_repo(rules_dotnet_nuget_resource_assemblies_tests_extension, "paket.rules_do internal_dev_deps = use_extension("@rules_dotnet//dotnet:internal_dev_deps.bzl", "internal_dev_deps", dev_dependency = True) use_repo(internal_dev_deps, "buildkite_config") +rules_dotnet_framework_override_not_provided_tests_extension = use_extension("@rules_dotnet//dotnet:paket.rules_dotnet_framework_override_not_provided_tests_extension.bzl", "rules_dotnet_framework_override_not_provided_tests_extension", dev_dependency = True) +use_repo(rules_dotnet_framework_override_not_provided_tests_extension, "paket.rules_dotnet_framework_override_not_provided_tests") + rules_dotnet_nuget_tool_tests_extension = use_extension("@rules_dotnet//dotnet:paket.rules_dotnet_nuget_tool_tests_extension.bzl", "rules_dotnet_nuget_tool_tests_extension", dev_dependency = True) use_repo(rules_dotnet_nuget_tool_tests_extension, "paket.rules_dotnet_nuget_tool_tests") diff --git a/misc/bazel/registry/modules/rules_dotnet/0.21.5-codeql.1/patches/revert_additional_files_in_nuget_archive.patch b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/patches/revert_additional_files_in_nuget_archive.patch similarity index 100% rename from misc/bazel/registry/modules/rules_dotnet/0.21.5-codeql.1/patches/revert_additional_files_in_nuget_archive.patch rename to misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/patches/revert_additional_files_in_nuget_archive.patch diff --git a/misc/bazel/registry/modules/rules_dotnet/0.21.5-codeql.1/source.json b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/source.json similarity index 57% rename from misc/bazel/registry/modules/rules_dotnet/0.21.5-codeql.1/source.json rename to misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/source.json index aabd82d97c0b..6abce90095f5 100644 --- a/misc/bazel/registry/modules/rules_dotnet/0.21.5-codeql.1/source.json +++ b/misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/source.json @@ -1,7 +1,7 @@ { - "integrity": "sha256-fgvSYSFAtQh+MuDzTji3iWR642WwefGCSzCLLUtZyFE=", - "strip_prefix": "rules_dotnet-0.21.5", - "url": "https://github.com/bazel-contrib/rules_dotnet/releases/download/v0.21.5/rules_dotnet-v0.21.5.tar.gz", + "integrity": "sha256-zjXa0Y2zHNaDI7Vo3AnGicxtdewW66FRDM0Si7XxJk4=", + "strip_prefix": "rules_dotnet-0.22.2", + "url": "https://github.com/bazel-contrib/rules_dotnet/releases/download/v0.22.2/rules_dotnet-v0.22.2.tar.gz", "patches": { "revert_additional_files_in_nuget_archive.patch": "sha256-FzMKXeHVhIBXQRCNFB0EANDszgJc/BBaPgWCzkbW9Ck=" }, diff --git a/misc/bazel/registry/modules/rules_dotnet/metadata.json b/misc/bazel/registry/modules/rules_dotnet/metadata.json index ea34a05cfb68..9b735ae6b3b7 100644 --- a/misc/bazel/registry/modules/rules_dotnet/metadata.json +++ b/misc/bazel/registry/modules/rules_dotnet/metadata.json @@ -13,7 +13,7 @@ "github:bazel-contrib/rules_dotnet" ], "versions": [ - "0.21.5-codeql.1" + "0.22.2-codeql.1" ], "yanked_versions": {} }