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.

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

.NET 9preview5 #17224

Merged
merged 30 commits into from
Jun 28, 2024
Merged
Changes from 29 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
83d1961
.NET 9preview4
vzarytovskii May 22, 2024
bdeb6e2
New macos + udpated prebuilts
vzarytovskii May 22, 2024
8796001
p5 + some tests fixes
vzarytovskii Jun 18, 2024
ef4e4dc
Merge branch 'main' into net9p4
vzarytovskii Jun 18, 2024
6be852b
Update SourceBuildPrebuiltBaseline.xml
vzarytovskii Jun 18, 2024
5b754c8
Merge remote-tracking branch 'upstream/main' into net9p4
vzarytovskii Jun 19, 2024
801a3e6
Merge branch 'net9p4' of https://github.com/vzarytovskii/fsharp into …
vzarytovskii Jun 19, 2024
f51e157
fix
vzarytovskii Jun 19, 2024
8827f19
Don't use msbuild output
vzarytovskii Jun 19, 2024
0b3215c
Merge branch 'main' into net9p4
psfinaki Jun 21, 2024
93afd24
Update OperatorsModuleDynamic.fs
psfinaki Jun 21, 2024
54117e1
reverting this, will be fixed separately
psfinaki Jun 21, 2024
c8056fb
up
psfinaki Jun 21, 2024
fc20f9e
Update OperatorsModuleDynamic.fs
psfinaki Jun 24, 2024
c1455b2
Revert "Update OperatorsModuleDynamic.fs"
psfinaki Jun 24, 2024
5014bbf
Update OperatorsModuleDynamic.fs
psfinaki Jun 24, 2024
7b3cf55
Update OperatorsModuleDynamic.fs
psfinaki Jun 24, 2024
cfa359b
up
psfinaki Jun 24, 2024
8df899f
Update OperatorsModule1.fs
psfinaki Jun 24, 2024
2d75326
Update OperatorsModule2.fs
psfinaki Jun 24, 2024
229ecfb
Update OperatorsModuleDynamic.fs
psfinaki Jun 24, 2024
bdc26e9
Update OperatorsModule1.fs
psfinaki Jun 24, 2024
ec15c9d
Update OperatorsModule2.fs
psfinaki Jun 25, 2024
656ad40
Update OperatorsModule2.fs
psfinaki Jun 25, 2024
a27df0f
remove old workarond
psfinaki Jun 25, 2024
1ba5e29
Revert "remove old workarond"
psfinaki Jun 25, 2024
ce54183
Update OperatorsModule2.fs
psfinaki Jun 25, 2024
569c521
invert ifs, set up consts
psfinaki Jun 25, 2024
d929e26
comments
psfinaki Jun 25, 2024
90b5de8
Merge branch 'main' into net9p4
psfinaki Jun 28, 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
6 changes: 3 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
{
"name": "F#",
"image": "mcr.microsoft.com/dotnet/sdk:9.0.100-preview.3",
"image": "mcr.microsoft.com/dotnet/sdk:9.0.100-preview.5",
"features": {
"ghcr.io/devcontainers/features/common-utils:2.4.2": {},
"ghcr.io/devcontainers/features/common-utils:2.4.3": {},
"ghcr.io/devcontainers/features/git:1.2.0": {},
"ghcr.io/devcontainers/features/github-cli:1.0.11": {},
"ghcr.io/devcontainers/features/dotnet:2.0.5": {}
"ghcr.io/devcontainers/features/dotnet:2.1.0": {}
},
"hostRequirements": {
"cpus": 2,
2 changes: 1 addition & 1 deletion eng/Build.ps1
Original file line number Diff line number Diff line change
@@ -361,7 +361,7 @@ function TestUsingMSBuild([string] $testProject, [string] $targetFramework, [str
$testLogPath = "$ArtifactsDir\TestResults\$configuration\${projectName}_$targetFramework.xml"
$testBinLogPath = "$LogDir\${projectName}_$targetFramework.binlog"
$args = "test $testProject -c $configuration -f $targetFramework -v n --test-adapter-path $testadapterpath --logger ""nunit;LogFilePath=$testLogPath"" /bl:$testBinLogPath"
$args += " --blame --results-directory $ArtifactsDir\TestResults\$configuration"
$args += " --blame --results-directory $ArtifactsDir\TestResults\$configuration -p:vstestusemsbuildoutput=false"

if (-not $noVisualStudio -or $norestore) {
$args += " --no-restore"
12 changes: 6 additions & 6 deletions eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
@@ -9,16 +9,16 @@
These will go away when repo updates targeting to net8.0
Tracked with https://github.com/dotnet/fsharp/issues/14765
-->
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/8.0.2" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/8.0.2" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/8.0.2" />
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/8.0.*" />
psfinaki marked this conversation as resolved.
Show resolved Hide resolved
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/8.0.*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/8.0.*" />
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/7.0.0" />
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/7.0.0" />
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/7.0.0" />

<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Runtime.linux-x64/8.0.2" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/8.0.2" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Runtime.linux-x64/8.0.2" />
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Runtime.linux-x64/8.0.*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/8.0.*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Runtime.linux-x64/8.0.*" />


<!-- Tracked in https://github.com/dotnet/source-build/issues/3438 -->
2 changes: 1 addition & 1 deletion eng/build.sh
Original file line number Diff line number Diff line change
@@ -219,7 +219,7 @@ function TestUsingNUnit() {
projectname=$(basename -- "$testproject")
projectname="${projectname%.*}"
testlogpath="$artifacts_dir/TestResults/$configuration/${projectname}_$targetframework.xml"
args="test \"$testproject\" --no-restore --no-build -c $configuration -f $targetframework --test-adapter-path . --logger \"nunit;LogFilePath=$testlogpath\"$filterArgs --blame --results-directory $artifacts_dir/TestResults/$configuration"
args="test \"$testproject\" --no-restore --no-build -c $configuration -f $targetframework --test-adapter-path . --logger \"nunit;LogFilePath=$testlogpath\"$filterArgs --blame --results-directory $artifacts_dir/TestResults/$configuration -p:vstestusemsbuildoutput=false"
"$DOTNET_INSTALL_DIR/dotnet" $args || exit $?
}

4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"sdk": {
"version": "9.0.100-preview.3.24204.13",
"version": "9.0.100-preview.5.24307.3",
"allowPrerelease": true
},
"tools": {
"dotnet": "9.0.100-preview.3.24204.13",
"dotnet": "9.0.100-preview.5.24307.3",
"vs": {
"version": "17.8",
"components": [
32 changes: 24 additions & 8 deletions tests/FSharp.Core.UnitTests/FSharp.Core/OperatorsModule1.fs
Original file line number Diff line number Diff line change
@@ -3,6 +3,10 @@
// Various tests for the:
// Microsoft.FSharp.Core.Operators module

// For information on the runtime-dependent behavior differences in this file, see:
// - https://github.com/dotnet/runtime/issues/61885
// - https://github.com/dotnet/runtime/pull/97529

namespace FSharp.Core.UnitTests.Operators

open System
@@ -278,18 +282,24 @@ type OperatorsModule1() =
// Overflow
let result = Operators.byte Single.MinValue
Assert.AreEqual(0uy, result)

// Overflow
let result = Operators.byte Single.MaxValue
Assert.AreEqual(0uy, result)

if Info.isNetFramework then
Assert.AreEqual(0uy, result)
else
Assert.AreEqual(255uy, result)

// Overflow
let result = Operators.byte Double.MinValue
Assert.AreEqual(0uy, result)

// Overflow
let result = Operators.byte Double.MaxValue
Assert.AreEqual(0uy, result)
if Info.isNetFramework then
Assert.AreEqual(0uy, result)
else
Assert.AreEqual(255uy, result)

// Overflow
let result = Operators.byte (Int64.MaxValue * 8L)
@@ -343,9 +353,15 @@ type OperatorsModule1() =

// Overflow
Assert.AreEqual('\000', Operators.char Single.MinValue)
Assert.AreEqual('\000', Operators.char Double.MinValue)
Assert.AreEqual('\000', Operators.char Single.MaxValue)
Assert.AreEqual('\000', Operators.char Double.MaxValue)
if Info.isNetFramework then
Assert.AreEqual('\000', Operators.char Single.MaxValue)
else
Assert.AreEqual('\uffff', Operators.char Single.MaxValue)

if Info.isNetFramework then
Assert.AreEqual('\000', Operators.char Double.MaxValue)
else
Assert.AreEqual('\uffff', Operators.char Double.MaxValue)
CheckThrowsOverflowException(fun () -> Operators.char Decimal.MinValue |> ignore)

// string type
Loading