Skip to content

Commit

Permalink
Fix strict deps flag propagation (#304)
Browse files Browse the repository at this point in the history
  • Loading branch information
purkhusid authored Sep 2, 2022
1 parent 82f2d33 commit b436d58
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dotnet/private/rules/csharp/binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def _compile_action(ctx, tfm):
target_name = ctx.attr.name,
target_framework = tfm,
toolchain = toolchain,
strict_deps = ctx.attr.strict_deps if ctx.attr.override_strict_deps else toolchain.strict_deps,
strict_deps = ctx.attr.strict_deps if ctx.attr.override_strict_deps else toolchain.strict_deps[BuildSettingInfo].value,
include_host_model_dll = ctx.attr.include_host_model_dll,
treat_warnings_as_errors = ctx.attr.treat_warnings_as_errors if ctx.attr.override_treat_warnings_as_errors else toolchain.dotnetinfo.csharp_treat_warnings_as_errors[BuildSettingInfo].value,
warnings_as_errors = ctx.attr.warnings_as_errors if ctx.attr.override_warnings_as_errors else toolchain.dotnetinfo.csharp_warnings_as_errors[BuildSettingInfo].value,
Expand Down
2 changes: 1 addition & 1 deletion dotnet/private/rules/csharp/library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def _compile_action(ctx, tfm):
target_name = ctx.attr.name,
target_framework = tfm,
toolchain = toolchain,
strict_deps = ctx.attr.strict_deps if ctx.attr.override_strict_deps else toolchain.strict_deps,
strict_deps = ctx.attr.strict_deps if ctx.attr.override_strict_deps else toolchain.strict_deps[BuildSettingInfo].value,
include_host_model_dll = False,
treat_warnings_as_errors = ctx.attr.treat_warnings_as_errors if ctx.attr.override_treat_warnings_as_errors else toolchain.dotnetinfo.csharp_treat_warnings_as_errors[BuildSettingInfo].value,
warnings_as_errors = ctx.attr.warnings_as_errors if ctx.attr.override_warnings_as_errors else toolchain.dotnetinfo.csharp_warnings_as_errors[BuildSettingInfo].value,
Expand Down
2 changes: 1 addition & 1 deletion dotnet/private/rules/csharp/test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def _compile_action(ctx, tfm):
target_name = ctx.attr.name,
target_framework = tfm,
toolchain = toolchain,
strict_deps = ctx.attr.strict_deps if ctx.attr.override_strict_deps else toolchain.strict_deps,
strict_deps = ctx.attr.strict_deps if ctx.attr.override_strict_deps else toolchain.strict_deps[BuildSettingInfo].value,
include_host_model_dll = False,
treat_warnings_as_errors = ctx.attr.treat_warnings_as_errors if ctx.attr.override_treat_warnings_as_errors else toolchain.dotnetinfo.csharp_treat_warnings_as_errors[BuildSettingInfo].value,
warnings_as_errors = ctx.attr.warnings_as_errors if ctx.attr.override_warnings_as_errors else toolchain.dotnetinfo.csharp_warnings_as_errors[BuildSettingInfo].value,
Expand Down
2 changes: 1 addition & 1 deletion dotnet/private/rules/fsharp/binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def _compile_action(ctx, tfm):
target_name = ctx.attr.name,
target_framework = tfm,
toolchain = toolchain,
strict_deps = ctx.attr.strict_deps if ctx.attr.override_strict_deps else toolchain.strict_deps,
strict_deps = ctx.attr.strict_deps if ctx.attr.override_strict_deps else toolchain.strict_deps[BuildSettingInfo].value,
treat_warnings_as_errors = ctx.attr.treat_warnings_as_errors if ctx.attr.override_treat_warnings_as_errors else toolchain.dotnetinfo.fsharp_treat_warnings_as_errors[BuildSettingInfo].value,
warnings_as_errors = ctx.attr.warnings_as_errors if ctx.attr.override_warnings_as_errors else toolchain.dotnetinfo.fsharp_warnings_as_errors[BuildSettingInfo].value,
warnings_not_as_errors = ctx.attr.warnings_not_as_errors if ctx.attr.override_warnings_not_as_errors else toolchain.dotnetinfo.fsharp_warnings_not_as_errors[BuildSettingInfo].value,
Expand Down
2 changes: 1 addition & 1 deletion dotnet/private/rules/fsharp/library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def _compile_action(ctx, tfm):
target_name = ctx.attr.name,
target_framework = tfm,
toolchain = toolchain,
strict_deps = ctx.attr.strict_deps if ctx.attr.override_strict_deps else toolchain.strict_deps,
strict_deps = ctx.attr.strict_deps if ctx.attr.override_strict_deps else toolchain.strict_deps[BuildSettingInfo].value,
treat_warnings_as_errors = ctx.attr.treat_warnings_as_errors if ctx.attr.override_treat_warnings_as_errors else toolchain.dotnetinfo.fsharp_treat_warnings_as_errors[BuildSettingInfo].value,
warnings_as_errors = ctx.attr.warnings_as_errors if ctx.attr.override_warnings_as_errors else toolchain.dotnetinfo.fsharp_warnings_as_errors[BuildSettingInfo].value,
warnings_not_as_errors = ctx.attr.warnings_not_as_errors if ctx.attr.override_warnings_not_as_errors else toolchain.dotnetinfo.fsharp_warnings_not_as_errors[BuildSettingInfo].value,
Expand Down
2 changes: 1 addition & 1 deletion dotnet/private/rules/fsharp/test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def _compile_action(ctx, tfm):
target_name = ctx.attr.name,
target_framework = tfm,
toolchain = toolchain,
strict_deps = ctx.attr.strict_deps if ctx.attr.override_strict_deps else toolchain.strict_deps,
strict_deps = ctx.attr.strict_deps if ctx.attr.override_strict_deps else toolchain.strict_deps[BuildSettingInfo].value,
treat_warnings_as_errors = ctx.attr.treat_warnings_as_errors if ctx.attr.override_treat_warnings_as_errors else toolchain.dotnetinfo.fsharp_treat_warnings_as_errors[BuildSettingInfo].value,
warnings_as_errors = ctx.attr.warnings_as_errors if ctx.attr.override_warnings_as_errors else toolchain.dotnetinfo.fsharp_warnings_as_errors[BuildSettingInfo].value,
warnings_not_as_errors = ctx.attr.warnings_not_as_errors if ctx.attr.override_warnings_not_as_errors else toolchain.dotnetinfo.fsharp_warnings_not_as_errors[BuildSettingInfo].value,
Expand Down
3 changes: 2 additions & 1 deletion dotnet/private/rules/nuget/imports.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ load(
"transform_deps",
)
load("//dotnet/private:providers.bzl", "DotnetAssemblyInfo", "NuGetInfo")
load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")

def _import_library(ctx):
(_irefs, prefs, analyzers, libs, native, data, _private_refs, _private_analyzers, transitive_runtime_deps, _exports, _overrides) = collect_transitive_info(ctx.label.name, ctx.attr.deps, [], [], ctx.toolchains["@rules_dotnet//dotnet:toolchain_type"].strict_deps)
(_irefs, prefs, analyzers, libs, native, data, _private_refs, _private_analyzers, transitive_runtime_deps, _exports, _overrides) = collect_transitive_info(ctx.label.name, ctx.attr.deps, [], [], ctx.toolchains["@rules_dotnet//dotnet:toolchain_type"].strict_deps[BuildSettingInfo].value)

return [DotnetAssemblyInfo(
name = ctx.attr.library_name,
Expand Down

0 comments on commit b436d58

Please sign in to comment.