Update SDK and fix Downloads (#5)

* update software and remove unnecessary files * Updating platformtools and fix ProfilesPage * add support for both vs2019 and vs2022 * Switch to standard download mode Fixes download issues and currently removes parallel downloads. Parallel downloads seem to be limited on MS servers and they don't provide much tangible benefit at this point. * Re-add iss setup and bump version Co-authored-by: ThePixelGamer <keefjacob@gmail.com>
MinecraftZenova · Feb 27, 2022 · 56d6c70 · 56d6c70
1 parent ca006f5
commit 56d6c70
Show file tree

Hide file tree

Showing 19 changed files with 87 additions and 109 deletions.
diff --git a/ZenovaBackend/ZenovaBackend.vcxproj b/ZenovaBackend/ZenovaBackend.vcxproj
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.Windows.CppWinRT.1.0.190205.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.1.0.190205.2\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTEnabled>true</CppWinRTEnabled>
     <MinimalCoreWin>true</MinimalCoreWin>
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{b7336ba7-1e83-43d8-bd0e-3d44c6e3d4e7}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>ZenovaBackend</RootNamespace>
-    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.17763.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>ZenovaBackend</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -33,7 +32,7 @@
   </ItemGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
@@ -57,7 +56,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)\ZenovaLauncher\bin\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)ZenovaLauncher\bin\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)ZenovaLauncher\bin\$(Configuration)\</OutDir>
@@ -67,9 +67,12 @@
     <OutDir>$(SolutionDir)ZenovaLauncher\bin\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)ZenovaLauncher\bin\$(Configuration)\</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -106,37 +109,29 @@
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="readme.txt">
       <DeploymentContent>false</DeploymentContent>
     </Text>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <Midl Include="TokenBrokerInternal.idl" />
   </ItemGroup>
   <ItemGroup>
-    <Midl Include="TokenBrokerInternal.idl" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.Windows.CppWinRT.1.0.190205.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.1.0.190205.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.1.0.190205.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.1.0.190205.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.1.0.190205.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.1.0.190205.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>
diff --git a/ZenovaBackend/ZenovaBackend.vcxproj.filters b/ZenovaBackend/ZenovaBackend.vcxproj.filters
@@ -15,27 +15,19 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="readme.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Midl Include="TokenBrokerInternal.idl">
       <Filter>Source Files</Filter>
     </Midl>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
diff --git a/ZenovaBackend/main.cpp b/ZenovaBackend/main.cpp
@@ -1,5 +1,11 @@
-#include "pch.h"
-#include "combaseapi.h"
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
+#include <winrt/Windows.Security.Credentials.h>
+#include <winrt/Windows.Security.Authentication.Web.Core.h>
+#include <winrt/Windows.Security.Cryptography.h>
+#include "winrt/Windows.Internal.Security.Authentication.Web.h"
+#include <combaseapi.h>
+
 #include <thread>
 
 using namespace winrt;

diff --git a/ZenovaBackend/packages.config b/ZenovaBackend/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="1.0.190205.2" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.220131.2" targetFramework="native" />
 </packages>
diff --git a/ZenovaBackend/pch.cpp b/ZenovaBackend/pch.cpp
diff --git a/ZenovaBackend/pch.h b/ZenovaBackend/pch.h
diff --git a/ZenovaLauncher/App.xaml b/ZenovaLauncher/App.xaml
@@ -25,7 +25,6 @@
                     </ui:ThemeResources.ThemeDictionaries>
                 </ui:ThemeResources>
                 <ui:MahAppsColorPaletteResources />
-                <ResourceDictionary Source="/MahApps.Metro;component/Styles/Sizes.xaml" />
                 <ResourceDictionary Source="/MahApps.Metro;component/Styles/Fonts.xaml" />
                 <ResourceDictionary Source="/MahApps.Metro;component/Styles/Controls.GroupBox.xaml" />
                 <ResourceDictionary Source="/MahApps.Metro;component/Themes/HamburgerMenu.xaml" />

diff --git a/ZenovaLauncher/Controls/LauncherSideMenu.cs b/ZenovaLauncher/Controls/LauncherSideMenu.cs
@@ -412,7 +412,7 @@ private void ChangeItemFocusVisualStyle()
                 focusVisualStyle.Setters.Add(new Setter(Control.HorizontalAlignmentProperty, HorizontalAlignment.Left));
                 focusVisualStyle.Seal();
 
