Unicord Sun Valley

.github/workflows/build.yaml

@@ -0,0 +1,125 @@
+# This workflow will build, sign, and package a WinUI 3 MSIX desktop application
+# built on .NET.
+
+name: Build
+
+on:
+  push:
+    branches: [ redesign ]
+  pull_request:
+    branches: [ redesign ]
+
+jobs:
+
+  build:
+
+    strategy:
+      matrix:
+        configuration: [Release]
+
+    runs-on: windows-latest
+
+    env:
+      Solution_Name: Unicord.sln
+      Project_Name: Unicord.Universal.Package
+      Project_Name_2: Unicord.Universal
+      ProjectFile_Name: Unicord.Universal.Package/Unicord.Universal.Package.wapproj
+      BackgroundProjectFile_Name: Unicord.Universal.Background/Unicord.Universal.Background.csproj
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        fetch-depth: 0
+
+    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
+    - name: Setup MSBuild.exe
+      uses: microsoft/setup-msbuild@v2
+
+    # Restore the application to populate the obj folder with RuntimeIdentifiers
+    - name: Restore NuGet Packages
+      run: |
+        msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration /p:RuntimeIdentifier=win-x86
+        msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration /p:RuntimeIdentifier=win-x64
+        msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration /p:RuntimeIdentifier=win-arm
+      env:
+        Configuration: ${{ matrix.configuration }}
+
+    # - name: Build Background Task
+    #   run: |
+    #     msbuild $env:BackgroundProjectFile_Name /p:Configuration=$env:Configuration /p:TargetFramework=net472 /p:RuntimeIdentifier=win-x86
+    #     msbuild $env:BackgroundProjectFile_Name /p:Configuration=$env:Configuration /p:TargetFramework=net472 /p:RuntimeIdentifier=win-x64
+    #     msbuild $env:BackgroundProjectFile_Name /p:Configuration=$env:Configuration /p:TargetFramework=net472 /p:RuntimeIdentifier=win-arm
+    #   env:
+    #     Configuration: ${{ matrix.configuration }}
+
+    # Decode the base 64 encoded pfx and save the Signing_Certificate
+    - name: Load Certificate
+      run: |
+        $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.BASE64_ENCODED_PFX }}")
+        $certificatePath = "GitHubActionsWorkflow.pfx"
+        [IO.File]::WriteAllBytes("$env:Project_Name/$certificatePath", $pfx_cert_byte)
+        [IO.File]::WriteAllBytes("$env:Project_Name_2/$certificatePath", $pfx_cert_byte)
+
+    - name: Adjust Package Version
+      run: |
+        $appx = 'http://schemas.microsoft.com/appx/manifest/foundation/windows10'
+        $file = (Resolve-Path "$env:Project_Name/Package.appxmanifest")
+        $xml = [System.Xml.XmlDocument]::new()
+        $xml.Load($file)
+
+        $nsmgr = [System.Xml.XmlNamespaceManager]::new($xml.NameTable)
+        $nsmgr.AddNamespace("appx", $appx);
+
+        # adjust package version
+        $node = $xml.GetElementsByTagName("Identity", $appx)[0]
+        $version = [System.Version]::Parse($node.GetAttribute("Version"))
+
+        if ($env:Version -ne "Store") {
+          $commitDate = Get-Date (git show -s --format=%ci)
+          $epoch = ($commitDate - (Get-Date $commitDate.Date -Day 1))
+          $version = [System.Version]::new($version.Major, $version.Minor, $version.Build, $epoch.TotalMinutes);
+          $node.SetAttribute("Version", $version.ToString())
+        }
+
+        $xml.Save($file)
+
+        echo "Appx_Bundle_Version=$($version.ToString())" >> $env:GITHUB_ENV
+      env: 
+        Appx_Bundle_Version: ''
+        # Version: ${{ matrix.version }}
+        Version: ''
+
+    - name: Install legacy SDK (10.0.22621.2428)
+      run: |
+        echo Downloading...
+        curl -L https://go.microsoft.com/fwlink/?linkid=2250105 -o winsdksetup.exe
+        echo Installing...
+        ./winsdksetup.exe /features + /q
+        echo "Waiting for SDK to finish installing..."
+        Wait-Process -Name "winsdksetup"
+        echo Done!
+
+    # Create the app package by building and packaging the project
+    - name: Build App Packages
+      run: msbuild $env:Solution_Name /t:Unicord_Universal_Package /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:AppxBundlePlatforms="x86|x64|ARM" /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:AppxPackageDir="$env:Appx_Package_Dir" /p:PackageCertificateThumbprint=$env:AppxThumbprint
+      env:
+        Appx_Bundle: Always
+        Appx_Package_Build_Mode: SideloadOnly
+        Appx_Package_Dir: Packages\
+        Configuration: ${{ matrix.configuration }}
+        AppxThumbprint: ${{ secrets.PFX_THUMBPRINT }}
+
+    # Remove the pfx
+    - name: Cleanup
+      run: Remove-Item -path Unicord.Universal.Package/GitHubActionsWorkflow.pfx
+
+    # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact
+    - name: Upload Appx Package
+      uses: actions/upload-artifact@v4
+      with:
+        # name: AppxPackage-${{ env.Appx_Bundle_Version }}-${{ matrix.configuration }}-${{ matrix.version }}
+        name: AppxPackage-${{ env.Appx_Bundle_Version }}-${{ matrix.configuration }}
+        path: |
+          ${{ env.Project_Name }}\\Packages

.gitignore

@@ -184,7 +184,6 @@ publish/
 PublishScripts/
 
 # NuGet Packages
-*.nupkg
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
@@ -335,3 +334,5 @@ ASALocalRun/
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
 *.zip
+
+Output-Debug.txt

.gitmodules

@@ -1,21 +1,15 @@
 [submodule "Libraries/WamWooWam.Core"]
 	path = Libraries/WamWooWam.Core
 	url = https://github.com/WamWooWam/WamWooWam.Core
-[submodule "Libraries/Native/libsodium"]
-	path = Libraries/Native/libsodium
-	url = https://github.com/WamWooWam/libsodium
-[submodule "Libraries/Native/opus"]
-	path = Libraries/Native/opus
-	url = https://github.com/WamWooWam/opus
 [submodule "Libraries/MomentSharp"]
 	path = Libraries/MomentSharp
 	url = https://github.com/WamWooWam/MomentSharp
 [submodule "Libraries/DSharpPlus"]
 	path = Libraries/DSharpPlus
-	url = https://github.com/WamWooWam/DSharpPlus/
-[submodule "Libraries/Native/webrtc-uwp-sdk"]
-	path = Libraries/Native/webrtc-uwp-sdk
-	url = https://github.com/webrtc-uwp/webrtc-uwp-sdk.git
+	url = https://github.com/UnicordDev/DSharpPlus-Unicord/
 [submodule "Libraries/unicode.net"]
 	path = Libraries/unicode.net
 	url = https://github.com/wamwoowam/unicode.net
+[submodule "Libraries/WindowsCommunityToolkit"]
+	path = Libraries/WindowsCommunityToolkit
+	url = https://github.com/UnicordDev/WindowsCommunityToolkit