From fd46cda7e7e9784d07577b99f8c537878443b569 Mon Sep 17 00:00:00 2001 From: Austin Wise Date: Sat, 6 Jan 2024 22:00:59 -0800 Subject: [PATCH 1/3] Don't include SDK in runfiles for binaries --- dotnet/repositories.bzl | 1 - 1 file changed, 1 deletion(-) diff --git a/dotnet/repositories.bzl b/dotnet/repositories.bzl index 21048c78..1869cbbd 100644 --- a/dotnet/repositories.bzl +++ b/dotnet/repositories.bzl @@ -84,7 +84,6 @@ filegroup( }}), data = glob([ "host/**/*", - "sdk/**/*", "shared/Microsoft.NETCore.App/**/*", ]), visibility = ["//visibility:public"], From 8e823f9c7fd9c20b81b0acd2230a1b08dc371b41 Mon Sep 17 00:00:00 2001 From: Austin Wise Date: Sat, 6 Jan 2024 22:23:07 -0800 Subject: [PATCH 2/3] Add back the AppHost --- dotnet/repositories.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/dotnet/repositories.bzl b/dotnet/repositories.bzl index 1869cbbd..79fdeaa9 100644 --- a/dotnet/repositories.bzl +++ b/dotnet/repositories.bzl @@ -84,6 +84,7 @@ filegroup( }}), data = glob([ "host/**/*", + "sdk/{sdk_version}/Microsoft.NET.HostModel.dll", "shared/Microsoft.NETCore.App/**/*", ]), visibility = ["//visibility:public"], From 4df7635efdf78c1fc0eb89dfe30b9b0be979fa96 Mon Sep 17 00:00:00 2001 From: Austin Wise Date: Sun, 7 Jan 2024 14:45:58 -0800 Subject: [PATCH 3/3] Maybe some SDKs don't have the HostModel DLL? --- dotnet/repositories.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dotnet/repositories.bzl b/dotnet/repositories.bzl index 79fdeaa9..028b0771 100644 --- a/dotnet/repositories.bzl +++ b/dotnet/repositories.bzl @@ -84,7 +84,7 @@ filegroup( }}), data = glob([ "host/**/*", - "sdk/{sdk_version}/Microsoft.NET.HostModel.dll", + "sdk/*/Microsoft.NET.HostModel.dll", "shared/Microsoft.NETCore.App/**/*", ]), visibility = ["//visibility:public"], @@ -123,7 +123,7 @@ filegroup( ) dotnet_toolchain( - name = "dotnet_toolchain", + name = "dotnet_toolchain", runtime = ":runtime", csharp_compiler = ":csc_binary", fsharp_compiler = ":fsc_binary",