define @net//:StandardReferences

csharp/private/actions/assembly.bzl

@@ -109,7 +109,7 @@ def AssemblyAction(
     args.add("/pdb:" + pdb.path)
 
     # assembly references
-    (refs, runfiles) = collect_transitive_info(deps, target_framework)
+    (refs, runfiles, native_dlls) = collect_transitive_info(deps, target_framework)
     args.add_all(refs, map_each = _format_ref_arg)
 
     # analyzers
@@ -165,7 +165,7 @@ def AssemblyAction(
         progress_message = "Compiling " + name,
         inputs = depset(
             direct = direct_inputs,
-            transitive = [refs],
+            transitive = [refs] + [native_dlls],
         ),
         outputs = [out_file, refout, pdb],
         executable = toolchain.runtime,
@@ -183,6 +183,7 @@ def AssemblyAction(
         out = out_file,
         refout = refout,
         pdb = pdb,
+        native_dlls = native_dlls,
         deps = deps,
         transitive_refs = refs,
         transitive_runfiles = runfiles,

csharp/private/common.bzl

@@ -21,6 +21,7 @@ def collect_transitive_info(deps, tfm):
     transitive_refs = []
     direct_runfiles = []
     transitive_runfiles = []
+    native_dlls = []
 
     provider = CSharpAssembly[tfm]
 
@@ -44,10 +45,12 @@ def collect_transitive_info(deps, tfm):
             direct_runfiles.append(assembly.pdb)
 
         transitive_runfiles.append(assembly.transitive_runfiles)
+        native_dlls.append(assembly.native_dlls)
 
     return (
         depset(direct = direct_refs, transitive = transitive_refs),
         depset(direct = direct_runfiles, transitive = transitive_runfiles),
+        depset(transitive = native_dlls),
     )
 
 def _get_provided_by_netstandard(providerInfo):
@@ -80,11 +83,12 @@ def fill_in_missing_frameworks(providers):
         # newer netstandard will be preferred, if applicable
         for (base, compatible_tfm) in sorted([(providers[compatible_tfm], compatible_tfm) for compatible_tfm in FrameworkCompatibility[tfm] if compatible_tfm in providers], key=_get_provided_by_netstandard):
             # Copy the output from the compatible tfm, re-resolving the deps
-            (refs, runfiles) = collect_transitive_info(base.deps, tfm)
+            (refs, runfiles, native_dlls) = collect_transitive_info(base.deps, tfm)
             providers[tfm] = CSharpAssembly[tfm](
                 out = base.out,
                 refout = base.refout,
                 pdb = base.pdb,
+                native_dlls = native_dlls,
                 deps = base.deps,
                 transitive_refs = refs,
                 transitive_runfiles = runfiles,

csharp/private/frameworks/net20.BUILD

@@ -1,7 +1,20 @@
 # This file was generated by build\src\D2L.Build.BazelGenerator\FrameworkBuildGenerator\GenerateFrameworkBuildFile.cs
 # Don't edit it by hand! You should regenerate this if the .NET package gets updated.
 
-load("@d2l_rules_csharp//csharp:defs.bzl", "import_library")
+load("@d2l_rules_csharp//csharp:defs.bzl", "import_library", "csharp_library_set")
+
+csharp_library_set(
+    name = "StandardReferences",
+    target_framework = "net20",
+    deps = [
+        "//:mscorlib",
+        "//:System",
+        "//:System.Data",
+        "//:System.Drawing",
+        "//:System.Xml",
+    ],
+    visibility = ["@net//:__pkg__"],
+)
 
 import_library(
     name = "Accessibility",
@@ -453,6 +466,9 @@ import_library(
     name = "System.EnterpriseServices-noncyclic",
     target_framework = "net20",
     refdll = "//:build/.NETFramework/v2.0/System.EnterpriseServices.dll",
+    native_dlls = [
+        "//:build/.NETFramework/v2.0/System.EnterpriseServices.Wrapper.dll",
+    ],
     deps = [
         "//:Microsoft.VisualC",
         "//:mscorlib",

csharp/private/frameworks/net40.BUILD

@@ -1,7 +1,24 @@
 # This file was generated by build\src\D2L.Build.BazelGenerator\FrameworkBuildGenerator\GenerateFrameworkBuildFile.cs
 # Don't edit it by hand! You should regenerate this if the .NET package gets updated.
 
-load("@d2l_rules_csharp//csharp:defs.bzl", "import_library")
+load("@d2l_rules_csharp//csharp:defs.bzl", "import_library", "csharp_library_set")
+
+csharp_library_set(
+    name = "StandardReferences",
+    target_framework = "net40",
+    deps = [
+        "//:mscorlib",
+        "//:System",
+        "//:System.Core",
+        "//:System.Data",
+        "//:System.Drawing",
+        "//:System.Numerics",
+        "//:System.Runtime.Serialization",
+        "//:System.Xml",
+        "//:System.Xml.Linq",
+    ],
+    visibility = ["@net//:__pkg__"]
+)
 
 import_library(
     name = "Accessibility",
@@ -869,6 +886,9 @@ import_library(
     name = "System.EnterpriseServices-noncyclic",
     target_framework = "net40",
     refdll = "//:build/.NETFramework/v4.0/System.EnterpriseServices.dll",
+    native_dlls = [
+        "//:build/.NETFramework/v4.0/System.EnterpriseServices.Wrapper.dll",
+    ],
     deps = [
         "//:Microsoft.VisualC",
         "//:mscorlib",

csharp/private/frameworks/net45.BUILD

@@ -1,7 +1,25 @@
 # This file was generated by build\src\D2L.Build.BazelGenerator\FrameworkBuildGenerator\GenerateFrameworkBuildFile.cs
 # Don't edit it by hand! You should regenerate this if the .NET package gets updated.
 
-load("@d2l_rules_csharp//csharp:defs.bzl", "import_library")
+load("@d2l_rules_csharp//csharp:defs.bzl", "import_library", "csharp_library_set")
+
+csharp_library_set(
+    name = "StandardReferences",
+    target_framework = "net45",
+    deps = [
+        "//:mscorlib",
+        "//:System",
+        "//:System.Core",
+        "//:System.Data",
+        "//:System.Drawing",
+        "//:System.IO.Compression.FileSystem",
+        "//:System.Numerics",
+        "//:System.Runtime.Serialization",
+        "//:System.Xml",
+        "//:System.Xml.Linq",
+    ],
+    visibility = ["@net//:__pkg__"],
+)
 
 import_library(
     name = "Accessibility",
@@ -1032,6 +1050,9 @@ import_library(
     name = "System.EnterpriseServices-noncyclic",
     target_framework = "net45",
     refdll = "//:build/.NETFramework/v4.5/System.EnterpriseServices.dll",
+    native_dlls = [
+        "//:build/.NETFramework/v4.5/System.EnterpriseServices.Wrapper.dll",
+    ],
     deps = [
         "//:mscorlib",
         "//:System",

csharp/private/frameworks/net451.BUILD

@@ -1,7 +1,25 @@
 # This file was generated by build\src\D2L.Build.BazelGenerator\FrameworkBuildGenerator\GenerateFrameworkBuildFile.cs
 # Don't edit it by hand! You should regenerate this if the .NET package gets updated.
 
-load("@d2l_rules_csharp//csharp:defs.bzl", "import_library")
+load("@d2l_rules_csharp//csharp:defs.bzl", "import_library", "csharp_library_set")
+
+csharp_library_set(
+    name = "StandardReferences",
+    target_framework = "net451",
+    deps = [
+        "//:mscorlib",
+        "//:System",
+        "//:System.Core",
+        "//:System.Data",
+        "//:System.Drawing",
+        "//:System.IO.Compression.FileSystem",
+        "//:System.Numerics",
+        "//:System.Runtime.Serialization",
+        "//:System.Xml",
+        "//:System.Xml.Linq",
+    ],
+    visibility = ["@net//:__pkg__"],
+)
 
 import_library(
     name = "Accessibility",
@@ -1033,6 +1051,9 @@ import_library(
     name = "System.EnterpriseServices-noncyclic",
     target_framework = "net451",
     refdll = "//:build/.NETFramework/v4.5.1/System.EnterpriseServices.dll",
+    native_dlls = [
+        "//:build/.NETFramework/v4.5.1/System.EnterpriseServices.Wrapper.dll",
+    ],
     deps = [
         "//:mscorlib",
         "//:System",

csharp/private/frameworks/net452.BUILD

@@ -1,7 +1,25 @@
 # This file was generated by build\src\D2L.Build.BazelGenerator\FrameworkBuildGenerator\GenerateFrameworkBuildFile.cs
 # Don't edit it by hand! You should regenerate this if the .NET package gets updated.
 
-load("@d2l_rules_csharp//csharp:defs.bzl", "import_library")
+load("@d2l_rules_csharp//csharp:defs.bzl", "import_library", "csharp_library_set")
+
+csharp_library_set(
+    name = "StandardReferences",
+    target_framework = "net452",
+    deps = [
+        "//:mscorlib",
+        "//:System",
+        "//:System.Core",
+        "//:System.Data",
+        "//:System.Drawing",
+        "//:System.IO.Compression.FileSystem",
+        "//:System.Numerics",
+        "//:System.Runtime.Serialization",
+        "//:System.Xml",
+        "//:System.Xml.Linq",
+    ],
+    visibility = ["@net//:__pkg__"],
+)
 
 import_library(
     name = "Accessibility",
@@ -1034,6 +1052,9 @@ import_library(
     name = "System.EnterpriseServices-noncyclic",
     target_framework = "net452",
     refdll = "//:build/.NETFramework/v4.5.2/System.EnterpriseServices.dll",
+    native_dlls = [
+        "//:build/.NETFramework/v4.5.2/System.EnterpriseServices.Wrapper.dll",
+    ],
     deps = [
         "//:mscorlib",
         "//:System",

csharp/private/frameworks/net46.BUILD

@@ -1,7 +1,25 @@
 # This file was generated by build\src\D2L.Build.BazelGenerator\FrameworkBuildGenerator\GenerateFrameworkBuildFile.cs
 # Don't edit it by hand! You should regenerate this if the .NET package gets updated.
 
-load("@d2l_rules_csharp//csharp:defs.bzl", "import_library")
+load("@d2l_rules_csharp//csharp:defs.bzl", "import_library", "csharp_library_set")
+
+csharp_library_set(
+    name = "StandardReferences",
+    target_framework = "net46",
+    deps = [
+        "//:mscorlib",
+        "//:System",
+        "//:System.Core",
+        "//:System.Data",
+        "//:System.Drawing",
+        "//:System.IO.Compression.FileSystem",
+        "//:System.Numerics",
+        "//:System.Runtime.Serialization",
+        "//:System.Xml",
+        "//:System.Xml.Linq",
+    ],
+    visibility = ["@net//:__pkg__"],
+)
 
 import_library(
     name = "Accessibility",
@@ -1053,6 +1071,9 @@ import_library(
     name = "System.EnterpriseServices-noncyclic",
     target_framework = "net46",
     refdll = "//:build/.NETFramework/v4.6/System.EnterpriseServices.dll",
+    native_dlls = [
+        "//:build/.NETFramework/v4.6/System.EnterpriseServices.Wrapper.dll",
+    ],
     deps = [
         "//:mscorlib",
         "//:System",

csharp/private/frameworks/net461.BUILD

@@ -1,7 +1,25 @@
 # This file was generated by build\src\D2L.Build.BazelGenerator\FrameworkBuildGenerator\GenerateFrameworkBuildFile.cs
 # Don't edit it by hand! You should regenerate this if the .NET package gets updated.
 
-load("@d2l_rules_csharp//csharp:defs.bzl", "import_library")
+load("@d2l_rules_csharp//csharp:defs.bzl", "import_library", "csharp_library_set")
+
+csharp_library_set(
+    name = "StandardReferences",
+    target_framework = "net461",
+    deps = [
+        "//:mscorlib",
+        "//:System",
+        "//:System.Core",
+        "//:System.Data",
+        "//:System.Drawing",
+        "//:System.IO.Compression.FileSystem",
+        "//:System.Numerics",
+        "//:System.Runtime.Serialization",
+        "//:System.Xml",
+        "//:System.Xml.Linq",
+    ],
+    visibility = ["@net//:__pkg__"],
+)
 
 import_library(
     name = "Accessibility",
@@ -1054,6 +1072,9 @@ import_library(
     name = "System.EnterpriseServices-noncyclic",
     target_framework = "net461",
     refdll = "//:build/.NETFramework/v4.6.1/System.EnterpriseServices.dll",
+    native_dlls = [
+        "//:build/.NETFramework/v4.6.1/System.EnterpriseServices.Wrapper.dll",
+    ],
     deps = [
         "//:mscorlib",
         "//:System",

csharp/private/frameworks/net462.BUILD

@@ -1,7 +1,25 @@
 # This file was generated by build\src\D2L.Build.BazelGenerator\FrameworkBuildGenerator\GenerateFrameworkBuildFile.cs
 # Don't edit it by hand! You should regenerate this if the .NET package gets updated.
 
-load("@d2l_rules_csharp//csharp:defs.bzl", "import_library")
+load("@d2l_rules_csharp//csharp:defs.bzl", "import_library", "csharp_library_set")
+
+csharp_library_set(
+    name = "StandardReferences",
+    target_framework = "net462",
+    deps = [
+        "//:mscorlib",
+        "//:System",
+        "//:System.Core",
+        "//:System.Data",
+        "//:System.Drawing",
+        "//:System.IO.Compression.FileSystem",
+        "//:System.Numerics",
+        "//:System.Runtime.Serialization",
+        "//:System.Xml",
+        "//:System.Xml.Linq",
+    ],
+    visibility = ["@net//:__pkg__"],
+)
 
 import_library(
     name = "Accessibility",
@@ -1055,6 +1073,9 @@ import_library(
     name = "System.EnterpriseServices-noncyclic",
     target_framework = "net462",
     refdll = "//:build/.NETFramework/v4.6.2/System.EnterpriseServices.dll",
+    native_dlls = [
+        "//:build/.NETFramework/v4.6.2/System.EnterpriseServices.Wrapper.dll",
+    ],
     deps = [
         "//:mscorlib",
         "//:System",

csharp/private/frameworks/net47.BUILD

@@ -1,7 +1,25 @@
 # This file was generated by build\src\D2L.Build.BazelGenerator\FrameworkBuildGenerator\GenerateFrameworkBuildFile.cs
 # Don't edit it by hand! You should regenerate this if the .NET package gets updated.
 
-load("@d2l_rules_csharp//csharp:defs.bzl", "import_library")
+load("@d2l_rules_csharp//csharp:defs.bzl", "import_library", "csharp_library_set")
+
+csharp_library_set(
+    name = "StandardReferences",
+    target_framework = "net47",
+    deps = [
+        "//:mscorlib",
+        "//:System",
+        "//:System.Core",
+        "//:System.Data",
+        "//:System.Drawing",
+        "//:System.IO.Compression.FileSystem",
+        "//:System.Numerics",
+        "//:System.Runtime.Serialization",
+        "//:System.Xml",
+        "//:System.Xml.Linq",
+    ],
+    visibility = ["@net//:__pkg__"],
+)
 
 import_library(
     name = "Accessibility",
@@ -1055,6 +1073,9 @@ import_library(
     name = "System.EnterpriseServices-noncyclic",
     target_framework = "net47",
     refdll = "//:build/.NETFramework/v4.7/System.EnterpriseServices.dll",
+    native_dlls = [
+        "//:build/.NETFramework/v4.7/System.EnterpriseServices.Wrapper.dll",
+    ],
     deps = [
         "//:mscorlib",
         "//:System",