Major update...

- Update assets to the new AOSC OS logo design, closes #20. - Support Windows Terminal JSON fragment extension, closes #21. - Let the app declare support on Windows 10 Version 1607 (OS build 14393), though not tested on that build LOL. - Housekeeping.
AOSC-Dev · Jan 7, 2024 · 39445f2 · 39445f2
1 parent 990a49b
commit 39445f2
Show file tree

Hide file tree

Showing 56 changed files with 31 additions and 5 deletions.
diff --git a/AOSCOSLauncher-Appx/AOSCOS.appxmanifest b/AOSCOSLauncher-Appx/AOSCOS.appxmanifest
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp uap2 uap3 rescap desktop">
-  <Identity Name="20470KexyBiscuit.AOSCOSonWSL" Version="11.0.1.0" Publisher="CN=7A0EF4AF-D8E1-463F-A051-23A700957CE2" ProcessorArchitecture="x64" />
-  <mp:PhoneIdentity PhoneProductId="f9993335-1509-40e8-bd0a-a3dc8125ed92" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap uap3 desktop rescap">
+  <Identity Name="20470KexyBiscuit.AOSCOSonWSL" Version="11.1.0.0" Publisher="CN=7A0EF4AF-D8E1-463F-A051-23A700957CE2" />
   <Properties>
     <DisplayName>AOSC OS on WSL</DisplayName>
     <PublisherDisplayName>Kexy Biscuit</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+    <!-- The doc says this value is ignored, but it's a lie. This value must be correct. https://learn.microsoft.com/en-us/uwp/extension-sdks/device-families-overview#configure-your-target-device-family-version -->
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.22621.0" />
   </Dependencies>
   <Capabilities>
     <rescap:Capability Name="runFullTrust" />
@@ -29,6 +29,13 @@
             <desktop:ExecutionAlias Alias="aoscos.exe" />
           </uap3:AppExecutionAlias>
         </uap3:Extension>
+        <uap3:Extension Category="windows.appExtension">
+          <uap3:AppExtension Name="com.microsoft.windows.terminal.settings"
+                             Id="AOSCOS"
+                             DisplayName="AOSC OS on WSL"
+                             PublicFolder="Terminal">
+          </uap3:AppExtension>
+        </uap3:Extension>
       </Extensions>
     </Application>
   </Applications>

diff --git a/AOSCOSLauncher-Appx/AOSCOSLauncher-Appx.vcxproj b/AOSCOSLauncher-Appx/AOSCOSLauncher-Appx.vcxproj
@@ -8,7 +8,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.16215.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <TargetName>aoscos</TargetName>
     <ProjectName>AOSCOSLauncher-Appx</ProjectName>
@@ -100,6 +100,7 @@
     </AppxManifest>
     <None Include="AOSCOSLauncher-Appx_StoreKey.pfx" />
     <None Include="AOSCOSLauncher-Appx_TemporaryKey.pfx" />
+    <Image Include="Terminal\Fragments\terminal.json" />
   </ItemGroup>
   <ItemGroup Condition="'$(Platform)'=='x64'">
     <None Include="..\x64\install.tar.gz">

diff --git a/AOSCOSLauncher-Appx/AOSCOSLauncher-Appx.vcxproj.filters b/AOSCOSLauncher-Appx/AOSCOSLauncher-Appx.vcxproj.filters
@@ -169,6 +169,7 @@
     <Image Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-256.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Terminal\Fragments\terminal.json" />
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="AOSCOS.appxmanifest" />

