Skip to content

Commit 8137077

Browse files
jketemaCopilot
jketema
and
Copilot
committed
Update patched rules_dotnet to 0.22.2
Publish the existing NuGet archive fix against the latest rules_dotnet release and update the CodeQL module dependency, retaining the old registry version for existing consumers. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 18b48aa commit 8137077

5 files changed

Lines changed: 100 additions & 1 deletion

File tree

‎MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1", repo_name = "json")
2828
bazel_dep(name = "fmt", version = "12.1.0-codeql.1")
2929
bazel_dep(name = "rules_kotlin", version = "2.2.2-codeql.1")
3030
bazel_dep(name = "gazelle", version = "0.54.0")
31-
bazel_dep(name = "rules_dotnet", version = "0.21.5-codeql.1")
31+
bazel_dep(name = "rules_dotnet", version = "0.22.2-codeql.1")
3232
bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
3333
bazel_dep(name = "rules_rust", version = "0.74.0")
3434
bazel_dep(name = "rules_swift", version = "4.0.0-rc5-codeql.3")

‎misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/MODULE.bazel‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
"rules_dotnet"
2+
3+
module(
4+
name = "rules_dotnet",
5+
version = "0.22.2-codeql.1",
6+
bazel_compatibility = [">=8.0.0"],
7+
compatibility_level = 0,
8+
)
9+
10+
dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
11+
dotnet.toolchain(dotnet_version = "10.0.201")
12+
13+
# This toolchain is used for building the apphost shimmer only. The apphost shimmer
14+
# can not be buit with the toolchain that the end-user picks because the apphost builder
15+
# always targets the latest SDK and the end-user can pick an older SDK that is incompatible with the apphost builder.
16+
dotnet.toolchain(
17+
name = "dotnet_apphost",
18+
dotnet_version = "10.0.201",
19+
)
20+
use_repo(dotnet, "dotnet_toolchains")
21+
22+
# These toolchains are used to build the apphost shimmer
23+
use_repo(dotnet, "dotnet_apphost_x86_64-unknown-linux-gnu")
24+
use_repo(dotnet, "dotnet_apphost_arm64-unknown-linux-gnu")
25+
use_repo(dotnet, "dotnet_apphost_aarch64-apple-darwin")
26+
use_repo(dotnet, "dotnet_apphost_x86_64-apple-darwin")
27+
use_repo(dotnet, "dotnet_apphost_x86_64-pc-windows-msvc")
28+
use_repo(dotnet, "dotnet_apphost_arm64-pc-windows-msvc")
29+
30+
register_toolchains("@dotnet_toolchains//:all")
31+
32+
paket2bazel_dependencies_extension = use_extension("@rules_dotnet//dotnet:paket.paket2bazel_dependencies_extension.bzl", "paket2bazel_dependencies_extension")
33+
use_repo(paket2bazel_dependencies_extension, "paket.paket2bazel_dependencies")
34+
35+
rules_dotnet_nuget_packages_extension = use_extension("@rules_dotnet//dotnet:paket.rules_dotnet_nuget_packages_extension.bzl", "rules_dotnet_nuget_packages_extension")
36+
use_repo(rules_dotnet_nuget_packages_extension, "paket.rules_dotnet_nuget_packages")
37+
38+
targeting_packs_extension = use_extension("@rules_dotnet//dotnet/private/sdk/targeting_packs:dotnet.targeting_packs_extension.bzl", "targeting_packs_extension")
39+
use_repo(targeting_packs_extension, "dotnet.targeting_packs")
40+
41+
runtime_packs_extension = use_extension("@rules_dotnet//dotnet/private/sdk/runtime_packs:dotnet.runtime_packs_extension.bzl", "runtime_packs_extension")
42+
use_repo(runtime_packs_extension, "dotnet.runtime_packs")
43+
44+
apphost_packs_extension = use_extension("@rules_dotnet//dotnet/private/sdk/apphost_packs:dotnet.apphost_packs_extension.bzl", "apphost_packs_extension")
45+
use_repo(apphost_packs_extension, "dotnet.apphost_packs")
46+
47+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
48+
bazel_dep(name = "platforms", version = "1.0.0")
49+
bazel_dep(name = "bazel_lib", version = "3.0.0")
50+
bazel_dep(name = "rules_shell", version = "0.5.0")
51+
52+
# Dev dependencies
53+
bazel_dep(name = "rules_pkg", version = "1.1.0", dev_dependency = True)
54+
bazel_dep(name = "gazelle", version = "0.51.3", dev_dependency = True, repo_name = "bazel_gazelle")
55+
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.9.0", dev_dependency = True)
56+
bazel_dep(name = "rules_cc", version = "0.2.19", dev_dependency = True)
57+
bazel_dep(name = "rules_testing", version = "0.8.0", dev_dependency = True)
58+
bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
59+
bazel_dep(name = "dotnet_test_resources_other_repo", version = "", dev_dependency = True)
60+
local_path_override(
61+
module_name = "dotnet_test_resources_other_repo",
62+
path = "dotnet/private/tests/resources/other_repo",
63+
)
64+
65+
rules_dotnet_dev_nuget_packages_extension = use_extension("@rules_dotnet//dotnet:paket.rules_dotnet_dev_nuget_packages_extension.bzl", "rules_dotnet_dev_nuget_packages_extension", dev_dependency = True)
66+
use_repo(rules_dotnet_dev_nuget_packages_extension, "paket.rules_dotnet_dev_nuget_packages")
67+
68+
rules_dotnet_nuget_resource_assemblies_tests_extension = use_extension("@rules_dotnet//dotnet:paket.rules_dotnet_nuget_resource_assemblies_tests_extension.bzl", "rules_dotnet_nuget_resource_assemblies_tests_extension", dev_dependency = True)
69+
use_repo(rules_dotnet_nuget_resource_assemblies_tests_extension, "paket.rules_dotnet_nuget_resource_assemblies_tests")
70+
71+
internal_dev_deps = use_extension("@rules_dotnet//dotnet:internal_dev_deps.bzl", "internal_dev_deps", dev_dependency = True)
72+
use_repo(internal_dev_deps, "buildkite_config")
73+
74+
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)
75+
use_repo(rules_dotnet_framework_override_not_provided_tests_extension, "paket.rules_dotnet_framework_override_not_provided_tests")
76+
77+
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)
78+
use_repo(rules_dotnet_nuget_tool_tests_extension, "paket.rules_dotnet_nuget_tool_tests")