-                SetValue(ItemFocusVisualStylePropertyKey, focusVisualStyle);
+                ItemFocusVisualStyle = focusVisualStyle;
             }
         }
 

diff --git a/ZenovaLauncher/Controls/LauncherSideMenu.xaml b/ZenovaLauncher/Controls/LauncherSideMenu.xaml
@@ -339,7 +339,6 @@
         <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
         <Setter Property="OptionsItemContainerStyle" Value="{StaticResource LauncherSideMenuItem}" />
         <Setter Property="OptionsItemTemplate" Value="{StaticResource HamburgerMenuItem}" />
-        <Setter Property="PaneBackground" Value="{DynamicResource NavigationViewDefaultPaneBackground}" />
         <Setter Property="PaneForeground" Value="{DynamicResource NavigationViewItemForeground}" />
         <Setter Property="PaneHeaderMargin" Value="0 0 0 8" />
         <Setter Property="PaneMargin" Value="0 0 0 8" />

diff --git a/ZenovaLauncher/MainWindow.xaml b/ZenovaLauncher/MainWindow.xaml
@@ -106,22 +106,7 @@
         </controls:LauncherSideMenu>
 
         <Grid Grid.Column="1" Grid.RowSpan="2">
-            <ui:TransitionFrame x:Name="ContentFrame" Navigated="ContentFrame_Navigated">
-                <ui:TransitionFrame.DefaultNavigationInTransition>
-                    <ui:NavigationInTransition>
-                        <ui:NavigationInTransition.Forward>
-                            <ui:SuppressTransition />
-                        </ui:NavigationInTransition.Forward>
-                    </ui:NavigationInTransition>
-                </ui:TransitionFrame.DefaultNavigationInTransition>
-                <ui:TransitionFrame.DefaultNavigationOutTransition>
-                    <ui:NavigationOutTransition>
-                        <ui:NavigationOutTransition.Backward>
-                            <ui:SuppressTransition />
-                        </ui:NavigationOutTransition.Backward>
-                    </ui:NavigationOutTransition>
-                </ui:TransitionFrame.DefaultNavigationOutTransition>
-            </ui:TransitionFrame>
+            <ui:Frame x:Name="ContentFrame" />
         </Grid>
     </Grid>
 </Window>
diff --git a/ZenovaLauncher/MainWindow.xaml.cs b/ZenovaLauncher/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
 using MahApps.Metro.Controls;
+using ModernWpf.Media.Animation;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -60,7 +61,7 @@ private void Navigate(object item)
                 Uri navigateUri = GetNavigateUri(menuItem);
                 if (ContentFrame.CurrentSource != navigateUri)
                 {
-                    ContentFrame.Navigate(navigateUri);
+                    ContentFrame.Navigate(navigateUri, null, new SuppressNavigationTransitionInfo());
                 }
             }
         }

diff --git a/ZenovaLauncher/Pages/MainPage.xaml b/ZenovaLauncher/Pages/MainPage.xaml
@@ -29,13 +29,13 @@
             Style="{StaticResource LauncherTabControl}"
             MinHeight="400">
             <control:MyTabItem Header="Play">
-                <ui:ThemeAwareFrame Source="PlayPage.xaml" NavigationUIVisibility="Hidden" />
+                <ui:Frame Source="PlayPage.xaml" NavigationUIVisibility="Hidden" />
             </control:MyTabItem>
             <control:MyTabItem Header="Profiles">
-                <ui:ThemeAwareFrame Source="ProfilesPage.xaml" NavigationUIVisibility="Hidden" />
+                <ui:Frame Source="ProfilesPage.xaml" NavigationUIVisibility="Hidden" />
             </control:MyTabItem>
             <control:MyTabItem Header="Mods">
-                <ui:ThemeAwareFrame Source="ModsPage.xaml" NavigationUIVisibility="Hidden" />
+                <ui:Frame Source="ModsPage.xaml" NavigationUIVisibility="Hidden" />
             </control:MyTabItem>
         </control:LauncherTabControl>
     </Grid>

diff --git a/ZenovaLauncher/Pages/ModsPage.xaml.cs b/ZenovaLauncher/Pages/ModsPage.xaml.cs
@@ -11,7 +11,7 @@ namespace ZenovaLauncher
     /// <summary>
     /// Interaction logic for ModsPage.xaml
     /// </summary>
