diff --git a/.gitignore b/.gitignore index 16d969e..92a3666 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,8 @@ build/* out/ native/**/bin/ native/**/obj/ -src-dotnet/**/bin/ -src-dotnet/**/obj/ +src/**/bin/ +src/**/obj/ .certs/* !.certs/.gitkeep .env diff --git a/package.json b/package.json index 0581e03..2d96b5d 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,10 @@ "version": "0.2.0", "description": "Desktop companion app for Switchify Android.", "scripts": { - "dotnet:restore": "dotnet restore src-dotnet/SwitchifyPc.sln", - "dotnet:build": "dotnet build src-dotnet/SwitchifyPc.sln -c Release --no-restore", - "dotnet:test": "dotnet test src-dotnet/SwitchifyPc.sln -c Release --no-build", - "dotnet:publish": "dotnet publish src-dotnet/SwitchifyPc.App/SwitchifyPc.App.csproj -c Release -r win-x64 --self-contained true", + "dotnet:restore": "dotnet restore src/SwitchifyPc.sln", + "dotnet:build": "dotnet build src/SwitchifyPc.sln -c Release --no-restore", + "dotnet:test": "dotnet test src/SwitchifyPc.sln -c Release --no-build", + "dotnet:publish": "dotnet publish src/SwitchifyPc.App/SwitchifyPc.App.csproj -c Release -r win-x64 --self-contained true", "dotnet:package:win": "node scripts/package-dotnet-win.cjs", "dotnet:package:win:stage": "node scripts/package-dotnet-win.cjs --stage-only --skip-sign", "dotnet:package:win:verify": "node scripts/verify-dotnet-package.cjs", diff --git a/scripts/package-dotnet-win.cjs b/scripts/package-dotnet-win.cjs index 2ea5802..b4571b9 100644 --- a/scripts/package-dotnet-win.cjs +++ b/scripts/package-dotnet-win.cjs @@ -12,10 +12,10 @@ const { const stageOnly = process.argv.includes('--stage-only'); const skipSign = process.argv.includes('--skip-sign'); -const appProjectPath = resolveProjectPath('src-dotnet', 'SwitchifyPc.App', 'SwitchifyPc.App.csproj'); +const appProjectPath = resolveProjectPath('src', 'SwitchifyPc.App', 'SwitchifyPc.App.csproj'); const version = readDotnetAppVersion(appProjectPath); const publishDir = resolveProjectPath( - 'src-dotnet', + 'src', 'SwitchifyPc.App', 'bin', 'Release', diff --git a/scripts/verify-dotnet-package.cjs b/scripts/verify-dotnet-package.cjs index 0ba99b4..07029e0 100644 --- a/scripts/verify-dotnet-package.cjs +++ b/scripts/verify-dotnet-package.cjs @@ -7,7 +7,7 @@ const stageDir = path.join(distDir, 'win-unpacked'); const appExe = path.join(stageDir, 'Switchify PC.exe'); const builderDebug = path.join(distDir, 'builder-debug.yml'); const latestYml = path.join(distDir, 'latest.yml'); -const appProjectPath = resolveProjectPath('src-dotnet', 'SwitchifyPc.App', 'SwitchifyPc.App.csproj'); +const appProjectPath = resolveProjectPath('src', 'SwitchifyPc.App', 'SwitchifyPc.App.csproj'); const appVersion = readDotnetAppVersion(appProjectPath); const expectedInstaller = path.join(distDir, `Switchify-PC-Setup-${appVersion}-x64.exe`); const installerScript = resolveProjectPath('installer', 'SwitchifyPc.DotNet.nsi'); diff --git a/src-dotnet/Directory.Build.props b/src/Directory.Build.props similarity index 100% rename from src-dotnet/Directory.Build.props rename to src/Directory.Build.props diff --git a/src-dotnet/SwitchifyPc.App/App.xaml b/src/SwitchifyPc.App/App.xaml similarity index 100% rename from src-dotnet/SwitchifyPc.App/App.xaml rename to src/SwitchifyPc.App/App.xaml diff --git a/src-dotnet/SwitchifyPc.App/App.xaml.cs b/src/SwitchifyPc.App/App.xaml.cs similarity index 100% rename from src-dotnet/SwitchifyPc.App/App.xaml.cs rename to src/SwitchifyPc.App/App.xaml.cs diff --git a/src-dotnet/SwitchifyPc.App/AssemblyInfo.cs b/src/SwitchifyPc.App/AssemblyInfo.cs similarity index 100% rename from src-dotnet/SwitchifyPc.App/AssemblyInfo.cs rename to src/SwitchifyPc.App/AssemblyInfo.cs diff --git a/src-dotnet/SwitchifyPc.App/MainWindow.xaml b/src/SwitchifyPc.App/MainWindow.xaml similarity index 100% rename from src-dotnet/SwitchifyPc.App/MainWindow.xaml rename to src/SwitchifyPc.App/MainWindow.xaml diff --git a/src-dotnet/SwitchifyPc.App/MainWindow.xaml.cs b/src/SwitchifyPc.App/MainWindow.xaml.cs similarity index 100% rename from src-dotnet/SwitchifyPc.App/MainWindow.xaml.cs rename to src/SwitchifyPc.App/MainWindow.xaml.cs diff --git a/src-dotnet/SwitchifyPc.App/NativeTrayIcon.cs b/src/SwitchifyPc.App/NativeTrayIcon.cs similarity index 100% rename from src-dotnet/SwitchifyPc.App/NativeTrayIcon.cs rename to src/SwitchifyPc.App/NativeTrayIcon.cs diff --git a/src-dotnet/SwitchifyPc.App/SettingsWindow.xaml b/src/SwitchifyPc.App/SettingsWindow.xaml similarity index 100% rename from src-dotnet/SwitchifyPc.App/SettingsWindow.xaml rename to src/SwitchifyPc.App/SettingsWindow.xaml diff --git a/src-dotnet/SwitchifyPc.App/SettingsWindow.xaml.cs b/src/SwitchifyPc.App/SettingsWindow.xaml.cs similarity index 100% rename from src-dotnet/SwitchifyPc.App/SettingsWindow.xaml.cs rename to src/SwitchifyPc.App/SettingsWindow.xaml.cs diff --git a/src-dotnet/SwitchifyPc.App/SwitchifyPc.App.csproj b/src/SwitchifyPc.App/SwitchifyPc.App.csproj similarity index 100% rename from src-dotnet/SwitchifyPc.App/SwitchifyPc.App.csproj rename to src/SwitchifyPc.App/SwitchifyPc.App.csproj diff --git a/src-dotnet/SwitchifyPc.Core/AppLifecycle/AppLaunchOptions.cs b/src/SwitchifyPc.Core/AppLifecycle/AppLaunchOptions.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/AppLifecycle/AppLaunchOptions.cs rename to src/SwitchifyPc.Core/AppLifecycle/AppLaunchOptions.cs diff --git a/src-dotnet/SwitchifyPc.Core/Bluetooth/BluetoothControlFrameProcessor.cs b/src/SwitchifyPc.Core/Bluetooth/BluetoothControlFrameProcessor.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Bluetooth/BluetoothControlFrameProcessor.cs rename to src/SwitchifyPc.Core/Bluetooth/BluetoothControlFrameProcessor.cs diff --git a/src-dotnet/SwitchifyPc.Core/Bluetooth/BluetoothHelperProtocol.cs b/src/SwitchifyPc.Core/Bluetooth/BluetoothHelperProtocol.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Bluetooth/BluetoothHelperProtocol.cs rename to src/SwitchifyPc.Core/Bluetooth/BluetoothHelperProtocol.cs diff --git a/src-dotnet/SwitchifyPc.Core/Bluetooth/BluetoothRemoteFrameProcessor.cs b/src/SwitchifyPc.Core/Bluetooth/BluetoothRemoteFrameProcessor.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Bluetooth/BluetoothRemoteFrameProcessor.cs rename to src/SwitchifyPc.Core/Bluetooth/BluetoothRemoteFrameProcessor.cs diff --git a/src-dotnet/SwitchifyPc.Core/Bluetooth/BluetoothStatus.cs b/src/SwitchifyPc.Core/Bluetooth/BluetoothStatus.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Bluetooth/BluetoothStatus.cs rename to src/SwitchifyPc.Core/Bluetooth/BluetoothStatus.cs diff --git a/src-dotnet/SwitchifyPc.Core/Bluetooth/BluetoothStatusTracker.cs b/src/SwitchifyPc.Core/Bluetooth/BluetoothStatusTracker.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Bluetooth/BluetoothStatusTracker.cs rename to src/SwitchifyPc.Core/Bluetooth/BluetoothStatusTracker.cs diff --git a/src-dotnet/SwitchifyPc.Core/Control/ControlSession.cs b/src/SwitchifyPc.Core/Control/ControlSession.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Control/ControlSession.cs rename to src/SwitchifyPc.Core/Control/ControlSession.cs diff --git a/src-dotnet/SwitchifyPc.Core/Control/RemoteControlSession.cs b/src/SwitchifyPc.Core/Control/RemoteControlSession.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Control/RemoteControlSession.cs rename to src/SwitchifyPc.Core/Control/RemoteControlSession.cs diff --git a/src-dotnet/SwitchifyPc.Core/Diagnostics/JsonlDiagnostics.cs b/src/SwitchifyPc.Core/Diagnostics/JsonlDiagnostics.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Diagnostics/JsonlDiagnostics.cs rename to src/SwitchifyPc.Core/Diagnostics/JsonlDiagnostics.cs diff --git a/src-dotnet/SwitchifyPc.Core/Input/DesktopCommandExecutor.cs b/src/SwitchifyPc.Core/Input/DesktopCommandExecutor.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Input/DesktopCommandExecutor.cs rename to src/SwitchifyPc.Core/Input/DesktopCommandExecutor.cs diff --git a/src-dotnet/SwitchifyPc.Core/Input/DesktopInputAdapter.cs b/src/SwitchifyPc.Core/Input/DesktopInputAdapter.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Input/DesktopInputAdapter.cs rename to src/SwitchifyPc.Core/Input/DesktopInputAdapter.cs diff --git a/src-dotnet/SwitchifyPc.Core/Input/PointerProfile.cs b/src/SwitchifyPc.Core/Input/PointerProfile.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Input/PointerProfile.cs rename to src/SwitchifyPc.Core/Input/PointerProfile.cs diff --git a/src-dotnet/SwitchifyPc.Core/Pairing/CommandAuth.cs b/src/SwitchifyPc.Core/Pairing/CommandAuth.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Pairing/CommandAuth.cs rename to src/SwitchifyPc.Core/Pairing/CommandAuth.cs diff --git a/src-dotnet/SwitchifyPc.Core/Pairing/PairingApprovalManager.cs b/src/SwitchifyPc.Core/Pairing/PairingApprovalManager.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Pairing/PairingApprovalManager.cs rename to src/SwitchifyPc.Core/Pairing/PairingApprovalManager.cs diff --git a/src-dotnet/SwitchifyPc.Core/Pairing/PairingManager.cs b/src/SwitchifyPc.Core/Pairing/PairingManager.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Pairing/PairingManager.cs rename to src/SwitchifyPc.Core/Pairing/PairingManager.cs diff --git a/src-dotnet/SwitchifyPc.Core/Pairing/PairingState.cs b/src/SwitchifyPc.Core/Pairing/PairingState.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Pairing/PairingState.cs rename to src/SwitchifyPc.Core/Pairing/PairingState.cs diff --git a/src-dotnet/SwitchifyPc.Core/Pairing/PairingStore.cs b/src/SwitchifyPc.Core/Pairing/PairingStore.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Pairing/PairingStore.cs rename to src/SwitchifyPc.Core/Pairing/PairingStore.cs diff --git a/src-dotnet/SwitchifyPc.Core/Pairing/PairingVerificationCode.cs b/src/SwitchifyPc.Core/Pairing/PairingVerificationCode.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Pairing/PairingVerificationCode.cs rename to src/SwitchifyPc.Core/Pairing/PairingVerificationCode.cs diff --git a/src-dotnet/SwitchifyPc.Core/Settings/CursorOverlaySettings.cs b/src/SwitchifyPc.Core/Settings/CursorOverlaySettings.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Settings/CursorOverlaySettings.cs rename to src/SwitchifyPc.Core/Settings/CursorOverlaySettings.cs diff --git a/src-dotnet/SwitchifyPc.Core/Settings/PointerMovementSettings.cs b/src/SwitchifyPc.Core/Settings/PointerMovementSettings.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Settings/PointerMovementSettings.cs rename to src/SwitchifyPc.Core/Settings/PointerMovementSettings.cs diff --git a/src-dotnet/SwitchifyPc.Core/Startup/SystemStartupService.cs b/src/SwitchifyPc.Core/Startup/SystemStartupService.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Startup/SystemStartupService.cs rename to src/SwitchifyPc.Core/Startup/SystemStartupService.cs diff --git a/src-dotnet/SwitchifyPc.Core/Storage/JsonFileStore.cs b/src/SwitchifyPc.Core/Storage/JsonFileStore.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Storage/JsonFileStore.cs rename to src/SwitchifyPc.Core/Storage/JsonFileStore.cs diff --git a/src-dotnet/SwitchifyPc.Core/SwitchifyPc.Core.csproj b/src/SwitchifyPc.Core/SwitchifyPc.Core.csproj similarity index 100% rename from src-dotnet/SwitchifyPc.Core/SwitchifyPc.Core.csproj rename to src/SwitchifyPc.Core/SwitchifyPc.Core.csproj diff --git a/src-dotnet/SwitchifyPc.Core/SwitchifyPcCoreMarker.cs b/src/SwitchifyPc.Core/SwitchifyPcCoreMarker.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/SwitchifyPcCoreMarker.cs rename to src/SwitchifyPc.Core/SwitchifyPcCoreMarker.cs diff --git a/src-dotnet/SwitchifyPc.Core/Ui/MainWindowCopy.cs b/src/SwitchifyPc.Core/Ui/MainWindowCopy.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Ui/MainWindowCopy.cs rename to src/SwitchifyPc.Core/Ui/MainWindowCopy.cs diff --git a/src-dotnet/SwitchifyPc.Core/Ui/MainWindowViewModel.cs b/src/SwitchifyPc.Core/Ui/MainWindowViewModel.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Ui/MainWindowViewModel.cs rename to src/SwitchifyPc.Core/Ui/MainWindowViewModel.cs diff --git a/src-dotnet/SwitchifyPc.Core/Ui/SettingsController.cs b/src/SwitchifyPc.Core/Ui/SettingsController.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Ui/SettingsController.cs rename to src/SwitchifyPc.Core/Ui/SettingsController.cs diff --git a/src-dotnet/SwitchifyPc.Core/Ui/SettingsViewModel.cs b/src/SwitchifyPc.Core/Ui/SettingsViewModel.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Ui/SettingsViewModel.cs rename to src/SwitchifyPc.Core/Ui/SettingsViewModel.cs diff --git a/src-dotnet/SwitchifyPc.Core/Updates/GitHubReleaseUpdateBackend.cs b/src/SwitchifyPc.Core/Updates/GitHubReleaseUpdateBackend.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Updates/GitHubReleaseUpdateBackend.cs rename to src/SwitchifyPc.Core/Updates/GitHubReleaseUpdateBackend.cs diff --git a/src-dotnet/SwitchifyPc.Core/Updates/UpdateModels.cs b/src/SwitchifyPc.Core/Updates/UpdateModels.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Updates/UpdateModels.cs rename to src/SwitchifyPc.Core/Updates/UpdateModels.cs diff --git a/src-dotnet/SwitchifyPc.Core/Updates/UpdateService.cs b/src/SwitchifyPc.Core/Updates/UpdateService.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Core/Updates/UpdateService.cs rename to src/SwitchifyPc.Core/Updates/UpdateService.cs diff --git a/src-dotnet/SwitchifyPc.IntegrationTests/IntegrationTestPlaceholder.cs b/src/SwitchifyPc.IntegrationTests/IntegrationTestPlaceholder.cs similarity index 100% rename from src-dotnet/SwitchifyPc.IntegrationTests/IntegrationTestPlaceholder.cs rename to src/SwitchifyPc.IntegrationTests/IntegrationTestPlaceholder.cs diff --git a/src-dotnet/SwitchifyPc.IntegrationTests/SwitchifyPc.IntegrationTests.csproj b/src/SwitchifyPc.IntegrationTests/SwitchifyPc.IntegrationTests.csproj similarity index 100% rename from src-dotnet/SwitchifyPc.IntegrationTests/SwitchifyPc.IntegrationTests.csproj rename to src/SwitchifyPc.IntegrationTests/SwitchifyPc.IntegrationTests.csproj diff --git a/src-dotnet/SwitchifyPc.Protocol/BluetoothFrame.cs b/src/SwitchifyPc.Protocol/BluetoothFrame.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Protocol/BluetoothFrame.cs rename to src/SwitchifyPc.Protocol/BluetoothFrame.cs diff --git a/src-dotnet/SwitchifyPc.Protocol/ProtocolConstants.cs b/src/SwitchifyPc.Protocol/ProtocolConstants.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Protocol/ProtocolConstants.cs rename to src/SwitchifyPc.Protocol/ProtocolConstants.cs diff --git a/src-dotnet/SwitchifyPc.Protocol/ProtocolValidationResult.cs b/src/SwitchifyPc.Protocol/ProtocolValidationResult.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Protocol/ProtocolValidationResult.cs rename to src/SwitchifyPc.Protocol/ProtocolValidationResult.cs diff --git a/src-dotnet/SwitchifyPc.Protocol/ProtocolValidator.cs b/src/SwitchifyPc.Protocol/ProtocolValidator.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Protocol/ProtocolValidator.cs rename to src/SwitchifyPc.Protocol/ProtocolValidator.cs diff --git a/src-dotnet/SwitchifyPc.Protocol/SwitchifyPc.Protocol.csproj b/src/SwitchifyPc.Protocol/SwitchifyPc.Protocol.csproj similarity index 100% rename from src-dotnet/SwitchifyPc.Protocol/SwitchifyPc.Protocol.csproj rename to src/SwitchifyPc.Protocol/SwitchifyPc.Protocol.csproj diff --git a/src-dotnet/SwitchifyPc.Tests/AppLifecycleTests.cs b/src/SwitchifyPc.Tests/AppLifecycleTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/AppLifecycleTests.cs rename to src/SwitchifyPc.Tests/AppLifecycleTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/BluetoothControlFrameProcessorTests.cs b/src/SwitchifyPc.Tests/BluetoothControlFrameProcessorTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/BluetoothControlFrameProcessorTests.cs rename to src/SwitchifyPc.Tests/BluetoothControlFrameProcessorTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/BluetoothFrameTests.cs b/src/SwitchifyPc.Tests/BluetoothFrameTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/BluetoothFrameTests.cs rename to src/SwitchifyPc.Tests/BluetoothFrameTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/BluetoothHelperProtocolTests.cs b/src/SwitchifyPc.Tests/BluetoothHelperProtocolTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/BluetoothHelperProtocolTests.cs rename to src/SwitchifyPc.Tests/BluetoothHelperProtocolTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/BluetoothRemoteFrameProcessorTests.cs b/src/SwitchifyPc.Tests/BluetoothRemoteFrameProcessorTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/BluetoothRemoteFrameProcessorTests.cs rename to src/SwitchifyPc.Tests/BluetoothRemoteFrameProcessorTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/BluetoothStatusTrackerTests.cs b/src/SwitchifyPc.Tests/BluetoothStatusTrackerTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/BluetoothStatusTrackerTests.cs rename to src/SwitchifyPc.Tests/BluetoothStatusTrackerTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/CommandAuthTests.cs b/src/SwitchifyPc.Tests/CommandAuthTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/CommandAuthTests.cs rename to src/SwitchifyPc.Tests/CommandAuthTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/ControlSessionTests.cs b/src/SwitchifyPc.Tests/ControlSessionTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/ControlSessionTests.cs rename to src/SwitchifyPc.Tests/ControlSessionTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/CursorOverlaySettingsTests.cs b/src/SwitchifyPc.Tests/CursorOverlaySettingsTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/CursorOverlaySettingsTests.cs rename to src/SwitchifyPc.Tests/CursorOverlaySettingsTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/DesktopCommandExecutorTests.cs b/src/SwitchifyPc.Tests/DesktopCommandExecutorTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/DesktopCommandExecutorTests.cs rename to src/SwitchifyPc.Tests/DesktopCommandExecutorTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/GitHubReleaseUpdateBackendTests.cs b/src/SwitchifyPc.Tests/GitHubReleaseUpdateBackendTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/GitHubReleaseUpdateBackendTests.cs rename to src/SwitchifyPc.Tests/GitHubReleaseUpdateBackendTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/JsonFileStoreTests.cs b/src/SwitchifyPc.Tests/JsonFileStoreTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/JsonFileStoreTests.cs rename to src/SwitchifyPc.Tests/JsonFileStoreTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/JsonlDiagnosticsTests.cs b/src/SwitchifyPc.Tests/JsonlDiagnosticsTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/JsonlDiagnosticsTests.cs rename to src/SwitchifyPc.Tests/JsonlDiagnosticsTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/MainWindowCopyTests.cs b/src/SwitchifyPc.Tests/MainWindowCopyTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/MainWindowCopyTests.cs rename to src/SwitchifyPc.Tests/MainWindowCopyTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/MainWindowViewModelTests.cs b/src/SwitchifyPc.Tests/MainWindowViewModelTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/MainWindowViewModelTests.cs rename to src/SwitchifyPc.Tests/MainWindowViewModelTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/PairingApprovalManagerTests.cs b/src/SwitchifyPc.Tests/PairingApprovalManagerTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/PairingApprovalManagerTests.cs rename to src/SwitchifyPc.Tests/PairingApprovalManagerTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/PairingManagerTests.cs b/src/SwitchifyPc.Tests/PairingManagerTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/PairingManagerTests.cs rename to src/SwitchifyPc.Tests/PairingManagerTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/PairingStoreTests.cs b/src/SwitchifyPc.Tests/PairingStoreTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/PairingStoreTests.cs rename to src/SwitchifyPc.Tests/PairingStoreTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/PointerMovementSettingsTests.cs b/src/SwitchifyPc.Tests/PointerMovementSettingsTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/PointerMovementSettingsTests.cs rename to src/SwitchifyPc.Tests/PointerMovementSettingsTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/PointerProfileTests.cs b/src/SwitchifyPc.Tests/PointerProfileTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/PointerProfileTests.cs rename to src/SwitchifyPc.Tests/PointerProfileTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/ProtocolConstantsTests.cs b/src/SwitchifyPc.Tests/ProtocolConstantsTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/ProtocolConstantsTests.cs rename to src/SwitchifyPc.Tests/ProtocolConstantsTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/ProtocolValidatorTests.cs b/src/SwitchifyPc.Tests/ProtocolValidatorTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/ProtocolValidatorTests.cs rename to src/SwitchifyPc.Tests/ProtocolValidatorTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/RemoteControlSessionTests.cs b/src/SwitchifyPc.Tests/RemoteControlSessionTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/RemoteControlSessionTests.cs rename to src/SwitchifyPc.Tests/RemoteControlSessionTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/SettingsControllerTests.cs b/src/SwitchifyPc.Tests/SettingsControllerTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/SettingsControllerTests.cs rename to src/SwitchifyPc.Tests/SettingsControllerTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/SettingsViewModelTests.cs b/src/SwitchifyPc.Tests/SettingsViewModelTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/SettingsViewModelTests.cs rename to src/SwitchifyPc.Tests/SettingsViewModelTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/SwitchifyPc.Tests.csproj b/src/SwitchifyPc.Tests/SwitchifyPc.Tests.csproj similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/SwitchifyPc.Tests.csproj rename to src/SwitchifyPc.Tests/SwitchifyPc.Tests.csproj diff --git a/src-dotnet/SwitchifyPc.Tests/SystemStartupServiceTests.cs b/src/SwitchifyPc.Tests/SystemStartupServiceTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/SystemStartupServiceTests.cs rename to src/SwitchifyPc.Tests/SystemStartupServiceTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/UpdateServiceTests.cs b/src/SwitchifyPc.Tests/UpdateServiceTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/UpdateServiceTests.cs rename to src/SwitchifyPc.Tests/UpdateServiceTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/WindowsBluetoothGattServerTests.cs b/src/SwitchifyPc.Tests/WindowsBluetoothGattServerTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/WindowsBluetoothGattServerTests.cs rename to src/SwitchifyPc.Tests/WindowsBluetoothGattServerTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/WindowsCursorOverlayNotifierTests.cs b/src/SwitchifyPc.Tests/WindowsCursorOverlayNotifierTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/WindowsCursorOverlayNotifierTests.cs rename to src/SwitchifyPc.Tests/WindowsCursorOverlayNotifierTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/WindowsDesktopInputAdapterTests.cs b/src/SwitchifyPc.Tests/WindowsDesktopInputAdapterTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/WindowsDesktopInputAdapterTests.cs rename to src/SwitchifyPc.Tests/WindowsDesktopInputAdapterTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/WindowsInputMapperTests.cs b/src/SwitchifyPc.Tests/WindowsInputMapperTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/WindowsInputMapperTests.cs rename to src/SwitchifyPc.Tests/WindowsInputMapperTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/WindowsPointerMovementTests.cs b/src/SwitchifyPc.Tests/WindowsPointerMovementTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/WindowsPointerMovementTests.cs rename to src/SwitchifyPc.Tests/WindowsPointerMovementTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/WindowsStartupRegistryTests.cs b/src/SwitchifyPc.Tests/WindowsStartupRegistryTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/WindowsStartupRegistryTests.cs rename to src/SwitchifyPc.Tests/WindowsStartupRegistryTests.cs diff --git a/src-dotnet/SwitchifyPc.Tests/WindowsUpdateInstallerLauncherTests.cs b/src/SwitchifyPc.Tests/WindowsUpdateInstallerLauncherTests.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Tests/WindowsUpdateInstallerLauncherTests.cs rename to src/SwitchifyPc.Tests/WindowsUpdateInstallerLauncherTests.cs diff --git a/src-dotnet/SwitchifyPc.Windows/AppLifecycle/WindowsExistingInstanceSignal.cs b/src/SwitchifyPc.Windows/AppLifecycle/WindowsExistingInstanceSignal.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/AppLifecycle/WindowsExistingInstanceSignal.cs rename to src/SwitchifyPc.Windows/AppLifecycle/WindowsExistingInstanceSignal.cs diff --git a/src-dotnet/SwitchifyPc.Windows/AppLifecycle/WindowsSingleInstanceLock.cs b/src/SwitchifyPc.Windows/AppLifecycle/WindowsSingleInstanceLock.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/AppLifecycle/WindowsSingleInstanceLock.cs rename to src/SwitchifyPc.Windows/AppLifecycle/WindowsSingleInstanceLock.cs diff --git a/src-dotnet/SwitchifyPc.Windows/Bluetooth/WindowsBluetoothGattServer.cs b/src/SwitchifyPc.Windows/Bluetooth/WindowsBluetoothGattServer.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/Bluetooth/WindowsBluetoothGattServer.cs rename to src/SwitchifyPc.Windows/Bluetooth/WindowsBluetoothGattServer.cs diff --git a/src-dotnet/SwitchifyPc.Windows/CursorOverlay/CursorOverlayNativeMethods.cs b/src/SwitchifyPc.Windows/CursorOverlay/CursorOverlayNativeMethods.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/CursorOverlay/CursorOverlayNativeMethods.cs rename to src/SwitchifyPc.Windows/CursorOverlay/CursorOverlayNativeMethods.cs diff --git a/src-dotnet/SwitchifyPc.Windows/CursorOverlay/WindowsCursorOverlayNotifier.cs b/src/SwitchifyPc.Windows/CursorOverlay/WindowsCursorOverlayNotifier.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/CursorOverlay/WindowsCursorOverlayNotifier.cs rename to src/SwitchifyPc.Windows/CursorOverlay/WindowsCursorOverlayNotifier.cs diff --git a/src-dotnet/SwitchifyPc.Windows/Input/WindowsDesktopInputAdapter.cs b/src/SwitchifyPc.Windows/Input/WindowsDesktopInputAdapter.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/Input/WindowsDesktopInputAdapter.cs rename to src/SwitchifyPc.Windows/Input/WindowsDesktopInputAdapter.cs diff --git a/src-dotnet/SwitchifyPc.Windows/Input/WindowsInputMapper.cs b/src/SwitchifyPc.Windows/Input/WindowsInputMapper.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/Input/WindowsInputMapper.cs rename to src/SwitchifyPc.Windows/Input/WindowsInputMapper.cs diff --git a/src-dotnet/SwitchifyPc.Windows/Input/WindowsPointerMovement.cs b/src/SwitchifyPc.Windows/Input/WindowsPointerMovement.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/Input/WindowsPointerMovement.cs rename to src/SwitchifyPc.Windows/Input/WindowsPointerMovement.cs diff --git a/src-dotnet/SwitchifyPc.Windows/Input/WindowsPointerProfileProvider.cs b/src/SwitchifyPc.Windows/Input/WindowsPointerProfileProvider.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/Input/WindowsPointerProfileProvider.cs rename to src/SwitchifyPc.Windows/Input/WindowsPointerProfileProvider.cs diff --git a/src-dotnet/SwitchifyPc.Windows/Startup/WindowsStartupRegistry.cs b/src/SwitchifyPc.Windows/Startup/WindowsStartupRegistry.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/Startup/WindowsStartupRegistry.cs rename to src/SwitchifyPc.Windows/Startup/WindowsStartupRegistry.cs diff --git a/src-dotnet/SwitchifyPc.Windows/SwitchifyPc.Windows.csproj b/src/SwitchifyPc.Windows/SwitchifyPc.Windows.csproj similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/SwitchifyPc.Windows.csproj rename to src/SwitchifyPc.Windows/SwitchifyPc.Windows.csproj diff --git a/src-dotnet/SwitchifyPc.Windows/SwitchifyPcWindowsMarker.cs b/src/SwitchifyPc.Windows/SwitchifyPcWindowsMarker.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/SwitchifyPcWindowsMarker.cs rename to src/SwitchifyPc.Windows/SwitchifyPcWindowsMarker.cs diff --git a/src-dotnet/SwitchifyPc.Windows/Updates/WindowsUpdateInstallerLauncher.cs b/src/SwitchifyPc.Windows/Updates/WindowsUpdateInstallerLauncher.cs similarity index 100% rename from src-dotnet/SwitchifyPc.Windows/Updates/WindowsUpdateInstallerLauncher.cs rename to src/SwitchifyPc.Windows/Updates/WindowsUpdateInstallerLauncher.cs diff --git a/src-dotnet/SwitchifyPc.sln b/src/SwitchifyPc.sln similarity index 100% rename from src-dotnet/SwitchifyPc.sln rename to src/SwitchifyPc.sln