refactor: project structure (#109)

* refactor: project structure

* ci: update workflows to use ubuntu-latest for build and test jobs

* fix: uncomment branches in workflow triggers for build and test

Author: Lemon73-Computing

.github/workflows/build-cli.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         rid: [win-x64, win-x86, win-arm64, osx-x64, osx-arm64, linux-x64, linux-arm64]
@@ -30,16 +30,16 @@ jobs:
 
     - name: Publish
       run: |
-        dotnet publish AliceConsole/AliceConsole.csproj -c Release -o ${{ matrix.rid }} -r ${{ matrix.rid }} --self-contained true -p:PublishReadyToRun=false -p:PublishTrimmed=true
+        dotnet publish src/AliceConsole/AliceConsole.csproj -c Release -o ${{ matrix.rid }} -r ${{ matrix.rid }} --self-contained true -p:PublishReadyToRun=false -p:PublishTrimmed=true
 
     # Not included in Artifacts
     - name: Pack
       run: |
-        dotnet pack AliceConsole/AliceConsole.csproj
+        dotnet pack src/AliceConsole/AliceConsole.csproj
 
     - name: Copy anov file
       run: |
-        cp AliceConsole/sample.anov ${{ matrix.rid }}
+        cp src/AliceConsole/sample.anov ${{ matrix.rid }}
 
     # Upload Artifacts
     - name: 'Upload Artifact: ${{ matrix.rid }}'

.github/workflows/build.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -25,4 +25,4 @@ jobs:
     - uses: actions/checkout@v4
     - name: Build
       run: |
-        dotnet build AnovSyntax/AnovSyntax.csproj -c Release
+        dotnet build AliceConsole.sln -c Release

.github/workflows/nuget.yml

@@ -21,9 +21,9 @@ jobs:
         uses: battila7/get-version-action@v2
 
       - name: Pack
-        run: dotnet pack AnovSyntax/AnovSyntax.csproj -c Release -p:PackageVersion=${{ steps.get_version.outputs.version-without-v }}
+        run: dotnet pack src/AnovSyntax/AnovSyntax.csproj -c Release -p:PackageVersion=${{ steps.get_version.outputs.version-without-v }}
 
       - name: Push
-        run: dotnet nuget push AnovSyntax/bin/Release/AliceProject.AnovSyntax.${{ steps.get_version.outputs.version-without-v }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }}
+        run: dotnet nuget push src/AnovSyntax/bin/Release/AliceProject.AnovSyntax.${{ steps.get_version.outputs.version-without-v }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }}
         env:
           GITHUB_TOKEN: ${{ secrets.NUGET_API_KEY }}

.github/workflows/test.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -25,4 +25,4 @@ jobs:
     - uses: actions/checkout@v4
     - name: Test
       run: |
-        dotnet test Test/Test.csproj
+        dotnet test AliceConsole.sln

AliceConsole.sln

@@ -3,11 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnovSyntax", "AnovSyntax\AnovSyntax.csproj", "{B0401C3C-0DD7-4064-9134-CBB7F68AE63F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliceConsole", "AliceConsole\AliceConsole.csproj", "{BCFC05BD-904F-4C84-B160-D88DF9E62401}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnovSyntax", "src\AnovSyntax\AnovSyntax.csproj", "{B0401C3C-0DD7-4064-9134-CBB7F68AE63F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{3B95FAFE-9285-4C83-BCD9-CB183C670EC9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AliceConsole", "src\AliceConsole\AliceConsole.csproj", "{BCFC05BD-904F-4C84-B160-D88DF9E62401}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnovSyntax.Tests", "tests\AnovSyntax.Tests\AnovSyntax.Tests.csproj", "{3B95FAFE-9285-4C83-BCD9-CB183C670EC9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,4 +35,9 @@ Global
 		{3B95FAFE-9285-4C83-BCD9-CB183C670EC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3B95FAFE-9285-4C83-BCD9-CB183C670EC9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{B0401C3C-0DD7-4064-9134-CBB7F68AE63F} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{BCFC05BD-904F-4C84-B160-D88DF9E62401} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{3B95FAFE-9285-4C83-BCD9-CB183C670EC9} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+	EndGlobalSection
 EndGlobal

AliceConsole/AliceConsole.csproj src/AliceConsole/AliceConsole.csprojAliceConsole/AliceConsole.csproj renamed to src/AliceConsole/AliceConsole.csproj

@@ -30,7 +30,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<None Include="../README.md">
+		<None Include="../../README.md">
 			<Pack>True</Pack>
 			<PackagePath>/</PackagePath>
 		</None>