Animation speed increase + Multiple device layout and editor (xQwexx)

.all-contributorsrc

@@ -233,8 +233,29 @@
       "profile": "https://github.com/xQwexx",
       "contributions": [
         "code"
+        "question",
+        "maintenance",
+        "doc",
+        "design",        
+        "review"    
+        "ideas"
+      ]
+    },
+    {
+      "login": "Predator4578",
+      "name": "Codename-Antares",
+      "avatar_url": "https://avatars.githubusercontent.com/Predator4578",
+      "profile": "https://github.com/Predator4578",
+      "contributions": [
+        "code"
+        "question",
+        "maintenance",
+        "doc",
+        "design",        
+        "review"    
+        "ideas"
       ]
-    }
+    }    
   ],
   "contributorsPerLine": 7
 }

.github/workflows/aurora-dev.yml

@@ -0,0 +1,87 @@
+name: Aurora CD
+
+on:
+  push:
+    branches: [ dev ]
+
+jobs:
+
+  build:
+
+    strategy:
+      matrix:
+        configuration: [Release]
+
+    runs-on: windows-2019  # For a list of available runner types, refer to
+                             # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
+
+    env:
+      Solution_Name: Project-Aurora/Project-Aurora.sln
+
+    steps:
+    - name: Generate build number
+      id: buildnumber
+      uses: einaregilsson/build-number@v3 
+      with:
+        token: ${{secrets.github_token}}
+
+    - uses: rishabhgupta/split-by@v1
+      id: split
+      with:
+        string: ${{github.repository}}
+        split-by: '/'
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        submodules: true
+
+      # Install the .NET Core workload
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+
+      # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
+    - name: Setup MSBuild.exe
+      uses: microsoft/[email protected]
+
+      # Restore the application to populate the obj folder with RuntimeIdentifiers
+    - name: Restore the application
+      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
+      env:
+        Configuration: ${{ matrix.configuration }}
+
+    - name: Build
+      run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration
+      env:
+        APPVEYOR_BUILD_VERSION: v${{steps.buildnumber.outputs.build_number}}
+        OWNER: ${{ steps.split.outputs._0 }}
+        REPOSITORY: ${{ steps.split.outputs._1 }}
+        Configuration: ${{ matrix.configuration }}
+
+    # Create the app package by building and packaging the Windows Application Packaging project
+    - name: Building the installer
+      run: |
+        "%programfiles(x86)%\Inno Setup 6\iscc.exe" /DEXTERNAL_VERSION=${{steps.buildnumber.outputs.build_number}} Installer\installer.iss
+      shell: cmd
+
+    - name: Archive Build
+      shell: pwsh
+      run: |
+        Compress-Archive .\Build\Release\* Aurora-v${{steps.buildnumber.outputs.build_number}}.zip
+
+    - name: Installer Release
+      uses: softprops/action-gh-release@v1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        target_commitish: dev
+        draft: true
+        files: |
+          Aurora-setup-v${{steps.buildnumber.outputs.build_number}}.exe
+          Aurora-v${{steps.buildnumber.outputs.build_number}}.zip
+        tag_name: v${{steps.buildnumber.outputs.build_number}}
+        allow_override: false
+        prerelease: true
+

.github/workflows/aurora-release.yml

@@ -0,0 +1,91 @@
+name: Aurora CD
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+
+  build:
+
+    strategy:
+      matrix:
+        configuration: [Release]
+
+    runs-on: windows-2019  # For a list of available runner types, refer to
+                             # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
+
+    env:
+      Solution_Name: Project-Aurora/Project-Aurora.sln
+
+    steps:
+    - name: Generate build number
+      id: buildnumber
+      uses: einaregilsson/build-number@v3 
+      with:
+        token: ${{secrets.github_token}}
+
+    - uses: rishabhgupta/split-by@v1
+      id: split
+      with:
+        string: ${{github.repository}}
+        split-by: '/'
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        submodules: true
+
+      # Install the .NET Core workload
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+
+      # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
+    - name: Setup MSBuild.exe
+      uses: microsoft/[email protected]
+
+      # Restore the application to populate the obj folder with RuntimeIdentifiers
+    - name: Restore the application
+      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
+      env:
+        Configuration: ${{ matrix.configuration }}
+
+    - name: Build
+      run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration
+      env:
+        APPVEYOR_BUILD_VERSION: v${{steps.buildnumber.outputs.build_number}}
+        OWNER: ${{ steps.split.outputs._0 }}
+        REPOSITORY: ${{ steps.split.outputs._1 }}
+        Configuration: ${{ matrix.configuration }}
+
+    # Decode the base 64 encoded pfx and save the Signing_Certificate
+    #- name: Decode the pfx
+    #  run: |
+    #    $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}")
+    #   $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx
+    #   [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
+
+    # Create the app package by building and packaging the Windows Application Packaging project
+    - name: Building the installer
+      run: |
+        "%programfiles(x86)%\Inno Setup 6\iscc.exe" /DEXTERNAL_VERSION=${{steps.buildnumber.outputs.build_number}} Installer\installer.iss
+      shell: cmd
+
+    - name: Archive Build
+      shell: pwsh
+      run: |
+        Compress-Archive .\Build\Release\* Aurora-v${{steps.buildnumber.outputs.build_number}}.zip
+
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        draft: true
+        files: |
+          Aurora-setup-v${{steps.buildnumber.outputs.build_number}}.exe
+          Aurora-v${{steps.buildnumber.outputs.build_number}}.zip
+        tag_name: v${{steps.buildnumber.outputs.build_number}}
+        allow_override: true

