Skip to content

Commit

Permalink
integration tests back to 8
Browse files Browse the repository at this point in the history
  • Loading branch information
Thorium committed Sep 27, 2024
1 parent 8bffe4d commit c7fb3c1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
13 changes: 5 additions & 8 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -655,15 +655,15 @@ Target.create "DotNetCoreIntegrationTests" (fun _ ->

runExpecto
root
("src" </> "test" </> "Fake.Core.IntegrationTests" </> "bin" </> "Release" </> "net6.0" </> "Fake.Core.IntegrationTests.dll")
("src" </> "test" </> "Fake.Core.IntegrationTests" </> "bin" </> "Release" </> "net8.0" </> "Fake.Core.IntegrationTests.dll")
"Fake_Core_IntegrationTests.TestResults.xml")

Target.create "TemplateIntegrationTests" (fun _ ->
let targetDir = (srcDir </> "test" </> "Fake.DotNet.Cli.IntegrationTests")

runExpecto
targetDir
("bin" </> "Release" </> "net6.0" </> "Fake.DotNet.Cli.IntegrationTests.dll")
("bin" </> "Release" </> "net8.0" </> "Fake.DotNet.Cli.IntegrationTests.dll")
"Fake_DotNet_Cli_IntegrationTests.TestResults.xml"

Shell.rm_rf (root </> "test"))
Expand Down Expand Up @@ -893,14 +893,11 @@ Target.create "DotNetCreateNuGetPackage" (fun _ ->
publish zipFile

Directory.ensure "temp"
let testZip = "temp/tests.zip"
let testZip8 = "temp/tests8.zip"
let testZip8 = "temp/tests.zip"

!! "src/test/*/bin/Release/net6.0/**" |> Zip.zip "src/test" testZip
!! "src/test/*/bin/Release/net8.0/**" |> Zip.zip "src/test" testZip8
!! "src/test/*/bin/Release/net8.0/**" |> Zip.zip "src/test" testZip

publish testZip
publish testZip8)
publish testZip)

Target.create "DotNetCreateChocolateyPackage" (fun _ ->
let altToolPath = getChocoWrapper ()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\app\Fake.Core.SemVer\Fake.Core.SemVer.fsproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/test/Fake.Core.IntegrationTests/TestHelpers.fs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ let fakeToolPath =
</> "Fake.netcore"
</> "bin"
</> "Debug"
</> "net6.0"
</> "net8.0"
</> "fake"
)

Expand Down

0 comments on commit c7fb3c1

Please sign in to comment.