Support 32 bit and 64 bit windows

jmurth1234 · Jun 23, 2019 · 431ebee · 431ebee
1 parent 16ad559
commit 431ebee
Show file tree

Hide file tree

Showing 11 changed files with 449 additions and 8 deletions.
diff --git a/MainWindow.cs b/MainWindow.cs
@@ -150,10 +150,11 @@ private void MainWindow_LoadAsync(object sender, EventArgs e)
                 {
                     var json = wc.DownloadString("http://overviewer.org/downloads.json");
 
+                    bool is64 = System.Environment.Is64BitOperatingSystem;
                     JObject downloads = JObject.Parse(json);
 
-                    url = (string)downloads["win64"]["url"];
-                    version = (string)downloads["win64"]["version"];
+                    url = (string)downloads[is64 ? "win64" : "win32"]["url"];
+                    version = (string)downloads[is64 ? "win64" : "win32"]["version"];
                     ovExe = GetFile("overviewer-" + version + "\\overviewer.exe");
 
                     if (!Directory.Exists(GetFile("overviewer-" + version))) { 

diff --git a/OverviewerGUI.csproj b/OverviewerGUI.csproj
@@ -57,6 +57,24 @@
   <PropertyGroup>
     <StartupObject>OverviewerGUI.Program</StartupObject>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/OverviewerGUI.sln b/OverviewerGUI.sln
@@ -27,7 +27,8 @@ Global
 		{E0291443-66EF-4178-884F-0A601CF0A394}.Debug|x64.ActiveCfg = Debug|x86
 		{E0291443-66EF-4178-884F-0A601CF0A394}.Debug|x86.ActiveCfg = Debug|x86
 		{E0291443-66EF-4178-884F-0A601CF0A394}.Debug|x86.Build.0 = Debug|x86
-		{E0291443-66EF-4178-884F-0A601CF0A394}.Release|Any CPU.ActiveCfg = Release|x86
+		{E0291443-66EF-4178-884F-0A601CF0A394}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0291443-66EF-4178-884F-0A601CF0A394}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E0291443-66EF-4178-884F-0A601CF0A394}.Release|ARM.ActiveCfg = Release|x86
 		{E0291443-66EF-4178-884F-0A601CF0A394}.Release|ARM64.ActiveCfg = Release|x86
 		{E0291443-66EF-4178-884F-0A601CF0A394}.Release|x64.ActiveCfg = Release|x86

diff --git a/Store/AppPackages/OverviewerGUI Store_1.4.0.0_Test/OverviewerGUI Store_1.4.0.0_x86.appxsym b/Store/AppPackages/OverviewerGUI Store_1.4.0.0_Test/OverviewerGUI Store_1.4.0.0_x86.appxsym
diff --git a/Store/BundleArtifacts/Upload/x86.txt b/Store/BundleArtifacts/Upload/x86.txt
@@ -0,0 +1,2 @@
+MainPackage=C:\Users\Ryan\Source\Repos\Overviewer-GUI\Store\bin\x86\Release\Upload\OverviewerGUI Store_1.4.0.0_x86.msix
+SymbolPackage=C:\Users\Ryan\Source\Repos\Overviewer-GUI\Store\bin\x86\Release\Upload\OverviewerGUI Store_1.4.0.0\OverviewerGUI Store_1.4.0.0_x86.appxsym
diff --git a/Store/BundleArtifacts/x86.txt b/Store/BundleArtifacts/x86.txt
@@ -0,0 +1,2 @@
+MainPackage=C:\Users\Ryan\Source\Repos\Overviewer-GUI\Store\bin\x86\Release\OverviewerGUI Store_1.4.0.0_x86.msix
+SymbolPackage=C:\Users\Ryan\Source\Repos\Overviewer-GUI\Store\obj\x86\Release\Symbols\OverviewerGUI Store_1.4.0.0_x86.appxsym
diff --git a/Store/OverviewerGUI Store.wapproj b/Store/OverviewerGUI Store.wapproj
@@ -55,6 +55,42 @@
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <EntryPointProjectUniqueName>..\OverviewerGUI.csproj</EntryPointProjectUniqueName>
+    <PackageCertificateThumbprint>4642DFF1D2E72950B4DEBA59E97B209110E1E3FE</PackageCertificateThumbprint>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
+    <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
+    <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
@@ -113,6 +149,7 @@
     <Content Include="Images\Wide310x150Logo.scale-150.png" />
     <Content Include="Images\Wide310x150Logo.scale-200.png" />
     <Content Include="Images\Wide310x150Logo.scale-400.png" />
+    <None Include="Package.StoreAssociation.xml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OverviewerGUI.csproj" />

diff --git a/Store/OverviewerGUI Store.wapproj.user b/Store/OverviewerGUI Store.wapproj.user
@@ -9,6 +9,10 @@
     <AppIconSource>C:\Users\Ryan\Downloads\Untitled - Copy.png</AppIconSource>
     <SplashScreenSource>C:\Users\Ryan\Downloads\Untitled - Copy.png</SplashScreenSource>
     <PackageLogoSource>C:\Users\Ryan\Downloads\Untitled - Copy.png</PackageLogoSource>
+    <AppxShowAllApps>False</AppxShowAllApps>
+    <UapAppxPackageBuildMode>StoreOnly</UapAppxPackageBuildMode>
+    <AppxBuildConfigurationSelection>x86|x64|arm|arm64</AppxBuildConfigurationSelection>
+    <PackageOptionalProjectsInIdeBuilds>False</PackageOptionalProjectsInIdeBuilds>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
     <DebuggerFlavor>AppHostLocalDebugger</DebuggerFlavor>