Skip to content

Commit

Permalink
Copy/paste bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@brianrourkeboll
brianrourkeboll committed Jun 28, 2024
1 parent af5779c commit 6368265
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions eng/Build.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ try {
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Private.Scripting.UnitTests\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Build.UnitTests\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Core.UnitTests.CSharp\FSharp.Core.UnitTests.CSharp.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests.CSharp\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Core.UnitTests.CSharp\FSharp.Core.UnitTests.CSharp.csproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests.CSharp\"

# Collect output from background jobs
Wait-job $bgJob | out-null
Expand All @@ -603,7 +603,7 @@ try {
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Private.Scripting.UnitTests\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Build.UnitTests\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Core.UnitTests.CSharp\FSharp.Core.UnitTests.CSharp.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests.CSharp\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Core.UnitTests.CSharp\FSharp.Core.UnitTests.CSharp.csproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests.CSharp\"

# Collect output from background jobs
Wait-job $bgJob | out-null
Expand Down Expand Up @@ -640,8 +640,8 @@ try {
if ($testFSharpCore) {
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Core.UnitTests.CSharp\FSharp.Core.UnitTests.CSharp.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests.CSharp\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Core.UnitTests.CSharp\FSharp.Core.UnitTests.CSharp.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests.CSharp\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Core.UnitTests.CSharp\FSharp.Core.UnitTests.CSharp.csproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests.CSharp\"
TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Core.UnitTests.CSharp\FSharp.Core.UnitTests.CSharp.csproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests.CSharp\"
}

if ($testCompiler) {
Expand Down
2 changes: 1 addition & 1 deletion eng/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ if [[ "$test_core_clr" == true ]]; then
Test --testproject "$repo_root/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj" --targetframework $coreclrtestframework
Test --testproject "$repo_root/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework $coreclrtestframework
Test --testproject "$repo_root/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj" --targetframework $coreclrtestframework
Test --testproject "$repo_root/tests/FSharp.Core.UnitTests.CSharp/FSharp.Core.UnitTests.CSharp.fsproj" --targetframework $coreclrtestframework
Test --testproject "$repo_root/tests/FSharp.Core.UnitTests.CSharp/FSharp.Core.UnitTests.CSharp.csproj" --targetframework $coreclrtestframework
fi

if [[ "$test_compilercomponent_tests" == true ]]; then
Expand Down

0 comments on commit 6368265

Please sign in to comment.