Targeting fixes (#470)

* nuget_archive: Fall back to netstandard TFMs for cor and netfx

Without this change, the following scenario fails:

- csharp_library rule targets net8.0 + depends on 3rd-party package
- 3rd-party package has targets ["net9.0", "netstandard2.0"]

In this case, MSBuild will fall back to netstandard2.0. This change
replicates that behavior.

* nuget_repo: Ensure different versions in repo have unique TPO/frameworks

dotnet.targeting_packs.bzl contains a nuget_repo declaration for the
different targeting packs available on different .NET versions. However,
when generating the repo, the latter versions would silently override
the former versions' targeting_pack_overrides and framework_list, and
thus older versions like microsoft.aspnetcore.app.ref.v8.0.11 would have
targeting_pack_overrides containing version 9.0.0 and such.

This change ensures that different packages within the same repo do not
clobber each other's parameters.

Author: sin-ack

dotnet/private/rules/nuget/nuget_archive.bzl

@@ -611,14 +611,20 @@ def tfm_filegroup(name, tfms):
         if net:
             native.alias(
                 name = "%s_net" % name,
-                actual = select({"@rules_dotnet//dotnet:tfm_%s" % tfm: target for (tfm, target) in net}),
+                actual = select(
+                    {"@rules_dotnet//dotnet:tfm_%s" % tfm: target for (tfm, target) in net} |
+                    {"//conditions:default": ":%s_std" % name},
+                ),
                 visibility = ["//visibility:public"],
             )
 
         if cor:
             native.alias(
                 name = "%s_cor" % name,
-                actual = select({"@rules_dotnet//dotnet:tfm_%s" % tfm: target for (tfm, target) in cor}),
+                actual = select(
+                    {"@rules_dotnet//dotnet:tfm_%s" % tfm: target for (tfm, target) in cor} |
+                    {"//conditions:default": ":%s_std" % name},
+                ),
                 visibility = ["//visibility:public"],
             )
 

dotnet/private/rules/nuget/nuget_repo.bzl

@@ -20,8 +20,8 @@ def _nuget_repo_impl(ctx):
         sha512 = package["sha512"]
         deps = package["dependencies"]
 
-        targeting_pack_overrides = ctx.attr.targeting_pack_overrides[id.lower()]
-        framework_list = ctx.attr.framework_list[id.lower()]
+        targeting_pack_overrides = ctx.attr.targeting_pack_overrides["{}|{}".format(id.lower(), version)]
+        framework_list = ctx.attr.framework_list["{}|{}".format(id.lower(), version)]
 
         ctx.template("{}/{}/BUILD.bazel".format(id.lower(), version), ctx.attr._template, {
             "{PREFIX}": _GLOBAL_NUGET_PREFIX,
@@ -90,6 +90,6 @@ def nuget_repo(name, packages):
         name = name,
         repo_name = name,
         packages = [json.encode(package) for package in packages],
-        targeting_pack_overrides = {"{}".format(package["id"].lower()): package["targeting_pack_overrides"] for package in packages},
-        framework_list = {"{}".format(package["id"].lower()): package["framework_list"] for package in packages},
+        targeting_pack_overrides = {"{}|{}".format(package["id"].lower(), package["version"]): package["targeting_pack_overrides"] for package in packages},
+        framework_list = {"{}|{}".format(package["id"].lower(), package["version"]): package["framework_list"] for package in packages},
     )

dotnet/private/tests/nuget_structure/common.bzl

@@ -100,6 +100,50 @@ nuget_structure_test = analysistest.make(
     },
 )
 
+def _nuget_targeting_pack_overrides_test_impl(ctx):
+    env = analysistest.begin(ctx)
+
+    target_under_test = analysistest.target_under_test(env)
+    nuget_provider = target_under_test[NuGetInfo]
+
+    targeting_pack_overrides = nuget_provider.targeting_pack_overrides
+    asserts.true(
+        env,
+        sorted(ctx.attr.expected_targeting_pack_overrides) == sorted(targeting_pack_overrides),
+        "\nExpected targeting_pack_overrides:\n{}\nActual targeting_pack_overrides:\n{}".format(ctx.attr.expected_targeting_pack_overrides, targeting_pack_overrides),
+    )
+
+    return analysistest.end(env)
+
+nuget_targeting_pack_overrides_test = analysistest.make(
+    _nuget_targeting_pack_overrides_test_impl,
+    attrs = {
+        "expected_targeting_pack_overrides": attr.string_dict(default = {}),
+    },
+)
+
+def _nuget_framework_list_test_impl(ctx):
+    env = analysistest.begin(ctx)
+
+    target_under_test = analysistest.target_under_test(env)
+    nuget_provider = target_under_test[NuGetInfo]
+
+    framework_list = nuget_provider.framework_list
+    asserts.true(
+        env,
+        sorted(ctx.attr.expected_framework_list) == sorted(framework_list),
+        "\nExpected framework_list:\n{}\nActual framework_list:\n{}".format(ctx.attr.expected_framework_list, framework_list),
+    )
+
+    return analysistest.end(env)
+
+nuget_framework_list_test = analysistest.make(
+    _nuget_framework_list_test_impl,
+    attrs = {
+        "expected_framework_list": attr.string_dict(default = {}),
+    },
+)
+
 def _nuget_test_wrapper(ctx):
     return [ctx.attr.package[0][DotnetAssemblyCompileInfo], ctx.attr.package[0][DotnetAssemblyRuntimeInfo], ctx.attr.package[0][NuGetInfo]]
 

dotnet/private/tests/nuget_structure/targetingpacks.bzl

@@ -29,5 +29,9 @@ csharp_library(
     srcs = ["lib.cs"],
     internals_visible_to = ["lib_test"],
     target_frameworks = ["net8.0"],
-    deps = [],
+    deps = [
+        # This package only supports net9.0 and netstandard2.0 TFMs.
+        # rules_dotnet should be able to fall back to netstandard2.0.
+        "@paket.main//microsoft.net.stringtools",
+    ],
 )

e2e/net8.0/basic_csharp/BUILD.bazel

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "8.0.0",
+      "version": "9.0.2",
       "commands": ["paket"]
     }
   }

e2e/net8.0/dotnet-tools.json

@@ -4,3 +4,5 @@ source https://api.nuget.org/v3/index.json
 
 nuget FSharp.Core 8.0.100
 nuget Microsoft.NETCore.App.Ref 8.0.0
+# Used for testing of the .NET Standard fallback.
+nuget Microsoft.NET.StringTools 17.13.9

e2e/net8.0/paket.dependencies

@@ -3,4 +3,9 @@ RESTRICTION: == net8.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
     FSharp.Core (8.0.100)
+    Microsoft.NET.StringTools (17.13.9)
+      System.Memory (>= 4.5.5)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
     Microsoft.NETCore.App.Ref (8.0)
+    System.Memory (4.6)
+    System.Runtime.CompilerServices.Unsafe (6.1)