Skip to content

Commit bc71b4e

Browse files
jketemaCopilot
jketema
and
Copilot
authored
Use patched latest fmt and rules_dotnet modules
Add and use patched registry versions for fmt 12.2.0 and rules_dotnet 0.22.2, preserving the Windows Unicode workaround, NuGet archive patch, and rules_shell declaration. Update the root and module .NET SDK toolchains to 10.0.201. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 79ef8bc commit bc71b4e

11 files changed

Lines changed: 193 additions & 4 deletions

File tree

‎MODULE.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ bazel_dep(name = "rules_shell", version = "0.8.0")
2525
bazel_dep(name = "bazel_skylib", version = "1.9.2")
2626
bazel_dep(name = "abseil-cpp", version = "20260817.0", repo_name = "absl")
2727
bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.2", repo_name = "json")
28-
bazel_dep(name = "fmt", version = "12.1.0-codeql.1")
28+
bazel_dep(name = "fmt", version = "12.2.0-codeql.1")
2929
bazel_dep(name = "rules_kotlin", version = "2.4.21-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.18.0.bcr.1")
3333
bazel_dep(name = "rules_rust", version = "0.75.0")
3434
bazel_dep(name = "rules_swift", version = "4.0.0-rc5-codeql.3")
@@ -206,7 +206,7 @@ http_archive(
206206
)
207207

208208
dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
209-
dotnet.toolchain(dotnet_version = "10.0.100")
209+
dotnet.toolchain(dotnet_version = "10.0.201")
210210
use_repo(dotnet, "dotnet_toolchains")
211211

212212
register_toolchains("@dotnet_toolchains//:all")

‎misc/bazel/registry/modules/fmt/12.2.0-codeql.1/MODULE.bazel‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module(
2+
name = "fmt",
3+
version = "12.2.0-codeql.1",
4+
bazel_compatibility = [">=7.2.1"],
5+
compatibility_level = 10,
6+
)
7+
8+
bazel_dep(name = "package_metadata", version = "0.0.13")
9+
bazel_dep(name = "rules_cc", version = "0.2.20")
10+
bazel_dep(name = "rules_license", version = "1.0.0")

‎misc/bazel/registry/modules/fmt/12.2.0-codeql.1/overlay/BUILD.bazel‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
load("@package_metadata//licenses/rules:license.bzl", package_metadata_license = "license")
2+
load("@package_metadata//purl:purl.bzl", "purl")
3+
load("@package_metadata//rules:package_metadata.bzl", "package_metadata")
4+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
5+
load("@rules_license//rules:license.bzl", "license")
6+
7+
package(
8+
default_package_metadata = [
9+
":license",
10+
":package_metadata",
11+
],
12+
)
13+
14+
exports_files([
15+
"LICENSE",
16+
])
17+
18+
license(
19+
name = "license",
20+
license_kinds = ["@rules_license//licenses/spdx:MIT"],
21+
license_text = "LICENSE",
22+
)
23+
24+
package_metadata_license(
25+
name = "package_metadata_license",
26+
kind = "@package_metadata//licenses/spdx:MIT",
27+
text = "LICENSE",
28+
visibility = ["//visibility:public"],
29+
)
30+
31+
package_metadata(
32+
name = "package_metadata",
33+
attributes = [":package_metadata_license"],
34+
purl = purl.bazel(
35+
module_name(),
36+
module_version(),
37+
),
38+
visibility = ["//visibility:public"],
39+
)
40+
41+
cc_library(
42+
name = "fmt",
43+
srcs = [
44+
#"src/fmt.cc", # No C++ module support, yet in Bazel (https://github.com/bazelbuild/bazel/pull/19940)
45+
"src/format.cc",
46+
"src/os.cc",
47+
],
48+
hdrs = glob([
49+
"include/fmt/*.h",
50+
]),
51+
# CodeQL change: disable UTF8 support, it's causing issues on Windows
52+
defines = select({
53+
"@rules_cc//cc/compiler:msvc-cl": ["FMT_UNICODE=0"],
54+
"//conditions:default": [],
55+
}),
56+
includes = ["include"],
57+
strip_include_prefix = "include", # workaround: only needed on some macOS systems (see https://github.com/bazelbuild/bazel-central-registry/issues/1537)
58+
visibility = ["//visibility:public"],
59+
)

‎misc/bazel/registry/modules/fmt/12.2.0-codeql.1/overlay/MODULE.bazel‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module(
2+
name = "fmt",
3+
version = "12.2.0-codeql.1",
4+
bazel_compatibility = [">=7.2.1"],
5+
compatibility_level = 10,
6+
)
7+
8+
bazel_dep(name = "package_metadata", version = "0.0.13")
9+
bazel_dep(name = "rules_cc", version = "0.2.20")
10+
bazel_dep(name = "rules_license", version = "1.0.0")

‎misc/bazel/registry/modules/fmt/12.2.0-codeql.1/source.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"url": "https://github.com/fmtlib/fmt/releases/download/12.2.0/fmt-12.2.0.zip",
3+
"integrity": "sha256-ovSo1RF4+VTkwzkAf3ft12ugyy42+HpI5aVAPZvlh48=",
4+
"strip_prefix": "fmt-12.2.0",
5+
"overlay": {
6+
"BUILD.bazel": "sha256-Zn5kky5jBkuqoek9UpzuHX4sTkqyhUKnjENJwJxRCEI=",
7+
"MODULE.bazel": "sha256-VcjblZqKNctLUTX1rWpwOehV8rd4X23XeJzs+S5tfCk="
8+
}
9+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"github:fmtlib/fmt"
1717
],
1818
"versions": [
19-
"12.1.0-codeql.1"
19+
"12.1.0-codeql.1",
20+
"12.2.0-codeql.1"
2021
],
2122
"yanked_versions": {}
2223
}

‎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.6.1")
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/module_dot_bazel_version.patch‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
--- a/MODULE.bazel
2+
+++ b/MODULE.bazel
3+
@@ -6 +6 @@
4+
- version = "0.0.0",
5+
+ version = "0.22.2-codeql.1",

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
--- a/dotnet/private/rules/nuget/nuget_archive.bzl
2+
+++ b/dotnet/private/rules/nuget/nuget_archive.bzl
3+
@@ -142 +142 @@
4+
- if file.endswith(tfm) or file.endswith(tfm + "/"):
5+
+ if file.find("/", tfm_end + 1) != -1:

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

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

0 commit comments

Comments
 (0)