diff --git a/AOSCOSLauncher-Appx/Assets/LargeTile.scale-100.png b/AOSCOSLauncher-Appx/Assets/LargeTile.scale-100.png
diff --git a/AOSCOSLauncher-Appx/Assets/LargeTile.scale-125.png b/AOSCOSLauncher-Appx/Assets/LargeTile.scale-125.png
diff --git a/AOSCOSLauncher-Appx/Assets/LargeTile.scale-150.png b/AOSCOSLauncher-Appx/Assets/LargeTile.scale-150.png
diff --git a/AOSCOSLauncher-Appx/Assets/LargeTile.scale-200.png b/AOSCOSLauncher-Appx/Assets/LargeTile.scale-200.png
diff --git a/AOSCOSLauncher-Appx/Assets/LargeTile.scale-400.png b/AOSCOSLauncher-Appx/Assets/LargeTile.scale-400.png
diff --git a/AOSCOSLauncher-Appx/Assets/SmallTile.scale-100.png b/AOSCOSLauncher-Appx/Assets/SmallTile.scale-100.png
diff --git a/AOSCOSLauncher-Appx/Assets/SmallTile.scale-125.png b/AOSCOSLauncher-Appx/Assets/SmallTile.scale-125.png
diff --git a/AOSCOSLauncher-Appx/Assets/SmallTile.scale-150.png b/AOSCOSLauncher-Appx/Assets/SmallTile.scale-150.png
diff --git a/AOSCOSLauncher-Appx/Assets/SmallTile.scale-200.png b/AOSCOSLauncher-Appx/Assets/SmallTile.scale-200.png
diff --git a/AOSCOSLauncher-Appx/Assets/SmallTile.scale-400.png b/AOSCOSLauncher-Appx/Assets/SmallTile.scale-400.png
diff --git a/AOSCOSLauncher-Appx/Assets/SplashScreen.scale-100.png b/AOSCOSLauncher-Appx/Assets/SplashScreen.scale-100.png
diff --git a/AOSCOSLauncher-Appx/Assets/SplashScreen.scale-125.png b/AOSCOSLauncher-Appx/Assets/SplashScreen.scale-125.png
diff --git a/AOSCOSLauncher-Appx/Assets/SplashScreen.scale-150.png b/AOSCOSLauncher-Appx/Assets/SplashScreen.scale-150.png
diff --git a/AOSCOSLauncher-Appx/Assets/SplashScreen.scale-200.png b/AOSCOSLauncher-Appx/Assets/SplashScreen.scale-200.png
diff --git a/AOSCOSLauncher-Appx/Assets/SplashScreen.scale-400.png b/AOSCOSLauncher-Appx/Assets/SplashScreen.scale-400.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square150x150Logo.scale-100.png b/AOSCOSLauncher-Appx/Assets/Square150x150Logo.scale-100.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square150x150Logo.scale-125.png b/AOSCOSLauncher-Appx/Assets/Square150x150Logo.scale-125.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square150x150Logo.scale-150.png b/AOSCOSLauncher-Appx/Assets/Square150x150Logo.scale-150.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square150x150Logo.scale-200.png b/AOSCOSLauncher-Appx/Assets/Square150x150Logo.scale-200.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square150x150Logo.scale-400.png b/AOSCOSLauncher-Appx/Assets/Square150x150Logo.scale-400.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png
diff --git a/...OSLauncher-Appx/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/...OSLauncher-Appx/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.scale-100.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.scale-100.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.scale-125.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.scale-125.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.scale-150.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.scale-150.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.scale-200.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.scale-200.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.scale-400.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.scale-400.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.targetsize-16.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.targetsize-16.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.targetsize-24.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.targetsize-24.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.targetsize-256.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.targetsize-256.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.targetsize-32.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.targetsize-32.png
diff --git a/AOSCOSLauncher-Appx/Assets/Square44x44Logo.targetsize-48.png b/AOSCOSLauncher-Appx/Assets/Square44x44Logo.targetsize-48.png
diff --git a/AOSCOSLauncher-Appx/Assets/StoreLogo.scale-100.png b/AOSCOSLauncher-Appx/Assets/StoreLogo.scale-100.png
diff --git a/AOSCOSLauncher-Appx/Assets/StoreLogo.scale-125.png b/AOSCOSLauncher-Appx/Assets/StoreLogo.scale-125.png
diff --git a/AOSCOSLauncher-Appx/Assets/StoreLogo.scale-150.png b/AOSCOSLauncher-Appx/Assets/StoreLogo.scale-150.png
diff --git a/AOSCOSLauncher-Appx/Assets/StoreLogo.scale-200.png b/AOSCOSLauncher-Appx/Assets/StoreLogo.scale-200.png
diff --git a/AOSCOSLauncher-Appx/Assets/StoreLogo.scale-400.png b/AOSCOSLauncher-Appx/Assets/StoreLogo.scale-400.png
diff --git a/AOSCOSLauncher-Appx/Assets/Wide310x150Logo.scale-100.png b/AOSCOSLauncher-Appx/Assets/Wide310x150Logo.scale-100.png
diff --git a/AOSCOSLauncher-Appx/Assets/Wide310x150Logo.scale-125.png b/AOSCOSLauncher-Appx/Assets/Wide310x150Logo.scale-125.png
diff --git a/AOSCOSLauncher-Appx/Assets/Wide310x150Logo.scale-150.png b/AOSCOSLauncher-Appx/Assets/Wide310x150Logo.scale-150.png
diff --git a/AOSCOSLauncher-Appx/Assets/Wide310x150Logo.scale-200.png b/AOSCOSLauncher-Appx/Assets/Wide310x150Logo.scale-200.png
diff --git a/AOSCOSLauncher-Appx/Assets/Wide310x150Logo.scale-400.png b/AOSCOSLauncher-Appx/Assets/Wide310x150Logo.scale-400.png
diff --git a/AOSCOSLauncher-Appx/Terminal/Fragments/terminal.json b/AOSCOSLauncher-Appx/Terminal/Fragments/terminal.json
@@ -0,0 +1,17 @@
+{
+    "profiles": [
+        {
+            // https://learn.microsoft.com/en-us/windows/terminal/json-fragment-extensions#how-to-determine-the-guid-of-an-existing-profile
+            "updates": "{f2ba75fb-ee3f-51dd-aa29-59ef7d36b6dc}",
+            "hidden": true
+        },
+        {
+            "name": "AOSC OS",
+            "commandline": "aoscos.exe",
+            "tabTitle": "AOSC OS",
+            // https://github.com/ubuntu/WSL/blob/981875a49f4c63079807e2212c798182bb90ea80/DistroLauncher-Appx/Terminal/Fragments/terminal.json#L14C21-L16
+            "icon": "https://releases.aosc.io/.wsl-icon.png",
+            "cursorShape": "filledBox"
+        }
+    ]
+}
diff --git a/AOSCOSLauncher/images/icon.ico b/AOSCOSLauncher/images/icon.ico
diff --git a/AOSCOSLauncher/images/icon.png b/AOSCOSLauncher/images/icon.png