-    public partial class ModsPage : Page
+    public partial class ModsPage : System.Windows.Controls.Page
     {
         public ModsPage()
         {

diff --git a/ZenovaLauncher/Pages/ProfilesPage.xaml.cs b/ZenovaLauncher/Pages/ProfilesPage.xaml.cs
@@ -12,7 +12,7 @@ namespace ZenovaLauncher
     /// <summary>
     /// Interaction logic for ProfilesPage.xaml
     /// </summary>
-    public partial class ProfilesPage : Page
+    public partial class ProfilesPage : System.Windows.Controls.Page
     {
         public ProfilesPage()
         {

diff --git a/ZenovaLauncher/Properties/AssemblyInfo.cs b/ZenovaLauncher/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.2.1")]
+[assembly: AssemblyFileVersion("1.0.2.1")]
diff --git a/ZenovaLauncher/Styles/ComboBox.xaml b/ZenovaLauncher/Styles/ComboBox.xaml
@@ -424,7 +424,7 @@
                         </Trigger>
 
                         <!-- Focused -->
-                        <Trigger Property="ui:FocusVisualHelper.IsSystemFocusVisualVisible" Value="True">
+                        <Trigger Property="ui:FocusVisualHelper.ShowFocusVisual" Value="True">
                             <Setter TargetName="HighlightBackground" Property="Opacity" Value="1" />
                             <Setter TargetName="HighlightBackground" Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
@@ -434,7 +434,7 @@
                         <!-- FocusedPressed -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="ui:FocusVisualHelper.IsSystemFocusVisualVisible" Value="True" />
+                                <Condition Property="ui:FocusVisualHelper.ShowFocusVisual" Value="True" />
                                 <Condition SourceName="ToggleButton" Property="IsPressed" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="HighlightBackground" Property="Opacity" Value="1" />
@@ -445,7 +445,7 @@
                         <!-- FocusedDropDown -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="ui:FocusVisualHelper.IsSystemFocusVisualVisible" Value="True" />
+                                <Condition Property="ui:FocusVisualHelper.ShowFocusVisual" Value="True" />
                                 <Condition Property="IsDropDownOpen" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PopupBorder" Property="Visibility" Value="Visible" />
@@ -769,7 +769,7 @@
                         </Trigger>
 
                         <!-- Focused -->
-                        <Trigger Property="ui:FocusVisualHelper.IsSystemFocusVisualVisible" Value="True">
+                        <Trigger Property="ui:FocusVisualHelper.ShowFocusVisual" Value="True">
                             <Setter TargetName="HighlightBackground" Property="Opacity" Value="1" />
                             <Setter TargetName="HighlightBackground" Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
@@ -779,7 +779,7 @@
                         <!-- FocusedPressed -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="ui:FocusVisualHelper.IsSystemFocusVisualVisible" Value="True" />
+                                <Condition Property="ui:FocusVisualHelper.ShowFocusVisual" Value="True" />
                                 <Condition SourceName="ToggleButton" Property="IsPressed" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="HighlightBackground" Property="Opacity" Value="1" />
@@ -790,7 +790,7 @@
                         <!-- FocusedDropDown -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="ui:FocusVisualHelper.IsSystemFocusVisualVisible" Value="True" />
+                                <Condition Property="ui:FocusVisualHelper.ShowFocusVisual" Value="True" />
                                 <Condition Property="IsDropDownOpen" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PopupBorder" Property="Visibility" Value="Visible" />
@@ -1114,7 +1114,7 @@
                         </Trigger>
 
                         <!-- Focused -->
-                        <Trigger Property="ui:FocusVisualHelper.IsSystemFocusVisualVisible" Value="True">
+                        <Trigger Property="ui:FocusVisualHelper.ShowFocusVisual" Value="True">
                             <Setter TargetName="HighlightBackground" Property="Opacity" Value="1" />
                             <Setter TargetName="HighlightBackground" Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
@@ -1124,7 +1124,7 @@
                         <!-- FocusedPressed -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="ui:FocusVisualHelper.IsSystemFocusVisualVisible" Value="True" />
+                                <Condition Property="ui:FocusVisualHelper.ShowFocusVisual" Value="True" />
                                 <Condition SourceName="ToggleButton" Property="IsPressed" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="HighlightBackground" Property="Opacity" Value="1" />
@@ -1135,7 +1135,7 @@
                         <!-- FocusedDropDown -->
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="ui:FocusVisualHelper.IsSystemFocusVisualVisible" Value="True" />
+                                <Condition Property="ui:FocusVisualHelper.ShowFocusVisual" Value="True" />
                                 <Condition Property="IsDropDownOpen" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PopupBorder" Property="Visibility" Value="Visible" />