Make package point to Hub as well as Installer

This is an abandoned piece of work, but I'm just pushing it to GitHub so it can be referenced later 🙂
IviriusCommunity · Oct 8, 2024 · 6115c84 · 6115c84
1 parent 68440c6
commit 6115c84
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 18 deletions.
diff --git a/Installer/App.xaml → Installer/Entrypoint.xaml b/Installer/App.xaml → Installer/Entrypoint.xaml
diff --git a/Installer/App.xaml.cs → Installer/Entrypoint.xaml.cs b/Installer/App.xaml.cs → Installer/Entrypoint.xaml.cs
diff --git a/Installer/Rebound.Installer.csproj b/Installer/Rebound.Installer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
@@ -13,6 +13,15 @@
 
     <WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Entrypoint.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Remove="Entrypoint.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="Entrypoint.xaml" />
+  </ItemGroup>
 
   <ItemGroup>
     <Manifest Include="$(ApplicationManifest)" />

diff --git a/Installer/MainWindow.xaml → Installer/Window.xaml b/Installer/MainWindow.xaml → Installer/Window.xaml
diff --git a/Installer/MainWindow.xaml.cs → Installer/Window.xaml.cs b/Installer/MainWindow.xaml.cs → Installer/Window.xaml.cs
diff --git a/Package/Package.appxmanifest b/Package/Package.appxmanifest
@@ -8,16 +8,16 @@
   IgnorableNamespaces="uap rescap">
 
   <Identity
-    Name="6e9ac3fd-5005-4d31-b805-3d591862d51e"
-    Publisher="CN=notla"
-    Version="1.0.0.0" />
+    Name="d6ef5e04-e9da-4e22-9782-8031af8beae7"
+    Publisher="CN=Ivirius"
+    Version="0.0.3.0" />
 
-  <mp:PhoneIdentity PhoneProductId="6e9ac3fd-5005-4d31-b805-3d591862d51e" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="d6ef5e04-e9da-4e22-9782-8031af8beae7" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
-    <DisplayName>Rebound.Installer (Package)</DisplayName>
-    <PublisherDisplayName>notla</PublisherDisplayName>
-    <Logo>Images\StoreLogo.png</Logo>
+    <DisplayName>Rebound</DisplayName>
+    <PublisherDisplayName>Lenovo</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
 
   <Dependencies>
@@ -30,22 +30,48 @@
   </Resources>
 
   <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
+    <Application Id="Hub"
+      Executable="Rebound.exe"
+      EntryPoint="Rebound.App">
       <uap:VisualElements
-        DisplayName="Rebound.Installer (Package)"
-        Description="Rebound.Installer (Package)"
+        DisplayName="Rebound Hub"
+        Description="Rebound Hub"
         BackgroundColor="transparent"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Rebound\Assets\Wide310x150Logo.png"  Square71x71Logo="Rebound\Assets\SmallTile.png" Square310x310Logo="Rebound\Assets\LargeTile.png"/>
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+    <Application Id="Installer"
+      Executable="Rebound.Installer\Rebound.Installer.exe"
+      EntryPoint="Rebound.Installer.Entrypoint">
+      <uap:VisualElements
+        DisplayName="Rebound 11"
+        Description="Rebound 11"
+        BackgroundColor="transparent"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png"/>
         <uap:SplashScreen Image="Images\SplashScreen.png" />
       </uap:VisualElements>
     </Application>
   </Applications>
 
   <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
+        <rescap:Capability Name="runFullTrust" />
+        <rescap:Capability Name="broadFileSystemAccess" />
+        <rescap:Capability Name="allowElevation" />
+        <!--
+            The unvirtualizedResources capability is used to support file operations in the AppData directory.
+        -->
+        <rescap:Capability Name="unvirtualizedResources" />
+        <!--
+            The packageManagement capability is used to download updates in the sideload version of Files.
+            We only use this capability in the sideload version and remove it when compiling the store vesion in Azure DevOps.
+        -->
+        <rescap:Capability Name="packageManagement" />
+        <uap:Capability Name="removableStorage" />
+        <Capability Name="internetClient" />
   </Capabilities>
 </Package>
diff --git a/Package/Rebound.Package.wapproj b/Package/Rebound.Package.wapproj
@@ -41,7 +41,7 @@
     <AssetTargetFallback>net8.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-    <EntryPointProjectUniqueName>..\Installer\Rebound.Installer.csproj</EntryPointProjectUniqueName>
+    <EntryPointProjectUniqueName>..\Rebound\Rebound.csproj</EntryPointProjectUniqueName>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
@@ -62,6 +62,7 @@
       <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
       <PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
     </ProjectReference>
+    <ProjectReference Include="..\Rebound\Rebound.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />