From 5b389d9bc556188c207f001e9d94c0a93eb87eb3 Mon Sep 17 00:00:00 2001 From: slavara Date: Sun, 20 Dec 2020 21:30:00 +0300 Subject: [PATCH 01/14] WIP --- CI/build.cmd | 13 ++++++++++++- .../Completion/ASGeneratorTests.cs | 7 ++++--- .../Completion/Haxe3/CodeCompleteTests.cs | 1 + 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CI/build.cmd b/CI/build.cmd index 80904931ca..8bc166b6c0 100644 --- a/CI/build.cmd +++ b/CI/build.cmd @@ -22,6 +22,17 @@ if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1 :: Check for build errors if %errorlevel% neq 0 goto :error +:: Build the main solution and run tests +msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x64" /t:Rebuild %MSBuildLogger% + +:: Check for build errors +if %errorlevel% neq 0 goto :error + +if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1 + +:: Check for build errors +if %errorlevel% neq 0 goto :error + :: Remove testing binaries so we can reuse the current build del "FlashDevelop\Bin/Debug\*.Tests.*" /Q del "FlashDevelop\Bin/Debug\NSubstitute.*" /Q @@ -108,4 +119,4 @@ if %errorlevel% neq 0 goto :error exit 0 :error -exit -1 +exit -1 \ No newline at end of file diff --git a/Tests/External/Plugins/ASCompletion.Tests/Completion/ASGeneratorTests.cs b/Tests/External/Plugins/ASCompletion.Tests/Completion/ASGeneratorTests.cs index 3a45c5d1cc..763d13a351 100644 --- a/Tests/External/Plugins/ASCompletion.Tests/Completion/ASGeneratorTests.cs +++ b/Tests/External/Plugins/ASCompletion.Tests/Completion/ASGeneratorTests.cs @@ -1325,11 +1325,12 @@ static IEnumerable ParseFunctionParametersTestCases public List ParseFunctionParameters(string fileName) { SetSrc(sci, ReadAllText(fileName)); + var ctx = ASContext.GetLanguageContext(sci.ConfigurationLanguage); var list = new MemberList(); - list.Merge(ASContext.GetLanguageContext(sci.ConfigurationLanguage).GetVisibleExternalElements()); - list.Merge(ASContext.Context.CurrentModel.Imports); + list.Merge(ctx.GetVisibleExternalElements()); + list.Merge(ctx.CurrentModel.Imports); ASContext.Context.GetVisibleExternalElements().Returns(list); - var result = ASGenerator.ParseFunctionParameters(sci, sci.CurrentPos) .Select(it => it.result.Type ?? it.result.Member).ToList(); + var result = ASGenerator.ParseFunctionParameters(sci, sci.CurrentPos).Select(it => it.result.Type ?? it.result.Member).ToList(); return result; } diff --git a/Tests/External/Plugins/HaxeContext.Tests/Completion/Haxe3/CodeCompleteTests.cs b/Tests/External/Plugins/HaxeContext.Tests/Completion/Haxe3/CodeCompleteTests.cs index 4666b2c676..2a5c84b69d 100644 --- a/Tests/External/Plugins/HaxeContext.Tests/Completion/Haxe3/CodeCompleteTests.cs +++ b/Tests/External/Plugins/HaxeContext.Tests/Completion/Haxe3/CodeCompleteTests.cs @@ -72,6 +72,7 @@ static IEnumerable IsInterpolationStringStyleTestCases public bool IsInterpolationStringStyle(string fileName) { SetSrc(sci, ReadAllText(fileName)); + return true; return ASContext.Context.CodeComplete.IsStringInterpolationStyle(sci, sci.CurrentPos); } From 426c702ad83fe885cbcb2b27a0fae71251be0a78 Mon Sep 17 00:00:00 2001 From: slavara Date: Sun, 20 Dec 2020 21:36:54 +0300 Subject: [PATCH 02/14] WIP --- CI/build.cmd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CI/build.cmd b/CI/build.cmd index 8bc166b6c0..313e221697 100644 --- a/CI/build.cmd +++ b/CI/build.cmd @@ -17,7 +17,9 @@ msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x86" /t:Reb :: Check for build errors if %errorlevel% neq 0 goto :error -if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1 +echo %AppVeyorCI% +::if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1 +powershell.exe -file ci\tests.ps1 :: Check for build errors if %errorlevel% neq 0 goto :error From 1a818f671eba926de5f3a23e6d145000560b6619 Mon Sep 17 00:00:00 2001 From: slavara Date: Sun, 20 Dec 2020 21:49:12 +0300 Subject: [PATCH 03/14] WIP --- CI/build.cmd | 6 ++++++ CI/tests.ps1 | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CI/build.cmd b/CI/build.cmd index 313e221697..cbaf6d86fa 100644 --- a/CI/build.cmd +++ b/CI/build.cmd @@ -19,6 +19,12 @@ if %errorlevel% neq 0 goto :error echo %AppVeyorCI% ::if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1 +echo "-----------------------------------------------------" +cd "FlashDevelop\Bin\Debug" +dir +cd "..\..\.." +echo "-----------------------------------------------------" +goto :error powershell.exe -file ci\tests.ps1 :: Check for build errors diff --git a/CI/tests.ps1 b/CI/tests.ps1 index 24d76730dd..3b88a11950 100644 --- a/CI/tests.ps1 +++ b/CI/tests.ps1 @@ -31,7 +31,7 @@ If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null) } ELSE { - nunit3-console.exe $testFiles --result=myresults.xml;format=AppVeyor + nunit3-console.exe $testFiles --result=TestResult.xml;format=AppVeyor #It turns out it's not needed to upload the file #if ((Test-Path env:\APPVEYOR_JOB_ID) -And (Test-Path TestResult.xml)) #{ From aa5adb41b21ac155b8c4be4b1f9540f344960360 Mon Sep 17 00:00:00 2001 From: slavara Date: Sun, 20 Dec 2020 21:52:33 +0300 Subject: [PATCH 04/14] WIP --- CI/build.cmd | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CI/build.cmd b/CI/build.cmd index cbaf6d86fa..16a03120ba 100644 --- a/CI/build.cmd +++ b/CI/build.cmd @@ -17,15 +17,14 @@ msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x86" /t:Reb :: Check for build errors if %errorlevel% neq 0 goto :error -echo %AppVeyorCI% -::if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1 +if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1 + echo "-----------------------------------------------------" cd "FlashDevelop\Bin\Debug" dir cd "..\..\.." echo "-----------------------------------------------------" goto :error -powershell.exe -file ci\tests.ps1 :: Check for build errors if %errorlevel% neq 0 goto :error From 088d3c2482785b2b184ff57680e223b5df724ddc Mon Sep 17 00:00:00 2001 From: slavara Date: Sun, 20 Dec 2020 22:00:46 +0300 Subject: [PATCH 05/14] WIP --- CI/tests.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CI/tests.ps1 b/CI/tests.ps1 index 3b88a11950..0ad36508f7 100644 --- a/CI/tests.ps1 +++ b/CI/tests.ps1 @@ -24,6 +24,8 @@ If ($env:HAXEPATH -eq $null) If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null) { cd "FlashDevelop\Bin\Debug" + Write-Output Get-Location + Write-Output Get-ChildItem $testFiles = [System.IO.Directory]::GetFiles(".", "*.Tests.dll") IF ($testFiles.Count -eq 0) { @@ -48,4 +50,4 @@ If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null) ELSE { Write-Output "NUnit runner not found" -} +} \ No newline at end of file From 897e77d39290990069ecf04c3ed1bb57701280ec Mon Sep 17 00:00:00 2001 From: slavara Date: Sun, 20 Dec 2020 22:04:05 +0300 Subject: [PATCH 06/14] WIP --- CI/tests.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/tests.ps1 b/CI/tests.ps1 index 0ad36508f7..d6ecfdd802 100644 --- a/CI/tests.ps1 +++ b/CI/tests.ps1 @@ -24,8 +24,8 @@ If ($env:HAXEPATH -eq $null) If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null) { cd "FlashDevelop\Bin\Debug" - Write-Output Get-Location - Write-Output Get-ChildItem + Get-Location + Get-ChildItem $testFiles = [System.IO.Directory]::GetFiles(".", "*.Tests.dll") IF ($testFiles.Count -eq 0) { From 8bb291c8c29d6e73c26964d87f800908a184f2ba Mon Sep 17 00:00:00 2001 From: slavara Date: Sun, 20 Dec 2020 22:10:29 +0300 Subject: [PATCH 07/14] WIP --- CI/tests.ps1 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CI/tests.ps1 b/CI/tests.ps1 index d6ecfdd802..6aadb4cc74 100644 --- a/CI/tests.ps1 +++ b/CI/tests.ps1 @@ -23,16 +23,15 @@ If ($env:HAXEPATH -eq $null) If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null) { - cd "FlashDevelop\Bin\Debug" - Get-Location - Get-ChildItem - $testFiles = [System.IO.Directory]::GetFiles(".", "*.Tests.dll") + $testFiles = [System.IO.Directory]::GetFiles("FlashDevelop\Bin\Debug", "*.Tests.dll") + Write-Output "Count: " + $testFiles.Count IF ($testFiles.Count -eq 0) { Write-Output "No test assemblies found" } ELSE { + cd "FlashDevelop\Bin\Debug" nunit3-console.exe $testFiles --result=TestResult.xml;format=AppVeyor #It turns out it's not needed to upload the file #if ((Test-Path env:\APPVEYOR_JOB_ID) -And (Test-Path TestResult.xml)) From 25bc5a007ad8771c6cec6b03b07e45a7d3d606ca Mon Sep 17 00:00:00 2001 From: slavara Date: Sun, 20 Dec 2020 22:14:17 +0300 Subject: [PATCH 08/14] WIP --- CI/tests.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/CI/tests.ps1 b/CI/tests.ps1 index 6aadb4cc74..32f2dafbc3 100644 --- a/CI/tests.ps1 +++ b/CI/tests.ps1 @@ -31,7 +31,6 @@ If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null) } ELSE { - cd "FlashDevelop\Bin\Debug" nunit3-console.exe $testFiles --result=TestResult.xml;format=AppVeyor #It turns out it's not needed to upload the file #if ((Test-Path env:\APPVEYOR_JOB_ID) -And (Test-Path TestResult.xml)) From 04bb74e3c98cf6d3430c662482747e144f38eff1 Mon Sep 17 00:00:00 2001 From: slavara Date: Sun, 20 Dec 2020 22:23:28 +0300 Subject: [PATCH 09/14] WIP --- CI/build.cmd | 7 ------- CI/tests.ps1 | 1 - 2 files changed, 8 deletions(-) diff --git a/CI/build.cmd b/CI/build.cmd index 16a03120ba..8bc166b6c0 100644 --- a/CI/build.cmd +++ b/CI/build.cmd @@ -19,13 +19,6 @@ if %errorlevel% neq 0 goto :error if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1 -echo "-----------------------------------------------------" -cd "FlashDevelop\Bin\Debug" -dir -cd "..\..\.." -echo "-----------------------------------------------------" -goto :error - :: Check for build errors if %errorlevel% neq 0 goto :error diff --git a/CI/tests.ps1 b/CI/tests.ps1 index 32f2dafbc3..e3f939ade4 100644 --- a/CI/tests.ps1 +++ b/CI/tests.ps1 @@ -24,7 +24,6 @@ If ($env:HAXEPATH -eq $null) If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null) { $testFiles = [System.IO.Directory]::GetFiles("FlashDevelop\Bin\Debug", "*.Tests.dll") - Write-Output "Count: " + $testFiles.Count IF ($testFiles.Count -eq 0) { Write-Output "No test assemblies found" From ef10deb0a8eba40ae920689f3bb59a52d5f26fca Mon Sep 17 00:00:00 2001 From: slavara Date: Sun, 20 Dec 2020 22:30:59 +0300 Subject: [PATCH 10/14] WIP --- CI/build.cmd | 4 ++-- CI/tests.ps1 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/build.cmd b/CI/build.cmd index 8bc166b6c0..1835dcf04b 100644 --- a/CI/build.cmd +++ b/CI/build.cmd @@ -12,7 +12,7 @@ call SetVersion.bat :: Build the main solution and run tests -msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x86" /t:Rebuild %MSBuildLogger% +msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x64" /t:Rebuild %MSBuildLogger% :: Check for build errors if %errorlevel% neq 0 goto :error @@ -23,7 +23,7 @@ if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1 if %errorlevel% neq 0 goto :error :: Build the main solution and run tests -msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x64" /t:Rebuild %MSBuildLogger% +msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x86 /t:Rebuild %MSBuildLogger% :: Check for build errors if %errorlevel% neq 0 goto :error diff --git a/CI/tests.ps1 b/CI/tests.ps1 index e3f939ade4..9eb1dcaebc 100644 --- a/CI/tests.ps1 +++ b/CI/tests.ps1 @@ -30,7 +30,7 @@ If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null) } ELSE { - nunit3-console.exe $testFiles --result=TestResult.xml;format=AppVeyor + nunit3-console.exe $testFiles# --result=TestResult.xml;format=AppVeyor #It turns out it's not needed to upload the file #if ((Test-Path env:\APPVEYOR_JOB_ID) -And (Test-Path TestResult.xml)) #{ From a16599b6ab19879ffababc9d55e69d22c8a54ca9 Mon Sep 17 00:00:00 2001 From: slavara Date: Sun, 20 Dec 2020 22:37:38 +0300 Subject: [PATCH 11/14] WIP --- CI/build.cmd | 2 +- CI/tests.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/build.cmd b/CI/build.cmd index 1835dcf04b..fe0703f539 100644 --- a/CI/build.cmd +++ b/CI/build.cmd @@ -12,7 +12,7 @@ call SetVersion.bat :: Build the main solution and run tests -msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x64" /t:Rebuild %MSBuildLogger% +msbuild FlashDevelop.sln /p:Configuration=Debug+Tests /p:Platform="x64" /t:Rebuild %MSBuildLogger% :: Check for build errors if %errorlevel% neq 0 goto :error diff --git a/CI/tests.ps1 b/CI/tests.ps1 index 9eb1dcaebc..b64a8e8275 100644 --- a/CI/tests.ps1 +++ b/CI/tests.ps1 @@ -30,7 +30,7 @@ If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null) } ELSE { - nunit3-console.exe $testFiles# --result=TestResult.xml;format=AppVeyor + nunit3-console.exe $testFiles #It turns out it's not needed to upload the file #if ((Test-Path env:\APPVEYOR_JOB_ID) -And (Test-Path TestResult.xml)) #{ From c25a796f64fea3d2bc20a55880c01c783f8c2e4b Mon Sep 17 00:00:00 2001 From: slavara Date: Sun, 20 Dec 2020 22:48:37 +0300 Subject: [PATCH 12/14] WIP --- CI/build.cmd | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/CI/build.cmd b/CI/build.cmd index fe0703f539..2c316c0024 100644 --- a/CI/build.cmd +++ b/CI/build.cmd @@ -12,7 +12,7 @@ call SetVersion.bat :: Build the main solution and run tests -msbuild FlashDevelop.sln /p:Configuration=Debug+Tests /p:Platform="x64" /t:Rebuild %MSBuildLogger% +msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x86" /t:Rebuild %MSBuildLogger% :: Check for build errors if %errorlevel% neq 0 goto :error @@ -22,8 +22,25 @@ if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1 :: Check for build errors if %errorlevel% neq 0 goto :error +:: Remove testing binaries so we can reuse the current build +del "FlashDevelop\Bin/Debug\*.Tests.*" /Q +del "FlashDevelop\Bin/Debug\NSubstitute.*" /Q +del "FlashDevelop\Bin/Debug\nunit.framework.*" /Q +del "FlashDevelop\Bin/Debug\Castle.Core.*" /Q +del "FlashDevelop\Bin/Debug\System.*" /Q +del "FlashDevelop\Bin/Debug\Microsoft.*" /Q +del "FlashDevelop\Bin/Debug\CSScriptLibrary.xml" /Q +del "FlashDevelop\Bin/Debug\Mono.CSharp.*" /Q + +:: Check if the build was triggered by a pull request +if "%APPVEYOR_PULL_REQUEST_NUMBER%" neq "" ( + :: Create the archive + 7z a -tzip FlashDevelop\Installer\Binary\FlashDevelopPR_%APPVEYOR_PULL_REQUEST_NUMBER%.zip .\FlashDevelop\Bin\Debug\* -xr!.empty + exit 0 +) + :: Build the main solution and run tests -msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x86 /t:Rebuild %MSBuildLogger% +msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x64 /t:Rebuild %MSBuildLogger% :: Check for build errors if %errorlevel% neq 0 goto :error From 952af7891e21b18b9399479d19babe193b84d736 Mon Sep 17 00:00:00 2001 From: slavara Date: Mon, 21 Dec 2020 13:09:09 +0300 Subject: [PATCH 13/14] WIP --- CI/build.cmd | 21 ++----------------- CI/tests.ps1 | 5 +++++ FlashDevelop.sln | 8 +++---- .../Completion/Haxe3/CodeCompleteTests.cs | 1 - .../PluginCore.Tests/PluginCore.Tests.csproj | 18 ++++++++++++++++ 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/CI/build.cmd b/CI/build.cmd index 2c316c0024..a8975205d5 100644 --- a/CI/build.cmd +++ b/CI/build.cmd @@ -12,7 +12,7 @@ call SetVersion.bat :: Build the main solution and run tests -msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x86" /t:Rebuild %MSBuildLogger% +msbuild FlashDevelop.sln /p:Configuration=Debug+Tests /p:Platform="x64" /t:Rebuild %MSBuildLogger% :: Check for build errors if %errorlevel% neq 0 goto :error @@ -22,25 +22,8 @@ if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1 :: Check for build errors if %errorlevel% neq 0 goto :error -:: Remove testing binaries so we can reuse the current build -del "FlashDevelop\Bin/Debug\*.Tests.*" /Q -del "FlashDevelop\Bin/Debug\NSubstitute.*" /Q -del "FlashDevelop\Bin/Debug\nunit.framework.*" /Q -del "FlashDevelop\Bin/Debug\Castle.Core.*" /Q -del "FlashDevelop\Bin/Debug\System.*" /Q -del "FlashDevelop\Bin/Debug\Microsoft.*" /Q -del "FlashDevelop\Bin/Debug\CSScriptLibrary.xml" /Q -del "FlashDevelop\Bin/Debug\Mono.CSharp.*" /Q - -:: Check if the build was triggered by a pull request -if "%APPVEYOR_PULL_REQUEST_NUMBER%" neq "" ( - :: Create the archive - 7z a -tzip FlashDevelop\Installer\Binary\FlashDevelopPR_%APPVEYOR_PULL_REQUEST_NUMBER%.zip .\FlashDevelop\Bin\Debug\* -xr!.empty - exit 0 -) - :: Build the main solution and run tests -msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x64 /t:Rebuild %MSBuildLogger% +msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x86" /t:Rebuild %MSBuildLogger% :: Check for build errors if %errorlevel% neq 0 goto :error diff --git a/CI/tests.ps1 b/CI/tests.ps1 index e86ad832ec..684b036f34 100644 --- a/CI/tests.ps1 +++ b/CI/tests.ps1 @@ -16,6 +16,11 @@ If ($env:HAXEPATH -eq $null) { cinst.exe haxe --version 4.1.4 -y --no-progress $env:HAXEPATH = [System.IO.Directory]::GetDirectories("C:\ProgramData\chocolatey\lib\haxe", "haxe_*")[0]; + If ($env:HAXEPATH -eq $null) + { + Write-Output "HAXEPATH is invalid" + exit 1 + } } If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null) diff --git a/FlashDevelop.sln b/FlashDevelop.sln index 514be00bd6..28e1d369d6 100644 --- a/FlashDevelop.sln +++ b/FlashDevelop.sln @@ -922,8 +922,8 @@ Global {F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|Any CPU.Build.0 = Debug|Any CPU {F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|x64.ActiveCfg = Debug|x64 {F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|x64.Build.0 = Debug|x64 - {F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|x86.ActiveCfg = Debug|Any CPU - {F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|x86.Build.0 = Debug|Any CPU + {F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|x86.ActiveCfg = Debug|x86 + {F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|x86.Build.0 = Debug|x86 {F44D3125-12E8-4143-B250-84C5D89D253C}.Release|Any CPU.ActiveCfg = Release|Any CPU {F44D3125-12E8-4143-B250-84C5D89D253C}.Release|x64.ActiveCfg = Release|Any CPU {F44D3125-12E8-4143-B250-84C5D89D253C}.Release|x86.ActiveCfg = Release|Any CPU @@ -931,8 +931,8 @@ Global {F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|Any CPU.Build.0 = Release|Any CPU {F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|x64.ActiveCfg = Release|x64 {F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|x64.Build.0 = Release|x64 - {F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|x86.ActiveCfg = Release|Any CPU - {F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|x86.Build.0 = Release|Any CPU + {F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|x86.ActiveCfg = Release|x86 + {F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|x86.Build.0 = Release|x86 {8B5A1C53-AF20-4379-A8D1-31822ACC6AD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8B5A1C53-AF20-4379-A8D1-31822ACC6AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU {8B5A1C53-AF20-4379-A8D1-31822ACC6AD8}.Debug|x64.ActiveCfg = Debug|Any CPU diff --git a/Tests/External/Plugins/HaxeContext.Tests/Completion/Haxe3/CodeCompleteTests.cs b/Tests/External/Plugins/HaxeContext.Tests/Completion/Haxe3/CodeCompleteTests.cs index 2a5c84b69d..4666b2c676 100644 --- a/Tests/External/Plugins/HaxeContext.Tests/Completion/Haxe3/CodeCompleteTests.cs +++ b/Tests/External/Plugins/HaxeContext.Tests/Completion/Haxe3/CodeCompleteTests.cs @@ -72,7 +72,6 @@ static IEnumerable IsInterpolationStringStyleTestCases public bool IsInterpolationStringStyle(string fileName) { SetSrc(sci, ReadAllText(fileName)); - return true; return ASContext.Context.CodeComplete.IsStringInterpolationStyle(sci, sci.CurrentPos); } diff --git a/Tests/PluginCore/PluginCore.Tests/PluginCore.Tests.csproj b/Tests/PluginCore/PluginCore.Tests/PluginCore.Tests.csproj index 4cf6e47de0..cf1e710ad9 100644 --- a/Tests/PluginCore/PluginCore.Tests/PluginCore.Tests.csproj +++ b/Tests/PluginCore/PluginCore.Tests/PluginCore.Tests.csproj @@ -32,6 +32,24 @@ 4 9 + + true + ..\..\..\FlashDevelop\Bin\Debug\ + DEBUG;TRACE + full + x86 + 9 + prompt + + + ..\..\..\FlashDevelop\Bin\Debug\ + TRACE + true + pdbonly + x86 + 9 + prompt + true ..\..\..\FlashDevelop\Bin\Debug\ From c4462d5cff0af9c356db49c0c4e9d33fee94ad6d Mon Sep 17 00:00:00 2001 From: slavara Date: Mon, 21 Dec 2020 13:12:59 +0300 Subject: [PATCH 14/14] WIP --- CI/tests.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/tests.ps1 b/CI/tests.ps1 index 684b036f34..047c27f0db 100644 --- a/CI/tests.ps1 +++ b/CI/tests.ps1 @@ -35,8 +35,8 @@ If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null) cd $path #nunit3-console.exe $testFiles --result=myresults.xml;format=AppVeyor - nunit3-console.exe $testFiles --x86 - #nunit3-console.exe $testFiles + #nunit3-console.exe $testFiles --x86 + nunit3-console.exe $testFiles #It turns out it's not needed to upload the file #if ((Test-Path env:\APPVEYOR_JOB_ID) -And (Test-Path TestResult.xml))