diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 05b14d15..2574f007 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -12,10 +12,10 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] + os: [windows-latest] include: - - os: ubuntu-20.04 - target: Linux + - os: windows-latest + target: Windows steps: - uses: actions/checkout@v3 @@ -78,6 +78,7 @@ jobs: dotnet pack Cosmos.Core_Asm/Cosmos.Core_Asm.csproj --output c:\packages dotnet pack Cosmos.HAL2/Cosmos.HAL2.csproj --output c:\packages dotnet pack Cosmos.System2/Cosmos.System2.csproj --output c:\packages + dotnet pack Cosmos.Plugs/Cosmos.Plugs.csproj --output c:\packages dotnet pack Cosmos.System2_Plugs/Cosmos.System2_Plugs.csproj --output c:\packages dotnet pack Cosmos.Debug.Kernel/Cosmos.Debug.Kernel.csproj --output c:\packages dotnet pack Cosmos.Debug.Kernel.Plugs.Asm/Cosmos.Debug.Kernel.Plugs.Asm.csproj --output c:\packages @@ -106,6 +107,7 @@ jobs: Copy-Item -Path "Cosmos\Cosmos\source\Cosmos.System2\bin\Debug\net6.0\*" -Destination "C:\Users\runneradmin\AppData\Roaming\Cosmos User Kit\Kernel\" -Force Copy-Item -Path "Cosmos\Cosmos\source\Cosmos.HAL2\bin\Debug\net6.0\*" -Destination "C:\Users\runneradmin\AppData\Roaming\Cosmos User Kit\Kernel\" -Force Copy-Item -Path "Cosmos\Cosmos\source\Cosmos.System2_Plugs\bin\Debug\net6.0\*" -Destination "C:\Users\runneradmin\AppData\Roaming\Cosmos User Kit\Kernel\" -Force + Copy-Item -Path "Cosmos\Cosmos\source\Cosmos.Plugs\bin\Debug\net6.0\*" -Destination "C:\Users\runneradmin\AppData\Roaming\Cosmos User Kit\Kernel\" -Force Copy-Item -Path "Cosmos\Cosmos\source\Cosmos.Debug.Kernel\bin\Debug\netstandard2.0\*" -Destination "C:\Users\runneradmin\AppData\Roaming\Cosmos User Kit\Kernel\" -Force Copy-Item -Path "Cosmos\Cosmos\source\Cosmos.Debug.Kernel.Plugs.Asm\bin\Debug\netstandard2.0\*" -Destination "C:\Users\runneradmin\AppData\Roaming\Cosmos User Kit\Kernel\" -Force - name: Restore dependancies @@ -113,6 +115,12 @@ jobs: cd "SRC" dotnet restore - name: Build Aura Operating System + if: ${{ matrix.os == 'windows-latest' }} + run: | + cd "SRC" + dotnet build + - name: Build Aura Operating System + if: ${{ matrix.os == 'ubuntu-20.04' }} run: | cd "SRC" - sudo dotnet build --no-restore + sudo dotnet build diff --git a/SRC/Aura_Boot/Aura_Boot.csproj b/SRC/Aura_Boot/Aura_Boot.csproj index 6efb4b93..9497f0b1 100644 --- a/SRC/Aura_Boot/Aura_Boot.csproj +++ b/SRC/Aura_Boot/Aura_Boot.csproj @@ -1,53 +1,53 @@  - - net6.0 - True - VMware - ELF - False - MethodFooters - ISO - False - Source - False - bin\Debug\net6.0\Aura_Boot.iso - False - False - VMware - Pipe: Cosmos\Serial - Serial: COM1 - Workstation - False - False - 1920x1080x32 - 3 - 0 - True - Gzip - + + net6.0 + True + VMware + ELF + False + MethodFooters + ISO + False + Source + False + bin\Debug\net6.0\Aura_Boot.iso + False + False + VMware + Pipe: Cosmos\Serial + Serial: COM1 + Workstation + False + False + 1920x1080x32 + 3 + 0 + True + Gzip + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + diff --git a/SRC/Aura_OS/Aura_OS.csproj b/SRC/Aura_OS/Aura_OS.csproj index 8b3d74ba..33f6b97a 100644 --- a/SRC/Aura_OS/Aura_OS.csproj +++ b/SRC/Aura_OS/Aura_OS.csproj @@ -1,9 +1,9 @@  - - net6.0 + + net6.0 TRACE;NOASYNC - + $([System.DateTime]::Now.ToString("yyyy")) @@ -24,23 +24,23 @@ - + - - - - - + + + + + - - - - + + + + - - - + + + diff --git a/SRC/Aura_OS/Properties/VersionInfo.cs b/SRC/Aura_OS/Properties/VersionInfo.cs index 15636bd6..92a5dddc 100644 --- a/SRC/Aura_OS/Properties/VersionInfo.cs +++ b/SRC/Aura_OS/Properties/VersionInfo.cs @@ -2,6 +2,6 @@ namespace Aura_OS { public class VersionInfo { - public static string revision = "060220241610"; + public static string revision = "060220241709"; } }