‎misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/patches/revert_additional_files_in_nuget_archive.patch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/dotnet/private/rules/nuget/nuget_archive.bzl 2025-09-04 16:14:49.402400198 +0200
2+
+++ b/dotnet/private/rules/nuget/nuget_archive.bzl 2025-09-04 16:12:16.577010334 +0200
3+
@@ -123,7 +123,7 @@
4+
return
5+
6+
# If the folder is empty we do nothing
7+
- if file.endswith(tfm) or file.endswith(tfm + "/"):
8+
+ if file.find("/", tfm_end + 1) != -1:
9+
return
10+
11+
group = groups[group_name]

‎misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/source.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"integrity": "sha256-zjXa0Y2zHNaDI7Vo3AnGicxtdewW66FRDM0Si7XxJk4=",
3+
"strip_prefix": "rules_dotnet-0.22.2",
4+
"url": "https://github.com/bazel-contrib/rules_dotnet/releases/download/v0.22.2/rules_dotnet-v0.22.2.tar.gz",
5+
"patches": {
6+
"revert_additional_files_in_nuget_archive.patch": "sha256-FzMKXeHVhIBXQRCNFB0EANDszgJc/BBaPgWCzkbW9Ck="
7+
},
8+
"patch_strip": 1
9+
}

‎misc/bazel/registry/modules/rules_dotnet/metadata.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"github:bazel-contrib/rules_dotnet"
1414
],
1515
"versions": [
16+
"0.22.2-codeql.1",
1617
"0.21.5-codeql.1"
1718
],
1819
"yanked_versions": {}

0 commit comments

Comments
 (0)