diff --git a/.axoCover/settings.json b/.axoCover/settings.json deleted file mode 100644 index 2ecbd5bd7b..0000000000 --- a/.axoCover/settings.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "TestRunner": "", - "TestPlatform": "x86", - "TestApartmentState": "STA", - "TestAdapterMode": "Integrated", - "IsRedirectingFrameworkAssemblies": true, - "TestSettings": "", - "ExcludeAttributes": "System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute", - "ExcludeFiles": "*.Designer.cs", - "ExcludeDirectories": "", - "Filters": "+[*]*", - "IsIncludingSolutionAssemblies": true, - "IsExcludingTestAssemblies": false, - "IsCoveringByTest": true, - "IsMergingByHash": true, - "IsSkippingAutoProps": true, - "IsVisitorCountLimited": false, - "VisitorCountLimit": 10 -} \ No newline at end of file diff --git a/.github/actions/Test/action.yml b/.github/actions/Test/action.yml new file mode 100644 index 0000000000..822b0864aa --- /dev/null +++ b/.github/actions/Test/action.yml @@ -0,0 +1,20 @@ +name: 'Test' +description: 'Run tests' +inputs: + target-path: + description: The path to the test adapter that should be used to run the tests + required: true + target-args: + description: The arguments to be passed to the test adapter + required: false + default: "" +runs: + using: composite + steps: + - name: Run tests + id: runTests + run: | + $runTestCmd = "${{ inputs.target-path }} ${{ inputs.target-args }}" + ECHO Invoking... $runTestCmd + Invoke-Expression $runTestCmd + shell: pwsh \ No newline at end of file diff --git a/.github/actions/TestWithCoverage/action.yml b/.github/actions/TestWithCoverage/action.yml deleted file mode 100644 index 0cc5e54569..0000000000 --- a/.github/actions/TestWithCoverage/action.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: 'Test with OpenCover' -description: 'Run tests and generate a coverage report using OpenCover' -inputs: - opencover-console-path: - description: The file path to OpenCover.Console.exe - required: true - opencover-console-args: - description: The arguments to be passed to OpenCover.Console.exe - required: false - default: "" - target-path: - description: The path to the test adapter that should be used to run the tests - required: true - target-args: - description: The arguments to be passed to the test adapter - required: false - default: "" - output-path: - description: The path to the output file, including the output file name, which shall contain the coverage report - required: true -runs: - using: composite - steps: - - name: Run tests and generate a coverage report - id: runTests - run: | - $openCoverConsole = "$HOME${{ inputs.opencover-console-path }}" - $openCoverArgs = '${{ inputs.opencover-console-args }}' - $target = '-target:"${{ inputs.target-path }}"' - $targetArgs = '-targetargs:"${{ inputs.target-args }}"' - $output = '-output:"${{ inputs.output-path }}"' - $runCoverageCmd = "$openCoverConsole $openCoverArgs $target $targetArgs $output" - ECHO Invoking... $runCoverageCmd - # Wrap the invokation so that we can act on its success or failure - try { - Invoke-Expression $runCoverageCmd - } catch { - # seems to have failed - ECHO "::error::Tests failed - " + $_.Exception.Message - EXIT 1 - } - shell: pwsh \ No newline at end of file diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index ef7d18a45e..c562622dca 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -93,16 +93,8 @@ jobs: uses: darenm/Setup-VSTest@d9a5dffa3f11d9c27ec42eb69515d3aaeaad9ef8 - name: Make a TestResults directory run: mkdir -p ./TestResults - - name: Test our solution and generate a coverage report using OpenCover - uses: ./.github/actions/TestWithCoverage + - name: Test our solution + uses: ./.github/actions/Test with: - opencover-console-path: \.nuget\packages\OpenCover\4.6.519\tools\OpenCover.Console.exe - opencover-console-args: -mergebyhash -skipautoprops -excludebyattribute:*.ExcludeFromCodeCoverage*,*.GeneratedCodeAttribute* -excludebyfile:*\*.Designer.cs,*.xaml -filter:"+[Eddi*]* +[Utilities*]* +[Tests*]UnitTests*" -register:Path32 -returntargetcode target-path: vstest.console.exe - target-args: Tests\bin\Release\Tests.dll /tests:UnitTests /Parallel /InIsolation /Blame - output-path: ./TestResults/coverage.xml - - name: Upload coverage to CodeCov (ref. https://github.com/codecov/codecov-action) - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 - with: - files: TestResults/coverage.xml - fail_ci_if_error: false # Specify if CI pipeline should fail when Codecov runs into errors during upload. Defaults to false \ No newline at end of file + target-args: Tests\bin\Release\Tests.dll /tests:UnitTests /Parallel /InIsolation /Blame \ No newline at end of file diff --git a/EDDI.sln b/EDDI.sln index ffd9d96895..4697d38a48 100644 --- a/EDDI.sln +++ b/EDDI.sln @@ -17,13 +17,12 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{21887F65-3357-4D63-890C-CDDBDDD9DB14}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig - codecov.yml = codecov.yml docs\Contributing.md = docs\Contributing.md Contributors.md = Contributors.md crowdin.yml = crowdin.yml Directory.Build.props = Directory.Build.props - images\Directory.jpg = images\Directory.jpg Directory.Build.targets = Directory.Build.targets + images\Directory.jpg = images\Directory.jpg EDDI\EDDI.ico = EDDI\EDDI.ico Installer.iss = Installer.iss docs\issue_template.md = docs\issue_template.md @@ -297,9 +296,9 @@ Global {7D25AF37-6EF2-4210-B079-14672BECDBB0} = {DBAE065B-DD96-4349-9189-D0935280BB0B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - RESX_TaskErrorCategory = Message - RESX_AutoCreateNewLanguageFiles = True - RESX_ShowErrorsInErrorList = False SolutionGuid = {28C2EDB6-0FA0-409F-987C-7A24F542D0CF} + RESX_ShowErrorsInErrorList = False + RESX_AutoCreateNewLanguageFiles = True + RESX_TaskErrorCategory = Message EndGlobalSection EndGlobal diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 1ea8c7a9ed..ffa876f97d 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -98,9 +98,6 @@ 13.0.3 - - 4.6.519 - 106.13.0