Skip to content

Commit 9dc6942

Browse files
authored
Fix e2e tests for the combo provider (#13930)
1 parent 08951d2 commit 9dc6942

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
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)' == '' ">net7.0</TargetFramework>
5+
<TargetFramework Condition=" '$(TestTargetFramework)' == '' ">net6.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>net7.0;net472</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net472</TargetFrameworks>
66
<FSharpCoreImplicitPackageVersion>$(FSharpCoreShippedPackageVersionValue)</FSharpCoreImplicitPackageVersion>
7-
<TargetFrameworks>net7.0;net472</TargetFrameworks>
7+
<TargetFrameworks>net6.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=net7.0 -p:FSharpTestCompilerVersion=coreclr
46-
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net7.0 -p:FSharpTestCompilerVersion=coreclr
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
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=net7.0 -p:FSharpTestCompilerVersion=coreclr
64-
dotnet test ComboProvider.Tests\ComboProvider.Tests.fsproj -c %configuration% -v minimal -p:TestTargetFramework=net7.0 -p:FSharpTestCompilerVersion=coreclr
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
6565
if ERRORLEVEL 1 echo Error: TestComboProvider failed && goto :failure
6666

6767
:success

0 commit comments

Comments
 (0)