Project-Aurora/Aurora-Updater/Aurora-Updater.csproj

@@ -56,20 +56,20 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Project-Aurora\Project-Aurora.csproj" >
+    <ProjectReference Include="..\Project-Aurora\Project-Aurora.csproj">
       <Private>false</Private>
     </ProjectReference>
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.3</Version>
+      <Version>13.0.1</Version>
     </PackageReference>
     <PackageReference Include="Octokit">
-      <Version>0.47.0</Version>
+      <Version>0.50.0</Version>
     </PackageReference>
     <PackageReference Include="SemanticVersioning">
-      <Version>1.2.2</Version>
+      <Version>1.3.0</Version>
     </PackageReference>
   </ItemGroup>
 

Project-Aurora/Aurora-Updater/Program.cs

@@ -4,6 +4,7 @@
 using System.Security.Principal;
 using System.Windows.Forms;
 using System.Linq;
+using System.Reflection;
 using Version = SemVer.Version;
 
 namespace Aurora_Updater
@@ -82,10 +83,13 @@ static void Main(string[] args)
                         MessageBoxButtons.OK);
                 return;
             }
-            versionMajor = new Version(_maj, true);
+            versionMajor = new Version(_maj.TrimStart('v') + ".0.0", true);
+
+            string owner = FileVersionInfo.GetVersionInfo(auroraPath).CompanyName;
+            string repository = FileVersionInfo.GetVersionInfo(auroraPath).ProductName;
 
             //Initialize UpdateManager
-            StaticStorage.Manager = new UpdateManager(versionMajor);
+            StaticStorage.Manager = new UpdateManager(versionMajor, owner, repository);
 
             //Check if update retrieval was successful.
             if (StaticStorage.Manager.updateState == UpdateStatus.Error)
@@ -109,7 +113,7 @@ static void Main(string[] args)
             }
             else
             {
-                Version latestV = new Version(StaticStorage.Manager.LatestRelease.TagName.TrimStart('v'), true);
+                Version latestV = new Version(StaticStorage.Manager.LatestRelease.TagName.TrimStart('v') + ".0.0", true);
 
                 if (latestV > versionMajor)
                 {

Project-Aurora/Aurora-Updater/UpdateManager.cs

@@ -75,11 +75,11 @@ public class UpdateManager
         private GitHubClient gClient = new GitHubClient(new ProductHeaderValue("aurora-updater"));
         public Release LatestRelease;
 
-        public UpdateManager(Version version)
+        public UpdateManager(Version version, string author, string repoName)
         {
             LoadSettings();
             PerformCleanup();
-            FetchData(version);
+            FetchData(version, author, repoName);
         }
 
         public void LoadSettings()
@@ -109,20 +109,23 @@ public int GetTotalProgress()
             return (int)((downloadProgess + extractProgess) / 2.0f * 100.0f);
         }
 
-        private bool FetchData(Version version)
+        private bool FetchData(Version version, string owner, string repositoryName)
         {
             try
             {
                 if (Config.GetDevReleases || !String.IsNullOrWhiteSpace(version.PreRelease))
-                    LatestRelease = gClient.Repository.Release.GetAll("Aurora-RGB", "Aurora", new ApiOptions { PageCount = 1, PageSize = 1 }).Result[0];
+                    LatestRelease = gClient.Repository.Release.GetAll(owner, repositoryName, new ApiOptions { PageCount = 1, PageSize = 1 }).Result[0];
                 else
-                    LatestRelease = gClient.Repository.Release.GetLatest("Aurora-RGB", "Aurora").Result;
+                    LatestRelease = gClient.Repository.Release.GetLatest(owner, repositoryName).Result;
 
                 //Console.WriteLine(reply);
             }
             catch (Exception exc)
             {
                 updateState = UpdateStatus.Error;
+                MessageBox.Show(
+                    $"Could not find update.\r\nError:\r\n{exc}",
+                    "Aurora Updater - Error");
                 return false;
             }
 
@@ -242,11 +245,11 @@ private bool ExtractUpdate()
 
                     for (int i = 0; i < countOfEntries; i++)
                     {
-                        float percentage = ((float)i / (float)countOfEntries);
+                        float percentage = i / (float)countOfEntries;
 
                         var fileEntry = updateFile.Entries[i];
                         log.Enqueue(new LogEntry($"[{Math.Truncate(percentage * 100)}%] Updating: {fileEntry.FullName}"));
-                        this.extractProgess = (float)(Math.Truncate(percentage * 100) / 100.0f);
+                        extractProgess = (float)(Math.Truncate(percentage * 100) / 100.0f);
 
                         if (ignoreFiles.Contains(fileEntry.FullName))
                             continue;
@@ -256,6 +259,7 @@ private bool ExtractUpdate()
                             var filePath = Path.Combine(Program.exePath, fileEntry.FullName);
                             if (File.Exists(filePath))
                                 File.Move(filePath, $"{filePath}.updateremove");
+                            Directory.CreateDirectory(Path.GetDirectoryName(filePath));
                             fileEntry.ExtractToFile(filePath);
                         }
                         catch (IOException e)
@@ -264,7 +268,6 @@ private bool ExtractUpdate()
 
                             MessageBox.Show($"{fileEntry.FullName} is inaccessible.\r\nPlease close Aurora.\r\n\r\n {e.Message}");
                             i--;
-                            continue;
                         }
                     }