Skip to content

Restructure repository #2834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ColinM9991 wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Restructure repository #2834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8fd8b3d
Restructure repository
ColinM9991 Mar 17, 2026
933a8d9
Update unit tests path in ci.yml
ColinM9991 Mar 17, 2026
5e097c3
Move MobiFlightConnector project into src
ColinM9991 Mar 17, 2026
4b7debc
Update workflows
ColinM9991 Mar 17, 2026
89acadf
Update release.bat
ColinM9991 Mar 17, 2026
42fcf92
ProjectDir to SolutionDir for release.bat script
ColinM9991 Mar 17, 2026
31b8e32
Move examples into connector project
ColinM9991 Mar 17, 2026
3df3ad6
Re-add missing Arduino files
ColinM9991 Mar 17, 2026
acaa7c5
Copy installer to new connector path
ColinM9991 Mar 17, 2026
cb43cff
Update yaml files
ColinM9991 Mar 19, 2026
b67e99b
Update icon path for projects and NSI
ColinM9991 Mar 19, 2026
81d638e
Update publish.yml
ColinM9991 Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ jobs:
run: nuget restore ${{env.SOLUTION_FILE_PATH}}

- name: Replace version in AssemblyInfo.cs
run: (Get-Content "Properties/AssemblyInfo.cs") -replace '\("\d+\.\d+\.\d+(\.\d+)?"\)', '("${{ env.VERSION }}")' | Out-File "Properties/AssemblyInfo.cs"
run: (Get-Content "src/MobiFlightConnector/Properties/AssemblyInfo.cs") -replace '\("\d+\.\d+\.\d+(\.\d+)?"\)', '("${{ env.VERSION }}")' | Out-File "src/MobiFlightConnector/Properties/AssemblyInfo.cs"
shell: pwsh

- name: Dump AssemblyInfo.cs
run: "type Properties/AssemblyInfo.cs"
run: "type src/MobiFlightConnector/Properties/AssemblyInfo.cs"
shell: pwsh

- name: Build frontend
working-directory: ${{env.GITHUB_WORKSPACE}}
run: cd frontend; npm install; npm run build
run: cd src/MobiFlightConnector/frontend; npm install; npm run build

- name: Build core
working-directory: ${{env.GITHUB_WORKSPACE}}
Expand All @@ -53,7 +53,7 @@ jobs:
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{env.BUILD_PLATFORM}} /t:${{env.BUILD_PROJECT}} ${{env.SOLUTION_FILE_PATH}}

- name: Run Tests
run: vstest.console.exe MobiFlightUnitTests/bin/Release/MobiFlightUnitTests.dll
run: vstest.console.exe tests/MobiFlightUnitTests/bin/${{env.BUILD_CONFIGURATION}}/MobiFlightUnitTests.dll

- name: store latest setup file
uses: actions/upload-artifact@v7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./frontend
working-directory: src/MobiFlightConnector/frontend
steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ jobs:
run: .\Build\downgrade_nsis.ps1

- name: Replace version in AssemblyInfo.cs
run: (Get-Content "Properties/AssemblyInfo.cs") -replace '\("\d+\.\d+\.\d+(\.\d+)?"\)', '("${{ github.event.release.tag_name }}")' | Out-File "Properties/AssemblyInfo.cs"
run: (Get-Content "src/MobiFlightConnector/Properties/AssemblyInfo.cs") -replace '\("\d+\.\d+\.\d+(\.\d+)?"\)', '("${{ github.event.release.tag_name }}")' | Out-File "src/MobiFlightConnector/Properties/AssemblyInfo.cs"
shell: pwsh

- name: Dump AssemblyInfo.cs
run: "type Properties/AssemblyInfo.cs"
run: "type src/MobiFlightConnector/Properties/AssemblyInfo.cs"
shell: pwsh

- name: Build frontend
working-directory: ${{env.GITHUB_WORKSPACE}}
run: cd frontend; npm install; npm run build
run: cd src/MobiFlightConnector/frontend; npm install; npm run build

- name: Restore NuGet packages
working-directory: ${{env.GITHUB_WORKSPACE}}
Expand All @@ -56,7 +56,7 @@ jobs:
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{env.BUILD_PLATFORM}} /t:${{env.PROJECT_TEST}} ${{env.SOLUTION_FILE_PATH}}

- name: Run Tests
run: vstest.console.exe ${{env.PROJECT_TEST}}/bin/Release/${{env.PROJECT_TEST}}.dll
run: vstest.console.exe tests/${{env.PROJECT_TEST}}/bin/${{env.BUILD_CONFIGURATION}}/${{env.PROJECT_TEST}}.dll

- name: Build Connector
working-directory: ${{env.GITHUB_WORKSPACE}}
Expand All @@ -65,7 +65,7 @@ jobs:
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{env.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}} /t:${{env.PROJECT_MAIN}}

