Expose NuGet files as a filegroup

bazel-contrib · Oct 7, 2024 · 8f01bbd · 8f01bbd
1 parent 11d2307
commit 8f01bbd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/dotnet/private/rules/nuget/nuget_archive.bzl b/dotnet/private/rules/nuget/nuget_archive.bzl
@@ -364,7 +364,7 @@ def _nuget_archive_impl(ctx):
     for name in names:
         ctx.symlink(file_name, name)
 
-    files = sorted(_read_dir(ctx, ".").replace(str(ctx.path(".")) + "/", "").splitlines())
+    all_files = sorted(_read_dir(ctx, ".").replace(str(ctx.path(".")) + "/", "").splitlines())
 
     # The NuGet package format
     groups = {
@@ -400,7 +400,7 @@ def _nuget_archive_impl(ctx):
         },
     }
 
-    for file in files:
+    for file in all_files:
         file = _sanitize_path(file)
         i = file.find("/")
         key = file[:i]
@@ -493,6 +493,7 @@ load("@rules_dotnet//dotnet/private/rules/nuget:nuget_archive.bzl", "tfm_filegro
         "filegroup(name = \"data\", srcs = [])",
         _create_rid_native_select("native", native) or "filegroup(name = \"native\", srcs = [])",
         "filegroup(name = \"content_files\", srcs = [%s])" % ",".join(["\n  \"%s\"" % a for a in groups.get("contentFiles")["any"]]),
+        "filegroup(name = \"files\", srcs = [%s])" % ",".join(["\n  \"%s\"" % _sanitize_path(a) for a in all_files]),
         "exports_files([\"%s\"])" % nupkg_name,
     ]))
 

diff --git a/dotnet/private/rules/nuget/nuget_repo.bzl b/dotnet/private/rules/nuget/nuget_repo.bzl
@@ -38,6 +38,7 @@ def _nuget_repo_impl(ctx):
         ctx.file("{}/BUILD.bazel".format(name.lower()), r"""package(default_visibility = ["//visibility:public"])
 alias(name = "{name}", actual = "//{id}/{version}")
 alias(name = "content_files", actual = "@{prefix}.{id}.v{version}//:content_files")
+alias(name = "files", actual = "@{prefix}.{id}.v{version}//:files")
 """.format(prefix = _GLOBAL_NUGET_PREFIX, name = name.lower(), id = id.lower(), version = version))
 
 _nuget_repo = repository_rule(

diff --git a/dotnet/private/tests/nuget_structure/BUILD.bazel b/dotnet/private/tests/nuget_structure/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@bazel_skylib//rules:select_file.bzl", "select_file")
 load(":analyzers.bzl", "analyzers_structure")
 load(":resolution.bzl", "resolution_structure")
 load(":runtimes.bzl", "runtimes_structure")
@@ -51,3 +52,10 @@ bzl_library(
     visibility = ["//dotnet:__subpackages__"],
     deps = [":common"],
 )
+
+select_file(
+    name = "should_expose_files_as_filegroup",
+    srcs = "@paket.rules_dotnet_dev_nuget_packages//fsharp.core:files",
+    subpath = "lib/netstandard2.1/it/FSharp.Core.resources.dll",
+    visibility = ["//dotnet:__subpackages__"],
+)