Skip to content

Support positional literal assembly attributes in F# builds #20551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Evangelink wants to merge 1 commit into
base: main
Choose a base branch
from
+38 −33
Open

Support positional literal assembly attributes in F# builds #20551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 27 additions & 32 deletions src/FSharp.Build/WriteCodeFragment.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,30 @@ type WriteCodeFragment() as this =

(key, value))

let isLiteralSuffix = "_IsLiteral"

let literalParameters =
parameterPairs
|> List.choose (fun (key, value) ->
if
key.EndsWith(isLiteralSuffix)
&& String.Equals(value.Raw, "true", StringComparison.OrdinalIgnoreCase)
then
Some(key.Substring(0, key.Length - isLiteralSuffix.Length))
else
None)
|> Set.ofList

let parameterPairs =
parameterPairs
|> List.filter (fun (key, _) -> not (key.EndsWith(isLiteralSuffix)))

let renderValue key value =
if Set.contains key literalParameters then
value.Raw
else
value.Escaped

let orderedParameters, namedParameters =
parameterPairs |> List.partition (fun (key, _) -> key.StartsWith("_Parameter"))

Expand All @@ -83,7 +107,7 @@ type WriteCodeFragment() as this =
let indexString = key.Substring("_Parameter".Length)

match Int32.TryParse indexString with
| (true, index) -> (index, value)
| (true, index) -> (index, renderValue key value)
| (false, _) -> failTask "Unable to parse '%s' as an index" indexString)
|> List.sortBy fst
// assign ordered parameters to array
Expand All @@ -93,43 +117,14 @@ type WriteCodeFragment() as this =
else
Array.create (List.last orderedParametersWithIndex |> fst) "null"

List.iter (fun (index, value) -> orderedParametersArray.[index - 1] <- value.Escaped) orderedParametersWithIndex
List.iter (fun (index, value) -> orderedParametersArray.[index - 1] <- value) orderedParametersWithIndex
// construct ordered parameter lists
let combinedOrderedParameters = String.Join(", ", orderedParametersArray)

let combinedNamedParameters =
// Define "_IsLiteral" suffix to match MSBuild behavior
let isLiteralSuffix = "_IsLiteral"

// Process named parameters to handle IsLiteral suffix
let processedNamedParameters =
// First identify all parameters with _IsLiteral suffix
let isLiteralParams =
namedParameters
|> List.choose (fun (key, value) ->
if key.EndsWith(isLiteralSuffix) && (value.Raw = "true" || value.Raw = "True") then
// Extract the base parameter name by removing the suffix
Some(key.Substring(0, key.Length - isLiteralSuffix.Length))
else
None)
|> Set.ofList

// Process all parameters, handling literals appropriately
namedParameters
|> List.choose (fun (key, value) ->
// Skip _IsLiteral metadata entries
if key.EndsWith(isLiteralSuffix) then
None
else
// Check if this parameter should be treated as a literal
let isLiteral = Set.contains key isLiteralParams

if isLiteral then
// For literals, use the raw value
Some(key, value.Raw)
else
// Regular parameter, use the escaped value
Some(key, value.Escaped))
|> List.map (fun (key, value) -> key, renderValue key value)
// Sort parameters alphabetically by key to match MSBuild behavior
|> List.sortBy fst

Expand Down
12 changes: 11 additions & 1 deletion tests/FSharp.Build.UnitTests/WriteCodeFragmentTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@ type WriteCodeFragmentFSharpTests() =
member _.``Escaped string parameters``() =
verifyAttribute "SomeAttribute" [("_Parameter1", "\"uno\"")] "SomeAttribute(\"\\\"uno\\\"\")"

[<Fact>]
member _.``Positional parameters with _IsLiteral suffix``() =
verifyAttribute "Microsoft.VisualStudio.TestTools.UnitTesting.Parallelize"
[
("_Parameter1", "Scope = Microsoft.VisualStudio.TestTools.UnitTesting.ExecutionScope.ClassLevel");
("_Parameter1_IsLiteral", "true");
("_Parameter2", "Workers = 0");
("_Parameter2_IsLiteral", "true")
]
"Microsoft.VisualStudio.TestTools.UnitTesting.Parallelize(Scope = Microsoft.VisualStudio.TestTools.UnitTesting.ExecutionScope.ClassLevel, Workers = 0)"

[<Fact>]
member _.``Named parameters with _IsLiteral suffix``() =
verifyAttribute "SomeAttribute" [("Bool", "true"); ("Bool_IsLiteral", "true")] "SomeAttribute(Bool = true)"
Expand Down Expand Up @@ -234,4 +245,3 @@ type WriteCodeFragmentVisualBasicTests() =
("EnumValue_IsLiteral", "true")
]
"SomeAttribute(EnumValue = System.StringComparison.OrdinalIgnoreCase)"

Loading