Skip to content
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

Merge release/dev17.11 to release/dev17.12 #18105

Open
wants to merge 8 commits into
base: release/dev17.12
Choose a base branch
from
Open

Merge release/dev17.11 to release/dev17.12 #18105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e9ac555
Backport to dev17.11 - Bugfix extension method in dotnet interactive…
T-Gro Sep 27, 2024
05af489
[release/dev17.11] Update dependencies from dotnet/arcade (#17810)
dotnet-maestro[bot] Sep 27, 2024
8904b38
Requires tactics Approval: Restore the ability to identify CompileBe…
KevinRansom Oct 7, 2024
e6310fc
[release/dev17.11] Update dependencies from dotnet/arcade (#17853)
dotnet-maestro[bot] Oct 23, 2024
2456fc2
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 26, 2024
e11d707
Merge pull request #17928 from dotnet/darc-release/dev17.11-561e7d9b-…
KevinRansom Oct 27, 2024
42efe9a
align with 17.12
vzarytovskii Dec 10, 2024
f0fad40
align with 17.12
vzarytovskii Dec 10, 2024
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
1 change: 1 addition & 0 deletions src/Compiler/AbstractIL/ilread.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2148,6 +2148,7 @@ and typeDefReader ctxtH : ILTypeDefStored =
ctxt.fileName.EndsWith("System.Runtime.dll")
|| ctxt.fileName.EndsWith("mscorlib.dll")
|| ctxt.fileName.EndsWith("netstandard.dll")
|| ctxt.fileName.EndsWith("System.Private.CoreLib.dll")

while attrIdx <= attrsEndIdx && not containsExtensionMethods do
let mutable addr = ctxt.rowAddr TableNames.CustomAttribute attrIdx
Expand Down
16 changes: 16 additions & 0 deletions tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,22 @@ tInput.Length
let value = opt.Value
Assert.Equal(4L, downcast value.ReflectionValue)

[<FSharp.Test.FactForNETCOREAPP>] // usessdkrefs is not a valid option for desktop compiler
member _.``ML - use assembly with ref dependencies and without refing SMemory``() =
let code = """
#r "nuget:Microsoft.ML.OnnxTransformer,1.4.0"

open System
open System.Numerics.Tensors
let inputValues = [| 12.0; 10.0; 17.0; 5.0 |]
let tInput = new DenseTensor<float>(inputValues.AsMemory(), new ReadOnlySpan<int>([|4|]))
tInput.Length
"""
use script = new FSharpScript(additionalArgs=[| "/usesdkrefs-" |])
let opt = script.Eval(code) |> getValue
let value = opt.Value
Assert.Equal(4L, downcast value.ReflectionValue)

[<Fact>]
member _.``System.Device.Gpio - Ensure we reference the runtime version of the assembly``() =
let code = """
Expand Down
Loading