Skip to content

net6.0 cleanup for TP tests and test utilities - check if it can go away #18846

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

Merged
merged 5 commits into from
Aug 14, 2025
Merged

net6.0 cleanup for TP tests and test utilities - check if it can go away #18846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9666c0c
See what happens
T-Gro Aug 14, 2025
51c6769
more
T-Gro Aug 14, 2025
7befb7b
change test that needs runtime support
T-Gro Aug 14, 2025
6a49ad8
Removing test duplicate
T-Gro Aug 14, 2025
252b575
removing another duplicate
T-Gro Aug 14, 2025
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
2 changes: 1 addition & 1 deletion tests/EndToEndBuildTests/ComboProvider/ComboProvider.Tests/ComboProvider.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework Condition=" '$(TestTargetFramework)' == '' ">net6.0</TargetFramework>
<TargetFramework Condition=" '$(TestTargetFramework)' == '' ">net10.0</TargetFramework>
<TargetFramework Condition=" '$(TestTargetFramework)' != '' ">$(TestTargetFramework)</TargetFramework>
<IsPackable>false</IsPackable>
<FSharpCoreImplicitPackageVersion>$(FSharpCoreShippedPackageVersionValue)</FSharpCoreImplicitPackageVersion>
Expand Down
4 changes: 2 additions & 2 deletions tests/EndToEndBuildTests/ComboProvider/ComboProvider/ComboProvider.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
<TargetFrameworks>net10.0;net472</TargetFrameworks>
<FSharpCoreImplicitPackageVersion>$(FSharpCoreShippedPackageVersionValue)</FSharpCoreImplicitPackageVersion>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
<TargetFrameworks>net10.0;net472</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions tests/EndToEndBuildTests/ComboProvider/TestComboProvider.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuratio
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net472 -p:FSharpTestCompilerVersion=net40
if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure

echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net6.0 -p:FSharpTestCompilerVersion=coreclr
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net6.0 -p:FSharpTestCompilerVersion=coreclr
echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net10.0 -p:FSharpTestCompilerVersion=coreclr
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net10.0 -p:FSharpTestCompilerVersion=coreclr
if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure

rem
Expand All @@ -60,8 +60,8 @@ echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuratio
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net472 -p:FSharpTestCompilerVersion=net40
if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure

echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -v %configuration% -p:TestTargetFramework=net6.0 -p:FSharpTestCompilerVersion=coreclr
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net6.0 -p:FSharpTestCompilerVersion=coreclr
echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -v %configuration% -p:TestTargetFramework=net10.0 -p:FSharpTestCompilerVersion=coreclr
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net10.0 -p:FSharpTestCompilerVersion=coreclr
if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure

:success
Expand Down
2 changes: 1 addition & 1 deletion tests/FSharp.Compiler.ComponentTests/EmittedIL/ByRefTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ type MyClass() =
"""

let csCmpl =
CompilationUtil.CreateCSharpCompilation(cs, CSharpLanguageVersion.CSharp8, TargetFramework.NetCoreApp31)
CompilationUtil.CreateCSharpCompilation(cs, CSharpLanguageVersion.CSharp8, TargetFramework.Current)
|> CompilationReference.Create

let fsCmpl =
Expand Down
32 changes: 5 additions & 27 deletions tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,31 +107,9 @@
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\mscorlib.dll" LogicalName="net6.01.mscorlib.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\System.dll" LogicalName="net6.01.System.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\System.Core.dll" LogicalName="net6.01.System.Core.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\System.Console.dll" LogicalName="net6.01.System.Console.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\System.Runtime.dll" LogicalName="net6.01.System.Runtime.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\System.Dynamic.Runtime.dll" LogicalName="net6.01.System.Runtime.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\netstandard.dll" LogicalName="net6.01.netstandard.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="$(PkgSystem_Collections_Immutable)\lib\netstandard2.0\System.Collections.Immutable.dll" LogicalName="netstandard2.0.System.Collections.Immutable.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="$(PkgSystem_Collections_Immutable)\lib\netstandard2.0\System.Collections.Immutable.dll" LogicalName="netstandard2.0.System.Collections.Immutable.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
</Project>
37 changes: 0 additions & 37 deletions tests/FSharp.Test.Utilities/Utilities.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ module Utilities =
[<RequireQualifiedAccess>]
type TargetFramework =
| NetStandard20
| NetCoreApp31
| Current

let private getResourceStream name =
Expand Down Expand Up @@ -110,31 +109,6 @@ module Utilities =
let systemDynamicRuntimeRef = lazy AssemblyMetadata.CreateFromImage(TestResources.NetFX.netstandard20.System_Dynamic_Runtime).GetReference(display = "System.Dynamic.Runtime.dll (netstandard 2.0 ref)")
let systemCollectionsImmutableRef = lazy AssemblyMetadata.CreateFromImage(System_Collections_Immutable.Force()).GetReference(display = "System.Collections.Immutable.dll (netstandard 2.0 ref)")

[<RequireQualifiedAccess>]
module NetCoreApp31 =
let private mscorlib = lazy getResourceBlob "mscorlib.dll"
let private netstandard = lazy getResourceBlob "netstandard.dll"
let private System_Console = lazy getResourceBlob "System.Console.dll"
let private System_Core = lazy getResourceBlob "System.Core.dll"
let private System_Dynamic_Runtime = lazy getResourceBlob "System.Dynamic.Runtime.dll"
let private System_Runtime = lazy getResourceBlob "System.Runtime.dll"

module Files =
let mscorlib = lazy writeToTempDirectory "mscorlib" (mscorlib.Force())
let netStandard = lazy writeToTempDirectory "netstandard" (netstandard.Force())
let systemConsole = lazy writeToTempDirectory "System.Console" (System_Console.Force())
let systemCore = lazy writeToTempDirectory "System.Core" (System_Core.Force())
let systemDynamicRuntime = lazy writeToTempDirectory "System.Dynamic.Runtime" (System_Dynamic_Runtime.Force())
let systemRuntime = lazy writeToTempDirectory "System.Runtime" (System_Runtime.Force())

module References =
let netStandardRef = lazy AssemblyMetadata.CreateFromImage(netstandard.Force()).GetReference(display = "netstandard.dll (netcoreapp 3.1 ref)")
let mscorlibRef = lazy AssemblyMetadata.CreateFromImage(mscorlib.Force()).GetReference(display = "mscorlib.dll (netcoreapp 3.1 ref)")
let systemConsoleRef = lazy AssemblyMetadata.CreateFromImage(System_Console.Force()).GetReference(display = "System.Console.dll (netcoreapp 3.1 ref)")
let systemCoreRef = lazy AssemblyMetadata.CreateFromImage(System_Core.Force()).GetReference(display = "System.Core.dll (netcoreapp 3.1 ref)")
let systemDynamicRuntimeRef = lazy AssemblyMetadata.CreateFromImage(System_Dynamic_Runtime.Force()).GetReference(display = "System.Dynamic.Runtime.dll (netcoreapp 3.1 ref)")
let systemRuntimeRef = lazy AssemblyMetadata.CreateFromImage(System_Runtime.Force ()).GetReference(display = "System.Runtime.dll (netcoreapp 3.1 ref)")

[<RequireQualifiedAccess>]
module public TargetFrameworkUtil =

Expand Down Expand Up @@ -266,15 +240,6 @@ An error occurred getting netcoreapp references (compare the output of `dotnet -
NetStandard20.References.systemDynamicRuntimeRef.Value,
NetStandard20.References.systemCollectionsImmutableRef.Value)

let private netCoreApp31References =
lazy ImmutableArray.Create(
NetCoreApp31.References.netStandardRef.Value,
NetCoreApp31.References.mscorlibRef.Value,
NetCoreApp31.References.systemRuntimeRef.Value,
NetCoreApp31.References.systemCoreRef.Value,
NetCoreApp31.References.systemDynamicRuntimeRef.Value,
NetCoreApp31.References.systemConsoleRef.Value)

let currentReferences =
getNetCoreAppReferences

Expand All @@ -286,13 +251,11 @@ An error occurred getting netcoreapp references (compare the output of `dotnet -
let getReferences tf =
match tf with
| TargetFramework.NetStandard20 -> netStandard20References.Value
| TargetFramework.NetCoreApp31 -> netCoreApp31References.Value
| TargetFramework.Current -> currentReferencesAsPEs

let getFileReferences tf =
match tf with
| TargetFramework.NetStandard20 -> netStandard20Files.Value |> Seq.toArray
| TargetFramework.NetCoreApp31 -> [||] //ToDo --- Perhaps NetCoreApp31Files
| TargetFramework.Current -> currentReferences


Expand Down
Loading
Loading