- name: Create Hash
run: (Get-FileHash Release/MobiFlightConnector-${{ github.event.release.tag_name }}.zip -Algorithm SHA1).Hash | Out-File Release/MobiFlightConnector-${{ github.event.release.tag_name }}.sha1
run: (Get-FileHash ${{env.BUILD_CONFIGURATION}}/MobiFlightConnector-${{ github.event.release.tag_name }}.zip -Algorithm SHA1).Hash | Out-File ${{env.BUILD_CONFIGURATION}}/MobiFlightConnector-${{ github.event.release.tag_name }}.sha1
shell: pwsh

- name: Create latest setup exe
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-script-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
branches: [ main, mf2025/main ]
paths:
- 'Scripts/**/*.py'
- '**/Scripts/**/*.py'

jobs:
python-script-checks:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/translations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./frontend
working-directory: src/MobiFlightConnector/frontend
steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
Expand Down
4 changes: 2 additions & 2 deletions Build/release.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SET TARGET_DIR=%1
SET SOLUTION_DIR=%2
SET RELEASE_DIR=%SOLUTION_DIR%Release
SET BUILD_TOOLS_DIR=%~dp0
SET BUILD_TOOLS_DIR=%SOLUTION_DIR%Build\
SET CMD_RAR=utils\7z\7z.exe
SET INSTALLER_NAME=MobiFlight-Installer
SET VERSION=
Expand Down Expand Up @@ -31,7 +31,7 @@ echo -----------------------------------------------------------
echo Building MobiFlight-Connector ZIP package
echo -----------------------------------------------------------
%BUILD_TOOLS_DIR%%CMD_RAR% a %RELEASE_DIR%\MobiFlightConnector-%VERSION%.zip %TARGET_DIR%*.* -r
copy %SOLUTION_DIR%MobiFlight-Installer\%INSTALLER_NAME%\bin\Release\%INSTALLER_NAME%.exe %RELEASE_DIR%\
copy %SOLUTION_DIR%src\%INSTALLER_NAME%\bin\Release\%INSTALLER_NAME%.exe %RELEASE_DIR%\
echo OK

echo -----------------------------------------------------------
Expand Down
7 changes: 0 additions & 7 deletions MobiFlight-Installer/MobiFlight-Installer/MobiFlightInstaller.csproj.user
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions MobiFlightConnector.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32526.322
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobiFlightConnector", "MobiFlightConnector.csproj", "{FAD08758-74C5-4DBA-9BC5-1AD98A0FE87B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobiFlightConnector", "src\MobiFlightConnector\MobiFlightConnector.csproj", "{FAD08758-74C5-4DBA-9BC5-1AD98A0FE87B}"
ProjectSection(ProjectDependencies) = postProject
{9891291C-16A1-48B7-BAEE-9FE876663E0E} = {9891291C-16A1-48B7-BAEE-9FE876663E0E}
{657624C9-3CA3-4DB3-8107-2CC0356A5026} = {657624C9-3CA3-4DB3-8107-2CC0356A5026}
{3CF8F8FC-6F5C-46F8-94DC-C2E4C505ECA4} = {3CF8F8FC-6F5C-46F8-94DC-C2E4C505ECA4}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobiFlightUnitTests", "MobiFlightUnitTests\MobiFlightUnitTests.csproj", "{89216209-3FEA-4722-B8F3-C7AFC9C0DC77}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobiFlightUnitTests", "tests\MobiFlightUnitTests\MobiFlightUnitTests.csproj", "{89216209-3FEA-4722-B8F3-C7AFC9C0DC77}"
ProjectSection(ProjectDependencies) = postProject
{FAD08758-74C5-4DBA-9BC5-1AD98A0FE87B} = {FAD08758-74C5-4DBA-9BC5-1AD98A0FE87B}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionInfo", "VersionInfo\VersionInfo.csproj", "{657624C9-3CA3-4DB3-8107-2CC0356A5026}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionInfo", "src\VersionInfo\VersionInfo.csproj", "{657624C9-3CA3-4DB3-8107-2CC0356A5026}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobiFlightInstaller", "MobiFlight-Installer\MobiFlight-Installer\MobiFlightInstaller.csproj", "{9891291C-16A1-48B7-BAEE-9FE876663E0E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobiFlightInstaller", "src\MobiFlight-Installer\MobiFlightInstaller.csproj", "{9891291C-16A1-48B7-BAEE-9FE876663E0E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandMessenger", "CmdMessenger\CommandMessenger\CommandMessenger.csproj", "{3CF8F8FC-6F5C-46F8-94DC-C2E4C505ECA4}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandMessenger", "src\CommandMessenger\CommandMessenger.csproj", "{3CF8F8FC-6F5C-46F8-94DC-C2E4C505ECA4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandMessenger.Transport.Serial", "CmdMessenger\CommandMessenger.Transport.Serial\CommandMessenger.Transport.Serial.csproj", "{00D85F0B-00A5-41FA-8A99-428C0199C663}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandMessenger.Transport.Serial", "src\CommandMessenger.Transport.Serial\CommandMessenger.Transport.Serial.csproj", "{00D85F0B-00A5-41FA-8A99-428C0199C663}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
6 changes: 0 additions & 6 deletions MobiFlightUnitTests/MobiFlightUnitTests.csproj.user
View file
Open in desktop

This file was deleted.

Loading
Loading