diff --git a/.gitignore b/.gitignore index 520ba1eff..f636b8244 100644 --- a/.gitignore +++ b/.gitignore @@ -223,3 +223,4 @@ Icon Network Trash Folder Temporary Items .apdisk +.ionide/symbolCache.db diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..ad9854893 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,27 @@ +{ + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md + "version": "0.2.0", + "configurations": [ + { + "name": ".NET Core Launch (console)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceFolder}/src/AnalysisPrograms/bin/Debug/netcoreapp3.1/AnalysisPrograms.dll", + "args": [], + "cwd": "${workspaceFolder}/src/AnalysisPrograms", + // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach", + "processId": "${command:pickProcess}" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 000000000..7ecd38a41 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,42 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/src/AnalysisPrograms/AnalysisPrograms.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/src/AnalysisPrograms/AnalysisPrograms.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "${workspaceFolder}/src/AnalysisPrograms/AnalysisPrograms.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/ap.code-workspace b/ap.code-workspace index ad6e3a05f..99b35788a 100644 --- a/ap.code-workspace +++ b/ap.code-workspace @@ -5,19 +5,28 @@ } ], + "extensions": { + "recommendations": [ + "ms-dotnettools.csharp", + "ms-vscode.powershell", + "ionide.ionide-fsharp" + ] + }, "settings": { "files.exclude": { "**/.git": true, "**/.DS_Store": true, - "src/Acoustics.*/**": true, - "src/AcousticWorkbench": true, - "src/AED": true, - "src/AudioAnalysisTools": true, - "src/TowseyLibrary": true, - "src/AnalysisPrograms/**": true, - "src/AnalysisBase/**": true, - "tests": true, - "TestResults": true + // "src/Acoustics.*/**": true, + // "src/AcousticWorkbench": true, + // "src/AED": true, + // "src/AudioAnalysisTools": true, + // "src/TowseyLibrary": true, + // "src/AnalysisPrograms/**": true, + // "src/AnalysisBase/**": true, + // "tests": true, + // "TestResults": true }, + "omnisharp.enableRoslynAnalyzers": true, + "omnisharp.enableEditorConfigSupport": true, } } \ No newline at end of file diff --git a/build/build_docker.ps1 b/build/build_docker.ps1 old mode 100644 new mode 100755 diff --git a/build/download_ap.Tests.ps1 b/build/download_ap.Tests.ps1 old mode 100644 new mode 100755 diff --git a/build/download_ap.ps1 b/build/download_ap.ps1 old mode 100644 new mode 100755 diff --git a/build/package.ps1 b/build/package.ps1 old mode 100644 new mode 100755 diff --git a/build/release.ps1 b/build/release.ps1 old mode 100644 new mode 100755 diff --git a/build/set_permissions.ps1 b/build/set_permissions.ps1 old mode 100644 new mode 100755 index 9e300aef9..4edbe747e --- a/build/set_permissions.ps1 +++ b/build/set_permissions.ps1 @@ -1,4 +1,6 @@ +#!/usr/bin/pwsh +#Requires -Version 6 $tools = @( "ffmpeg", diff --git a/build/tag.ps1 b/build/tag.ps1 old mode 100644 new mode 100755 diff --git a/build/update_audio_utils.ps1 b/build/update_audio_utils.ps1 old mode 100644 new mode 100755 diff --git a/lib/audio-utils/linux-arm/ffmpeg/ffmpeg b/lib/audio-utils/linux-arm/ffmpeg/ffmpeg old mode 100644 new mode 100755 diff --git a/lib/audio-utils/linux-arm/ffmpeg/ffprobe b/lib/audio-utils/linux-arm/ffmpeg/ffprobe old mode 100644 new mode 100755 diff --git a/lib/audio-utils/linux-musl-x64/ffmpeg/ffmpeg b/lib/audio-utils/linux-musl-x64/ffmpeg/ffmpeg old mode 100644 new mode 100755 diff --git a/lib/audio-utils/linux-musl-x64/ffmpeg/ffprobe b/lib/audio-utils/linux-musl-x64/ffmpeg/ffprobe old mode 100644 new mode 100755 diff --git a/lib/audio-utils/linux-x64/ffmpeg/ffmpeg b/lib/audio-utils/linux-x64/ffmpeg/ffmpeg old mode 100644 new mode 100755 diff --git a/lib/audio-utils/linux-x64/ffmpeg/ffprobe b/lib/audio-utils/linux-x64/ffmpeg/ffprobe old mode 100644 new mode 100755 diff --git a/lib/audio-utils/osx-x64/ffmpeg/ffmpeg b/lib/audio-utils/osx-x64/ffmpeg/ffmpeg old mode 100644 new mode 100755 diff --git a/lib/audio-utils/osx-x64/ffmpeg/ffprobe b/lib/audio-utils/osx-x64/ffmpeg/ffprobe old mode 100644 new mode 100755 diff --git a/lib/audio-utils/osx-x64/sox/sox b/lib/audio-utils/osx-x64/sox/sox old mode 100644 new mode 100755 diff --git a/lib/audio-utils/osx-x64/sox/soxi b/lib/audio-utils/osx-x64/sox/soxi old mode 100644 new mode 100755 diff --git a/lib/audio-utils/osx-x64/wavpack/wvunpack b/lib/audio-utils/osx-x64/wavpack/wvunpack old mode 100644 new mode 100755 diff --git a/lib/audio-utils/win-arm64/ffmpeg/ffmpeg.exe b/lib/audio-utils/win-arm64/ffmpeg/ffmpeg.exe old mode 100644 new mode 100755 diff --git a/lib/audio-utils/win-arm64/ffmpeg/ffprobe.exe b/lib/audio-utils/win-arm64/ffmpeg/ffprobe.exe old mode 100644 new mode 100755 diff --git a/lib/audio-utils/win-x64/ffmpeg/ffmpeg.exe b/lib/audio-utils/win-x64/ffmpeg/ffmpeg.exe old mode 100644 new mode 100755 diff --git a/lib/audio-utils/win-x64/ffmpeg/ffprobe.exe b/lib/audio-utils/win-x64/ffmpeg/ffprobe.exe old mode 100644 new mode 100755 diff --git a/lib/audio-utils/win-x64/sox/sox.exe b/lib/audio-utils/win-x64/sox/sox.exe old mode 100644 new mode 100755 diff --git a/lib/audio-utils/win-x64/wavpack/wvunpack.exe b/lib/audio-utils/win-x64/wavpack/wvunpack.exe old mode 100644 new mode 100755 diff --git a/src/Acoustics.Shared/AppConfigHelper.cs b/src/Acoustics.Shared/AppConfigHelper.cs index 8bdfcf49d..801adfcd0 100644 --- a/src/Acoustics.Shared/AppConfigHelper.cs +++ b/src/Acoustics.Shared/AppConfigHelper.cs @@ -207,7 +207,7 @@ internal static string GetExeFile(string name, bool required = true) return null; } - private static void CheckForExecutePermission(string executablePath) + internal static void CheckForExecutePermission(string executablePath) { // check we have required permissions if (!IsOSPlatform(Windows)) diff --git a/src/AnalysisPrograms/AnalysisPrograms.csproj b/src/AnalysisPrograms/AnalysisPrograms.csproj index f6d31c478..7b95ccd12 100644 --- a/src/AnalysisPrograms/AnalysisPrograms.csproj +++ b/src/AnalysisPrograms/AnalysisPrograms.csproj @@ -61,7 +61,6 @@ - diff --git a/style.ruleset b/style.ruleset index c60e5dbf9..d74ab5345 100644 --- a/style.ruleset +++ b/style.ruleset @@ -1,6 +1,11 @@  + + + + + diff --git a/tests/Acoustics.Test/Acoustics.Test.csproj b/tests/Acoustics.Test/Acoustics.Test.csproj index 0ee53870f..e2be980f2 100644 --- a/tests/Acoustics.Test/Acoustics.Test.csproj +++ b/tests/Acoustics.Test/Acoustics.Test.csproj @@ -32,7 +32,6 @@ - all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Acoustics.Test/Shared/AppConfigHelperTests.cs b/tests/Acoustics.Test/Shared/AppConfigHelperTests.cs index 1ac96be8a..8b1f151c3 100644 --- a/tests/Acoustics.Test/Shared/AppConfigHelperTests.cs +++ b/tests/Acoustics.Test/Shared/AppConfigHelperTests.cs @@ -9,8 +9,7 @@ namespace Acoustics.Test.Shared using System.Runtime.InteropServices; using Acoustics.Shared; using Acoustics.Test.TestHelpers; - using Acoustics.Test.TestHelpers.Fixtures; - using Microsoft.VisualStudio.TestTools.UnitTesting; + using Microsoft.VisualStudio.TestTools.UnitTesting; using Mono.Unix; using static Acoustics.Shared.AppConfigHelper;