Skip to content

Commit 3858a8b

Browse files
redsun82michaelnebel
authored andcommitted
Bazel: patch rules_dotnet to avoid unit test failure
1 parent 455e773 commit 3858a8b

File tree

5 files changed

+97
-1
lines changed

5 files changed

+97
-1
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
2626
bazel_dep(name = "fmt", version = "10.0.0")
2727
bazel_dep(name = "rules_kotlin", version = "2.1.3-codeql.1")
2828
bazel_dep(name = "gazelle", version = "0.40.0")
29-
bazel_dep(name = "rules_dotnet", version = "0.19.2")
29+
bazel_dep(name = "rules_dotnet", version = "0.19.2-codeql.1")
3030
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
3131
bazel_dep(name = "rules_rust", version = "0.63.0")
3232
bazel_dep(name = "zstd", version = "1.5.5.bcr.1")
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
"rules_dotnet"
2+
3+
module(
4+
name = "rules_dotnet",
5+
version = "0.19.2-codeql.1",
6+
bazel_compatibility = [">=7.0.0"],
7+
compatibility_level = 0,
8+
)
9+
10+
dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
11+
dotnet.toolchain(dotnet_version = "9.0.300")
12+
use_repo(dotnet, "dotnet_toolchains")
13+
14+
register_toolchains("@dotnet_toolchains//:all")
15+
16+
paket2bazel_dependencies_extension = use_extension("//dotnet:paket.paket2bazel_dependencies_extension.bzl", "paket2bazel_dependencies_extension")
17+
use_repo(paket2bazel_dependencies_extension, "paket.paket2bazel_dependencies")
18+
19+
rules_dotnet_nuget_packages_extension = use_extension("//dotnet:paket.rules_dotnet_nuget_packages_extension.bzl", "rules_dotnet_nuget_packages_extension")
20+
use_repo(rules_dotnet_nuget_packages_extension, "paket.rules_dotnet_nuget_packages")
21+
22+
targeting_packs_extension = use_extension("//dotnet/private/sdk/targeting_packs:dotnet.targeting_packs_extension.bzl", "targeting_packs_extension")
23+
use_repo(targeting_packs_extension, "dotnet.targeting_packs")
24+
25+
runtime_packs_extension = use_extension("//dotnet/private/sdk/runtime_packs:dotnet.runtime_packs_extension.bzl", "runtime_packs_extension")
26+
use_repo(runtime_packs_extension, "dotnet.runtime_packs")
27+
28+
apphost_packs_extension = use_extension("//dotnet/private/sdk/apphost_packs:dotnet.apphost_packs_extension.bzl", "apphost_packs_extension")
29+
use_repo(apphost_packs_extension, "dotnet.apphost_packs")
30+
31+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
32+
bazel_dep(name = "platforms", version = "1.0.0")
33+
bazel_dep(name = "aspect_bazel_lib", version = "2.19.4")
34+
bazel_dep(name = "rules_shell", version = "0.5.0")
35+
36+
# Dev dependencies
37+
bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True)
38+
bazel_dep(name = "rules_pkg", version = "1.1.0", dev_dependency = True)
39+
bazel_dep(name = "gazelle", version = "0.44.0", dev_dependency = True, repo_name = "bazel_gazelle")
40+
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.7.1", dev_dependency = True)
41+
bazel_dep(name = "rules_cc", version = "0.1.2", dev_dependency = True)
42+
bazel_dep(name = "rules_testing", version = "0.8.0", dev_dependency = True)
43+
bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
44+
bazel_dep(name = "dotnet_test_resources_other_repo", version = "", dev_dependency = True)
45+
local_path_override(
46+
module_name = "dotnet_test_resources_other_repo",
47+
path = "dotnet/private/tests/resources/other_repo",
48+
)
49+
50+
rules_dotnet_dev_nuget_packages_extension = use_extension("//dotnet:paket.rules_dotnet_dev_nuget_packages_extension.bzl", "rules_dotnet_dev_nuget_packages_extension", dev_dependency = True)
51+
use_repo(rules_dotnet_dev_nuget_packages_extension, "paket.rules_dotnet_dev_nuget_packages")
52+
53+
rules_dotnet_nuget_resource_assemblies_tests_extension = use_extension("//dotnet:paket.rules_dotnet_nuget_resource_assemblies_tests_extension.bzl", "rules_dotnet_nuget_resource_assemblies_tests_extension", dev_dependency = True)
54+
use_repo(rules_dotnet_nuget_resource_assemblies_tests_extension, "paket.rules_dotnet_nuget_resource_assemblies_tests")
55+
56+
internal_dev_deps = use_extension("//dotnet:internal_dev_deps.bzl", "internal_dev_deps", dev_dependency = True)
57+
use_repo(internal_dev_deps, "buildkite_config")
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]
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"integrity": "sha256-6f9LidI9BUve7+TpoL1sh5GKC6sgLSYNImlVnVaiHEE=",
3+
"strip_prefix": "rules_dotnet-0.19.2",
4+
"url": "https://github.com/bazel-contrib/rules_dotnet/releases/download/v0.19.2/rules_dotnet-v0.19.2.tar.gz",
5+
"patches": {
6+
"revert_additional_files_in_nuget_archive.patch": "sha256-FzMKXeHVhIBXQRCNFB0EANDszgJc/BBaPgWCzkbW9Ck="
7+
},
8+
"patch_strip": 1
9+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"homepage": "https://github.com/bazel-contrib/rules_dotnet",
3+
"maintainers": [
4+
{
5+
"name": "Dan\u00edel Poul Purkh\u00fas",
6+
"email": "[email protected]",
7+
"github": "purkhusid",
8+
"github_user_id": 5622403
9+
}
10+
],
11+
"repository": [
12+
"github:bazelbuild/rules_dotnet",
13+
"github:bazel-contrib/rules_dotnet"
14+
],
15+
"versions": [
16+
"0.19.2-codeql.1"
17+
],
18+
"yanked_versions": {}
19+
}

0 commit comments

Comments
 (0)