Skip to content

Commit 616530c

Browse files
T-GroT-Gro
authored
net6.0 + netcoreapp31 cleanup for TP tests and test utilities - check if it can go away (#18846)
1 parent a3e663d commit 616530c

File tree

11 files changed

+92
-254
lines changed

11 files changed

+92
-254
lines changed

‎tests/EndToEndBuildTests/ComboProvider/ComboProvider.Tests/ComboProvider.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework Condition=" '$(TestTargetFramework)' == '' ">net6.0</TargetFramework>
5+
<TargetFramework Condition=" '$(TestTargetFramework)' == '' ">net10.0</TargetFramework>
66
<TargetFramework Condition=" '$(TestTargetFramework)' != '' ">$(TestTargetFramework)</TargetFramework>
77
<IsPackable>false</IsPackable>
88
<FSharpCoreImplicitPackageVersion>$(FSharpCoreShippedPackageVersionValue)</FSharpCoreImplicitPackageVersion>

‎tests/EndToEndBuildTests/ComboProvider/ComboProvider/ComboProvider.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFrameworks>net6.0;net472</TargetFrameworks>
5+
<TargetFrameworks>net10.0;net472</TargetFrameworks>
66
<FSharpCoreImplicitPackageVersion>$(FSharpCoreShippedPackageVersionValue)</FSharpCoreImplicitPackageVersion>
7-
<TargetFrameworks>net6.0;net472</TargetFrameworks>
7+
<TargetFrameworks>net10.0;net472</TargetFrameworks>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎tests/EndToEndBuildTests/ComboProvider/TestComboProvider.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ echo dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuratio
4242
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net472 -p:FSharpTestCompilerVersion=net40
4343
if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure
4444

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

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

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

6767
:success

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ByRefTests.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ type MyClass() =
229229
"""
230230

231231
let csCmpl =
232-
CompilationUtil.CreateCSharpCompilation(cs, CSharpLanguageVersion.CSharp8, TargetFramework.NetCoreApp31)
232+
CompilationUtil.CreateCSharpCompilation(cs, CSharpLanguageVersion.CSharp8, TargetFramework.Current)
233233
|> CompilationReference.Create
234234

235235
let fsCmpl =

‎tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -107,31 +107,9 @@
107107
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
108108
</ItemGroup>
109109

110-
<ItemGroup>
111-
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\mscorlib.dll" LogicalName="net6.01.mscorlib.dll">
112-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
113-
</EmbeddedResource>
114-
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\System.dll" LogicalName="net6.01.System.dll">
115-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
116-
</EmbeddedResource>
117-
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\System.Core.dll" LogicalName="net6.01.System.Core.dll">
118-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
119-
</EmbeddedResource>
120-
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\System.Console.dll" LogicalName="net6.01.System.Console.dll">
121-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
122-
</EmbeddedResource>
123-
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\System.Runtime.dll" LogicalName="net6.01.System.Runtime.dll">
124-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
125-
</EmbeddedResource>
126-
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\System.Dynamic.Runtime.dll" LogicalName="net6.01.System.Runtime.dll">
127-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
128-
</EmbeddedResource>
129-
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_App_Ref)\ref\net6.0\netstandard.dll" LogicalName="net6.01.netstandard.dll">
130-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
131-
</EmbeddedResource>
132-
<EmbeddedResource Include="$(PkgSystem_Collections_Immutable)\lib\netstandard2.0\System.Collections.Immutable.dll" LogicalName="netstandard2.0.System.Collections.Immutable.dll">
133-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
134-
</EmbeddedResource>
135-
</ItemGroup>
136-
110+
<ItemGroup>
111+
<EmbeddedResource Include="$(PkgSystem_Collections_Immutable)\lib\netstandard2.0\System.Collections.Immutable.dll" LogicalName="netstandard2.0.System.Collections.Immutable.dll">
112+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
113+
</EmbeddedResource>
114+
</ItemGroup>
137115
</Project>

‎tests/FSharp.Test.Utilities/Utilities.fs

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ module Utilities =
5858
[<RequireQualifiedAccess>]
5959
type TargetFramework =
6060
| NetStandard20
61-
| NetCoreApp31
6261
| Current
6362

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

113-
[<RequireQualifiedAccess>]
114-
module NetCoreApp31 =
115-
let private mscorlib = lazy getResourceBlob "mscorlib.dll"
116-
let private netstandard = lazy getResourceBlob "netstandard.dll"
117-
let private System_Console = lazy getResourceBlob "System.Console.dll"
118-
let private System_Core = lazy getResourceBlob "System.Core.dll"
119-
let private System_Dynamic_Runtime = lazy getResourceBlob "System.Dynamic.Runtime.dll"
120-
let private System_Runtime = lazy getResourceBlob "System.Runtime.dll"
121-
122-
module Files =
123-
let mscorlib = lazy writeToTempDirectory "mscorlib" (mscorlib.Force())
124-
let netStandard = lazy writeToTempDirectory "netstandard" (netstandard.Force())
125-
let systemConsole = lazy writeToTempDirectory "System.Console" (System_Console.Force())
126-
let systemCore = lazy writeToTempDirectory "System.Core" (System_Core.Force())
127-
let systemDynamicRuntime = lazy writeToTempDirectory "System.Dynamic.Runtime" (System_Dynamic_Runtime.Force())
128-
let systemRuntime = lazy writeToTempDirectory "System.Runtime" (System_Runtime.Force())
129-
130-
module References =
131-
let netStandardRef = lazy AssemblyMetadata.CreateFromImage(netstandard.Force()).GetReference(display = "netstandard.dll (netcoreapp 3.1 ref)")
132-
let mscorlibRef = lazy AssemblyMetadata.CreateFromImage(mscorlib.Force()).GetReference(display = "mscorlib.dll (netcoreapp 3.1 ref)")
133-
let systemConsoleRef = lazy AssemblyMetadata.CreateFromImage(System_Console.Force()).GetReference(display = "System.Console.dll (netcoreapp 3.1 ref)")
134-
let systemCoreRef = lazy AssemblyMetadata.CreateFromImage(System_Core.Force()).GetReference(display = "System.Core.dll (netcoreapp 3.1 ref)")
135-
let systemDynamicRuntimeRef = lazy AssemblyMetadata.CreateFromImage(System_Dynamic_Runtime.Force()).GetReference(display = "System.Dynamic.Runtime.dll (netcoreapp 3.1 ref)")
136-
let systemRuntimeRef = lazy AssemblyMetadata.CreateFromImage(System_Runtime.Force ()).GetReference(display = "System.Runtime.dll (netcoreapp 3.1 ref)")
137-
138112
[<RequireQualifiedAccess>]
139113
module public TargetFrameworkUtil =
140114

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

269-
let private netCoreApp31References =
270-
lazy ImmutableArray.Create(
271-
NetCoreApp31.References.netStandardRef.Value,
272-
NetCoreApp31.References.mscorlibRef.Value,
273-
NetCoreApp31.References.systemRuntimeRef.Value,
274-
NetCoreApp31.References.systemCoreRef.Value,
275-
NetCoreApp31.References.systemDynamicRuntimeRef.Value,
276-
NetCoreApp31.References.systemConsoleRef.Value)
277-
278243
let currentReferences =
279244
getNetCoreAppReferences
280245

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

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

298261

0 commit comments

Comments
 (0)