WIP

bazel-contrib · Apr 3, 2024 · 4746e94 · 4746e94
1 parent 1486f73
commit 4746e94
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 18 deletions.
diff --git a/docs/defs.md b/docs/defs.md
diff --git a/dotnet/private/providers.bzl b/dotnet/private/providers.bzl
@@ -60,6 +60,7 @@ DotnetBinaryInfo = provider(
         "app_host": "File: The apphost executable",
         "dll": "File: The main binary dll",
         "transitive_runtime_deps": "list[DotnetAssemblyRuntimeInfo]: The transitive runtime dependencies of the binary",
+        "runtime_pack_info": "DotnetRuntimePackInfo: The runtime pack for the binary",
     },
 )
 

diff --git a/dotnet/private/rules/common/BUILD.bazel b/dotnet/private/rules/common/BUILD.bazel
@@ -26,6 +26,7 @@ bzl_library(
     deps = [
         "//dotnet/private:providers",
         "//dotnet/private/sdk/apphost_packs:apphost_pack_transition",
+        "//dotnet/private/sdk/runtime_packs:runtime_pack_transition",
         "//dotnet/private/sdk/targeting_packs:targeting_pack_transition",
         "//dotnet/private/transitions:default_transition",
         "//dotnet/private/transitions:tfm_transition",

diff --git a/dotnet/private/rules/common/attrs.bzl b/dotnet/private/rules/common/attrs.bzl
@@ -3,6 +3,7 @@
 load("@bazel_skylib//lib:dicts.bzl", "dicts")
 load("//dotnet/private:providers.bzl", "DotnetAssemblyCompileInfo", "DotnetAssemblyRuntimeInfo")
 load("//dotnet/private/sdk/apphost_packs:apphost_pack_transition.bzl", "apphost_pack_transition")
+load("//dotnet/private/sdk/runtime_packs:runtime_pack_transition.bzl", "runtime_pack_transition")
 load("//dotnet/private/sdk/targeting_packs:targeting_pack_transition.bzl", "targeting_pack_transition")
 load("//dotnet/private/transitions:default_transition.bzl", "default_transition")
 load("//dotnet/private/transitions:tfm_transition.bzl", "tfm_transition")
@@ -194,6 +195,10 @@ BINARY_COMMON_ATTRS = {
         default = "//dotnet/private/sdk/apphost_packs:apphost_pack",
         cfg = apphost_pack_transition,
     ),
+    "_runtime_pack": attr.label(
+        default = "//dotnet/private/sdk/runtime_packs:runtime_pack",
+        cfg = runtime_pack_transition,
+    ),
 }
 
 # These are attributes that are common across all the binary/library/test C# rules

diff --git a/dotnet/private/rules/common/binary.bzl b/dotnet/private/rules/common/binary.bzl
@@ -13,7 +13,7 @@ load(
     "is_standard_framework",
     "to_rlocation_path",
 )
-load("//dotnet/private:providers.bzl", "DotnetApphostPackInfo", "DotnetBinaryInfo")
+load("//dotnet/private:providers.bzl", "DotnetApphostPackInfo", "DotnetBinaryInfo", "DotnetRuntimePackInfo")
 
 def _create_shim_exe(ctx, dll):
     windows_constraint = ctx.attr._windows_constraint[platform_common.ConstraintValueInfo]
@@ -156,6 +156,7 @@ def build_binary(ctx, compile_action):
         dll = dll,
         app_host = app_host,
         transitive_runtime_deps = transitive_runtime_deps,
+        runtime_pack_info = ctx.attr._runtime_pack[0][DotnetRuntimePackInfo],
     )
 
     return [default_info, dotnet_binary_info, compile_provider, runtime_provider]
diff --git a/dotnet/private/rules/publish_binary/publish_binary.bzl b/dotnet/private/rules/publish_binary/publish_binary.bzl
@@ -4,8 +4,7 @@ Rules for compiling F# binaries.
 
 load("@bazel_skylib//lib:shell.bzl", "shell")
 load("//dotnet/private:common.bzl", "generate_depsjson", "generate_runtimeconfig", "to_rlocation_path")
-load("//dotnet/private:providers.bzl", "DotnetAssemblyCompileInfo", "DotnetAssemblyRuntimeInfo", "DotnetBinaryInfo", "DotnetRuntimePackInfo")
-load("//dotnet/private/sdk/runtime_packs:runtime_pack_transition.bzl", "runtime_pack_transition")
+load("//dotnet/private:providers.bzl", "DotnetAssemblyCompileInfo", "DotnetAssemblyRuntimeInfo", "DotnetBinaryInfo")
 load("//dotnet/private/transitions:tfm_transition.bzl", "tfm_transition")
 
 def _copy_file(script_body, src, dst, is_windows):
@@ -154,8 +153,8 @@ def _publish_binary_impl(ctx):
     target_framework = ctx.attr.target_framework
     is_self_contained = ctx.attr.self_contained
     assembly_name = assembly_runtime_info.name
-    runtime_pack_info = ctx.attr._runtime_pack[0][DotnetRuntimePackInfo] if is_self_contained else None
-    runtime_identifier = ctx.attr._runtime_pack[0][DotnetRuntimePackInfo].runtime_identifier
+    runtime_pack_info = binary_info.runtime_pack_info if is_self_contained else None
+    runtime_identifier = binary_info.runtime_pack_info.runtime_identifier
     roll_forward_behavior = ctx.attr.roll_forward_behavior
 
     (executable, runfiles) = _copy_to_publish(
@@ -216,12 +215,6 @@ publish_binary = rule(
             cfg = tfm_transition,
             mandatory = True,
         ),
-        "project_sdk": attr.string(
-            doc = "The project SDK that is being targeted. " +
-                  "See https://learn.microsoft.com/en-us/dotnet/core/project-sdk/overview",
-            default = "default",
-            values = ["default", "web"],
-        ),
         "self_contained": attr.bool(
             doc = """
             Whether the binary should be self-contained.
@@ -249,10 +242,6 @@ publish_binary = rule(
             default = "Minor",
             values = ["Minor", "Major", "LatestPatch", "LatestMinor", "LatestMajor", "Disable"],
         ),
-        "_runtime_pack": attr.label(
-            default = "//dotnet/private/sdk/runtime_packs:runtime_pack",
-            cfg = runtime_pack_transition,
-        ),
         "_allowlist_function_transition": attr.label(
             default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
         ),

diff --git a/examples/aspnetcore/BUILD.bazel b/examples/aspnetcore/BUILD.bazel
@@ -21,7 +21,6 @@ csharp_binary(
 publish_binary(
     name = "publish",
     binary = ":aspnetcore",
-    project_sdk = "web",
     self_contained = True,
     target_framework = "net6.0",
 )