diff --git a/Rectify11Installer.sln b/Rectify11Installer.sln
index 5decc6157..bc1f8558c 100644
--- a/Rectify11Installer.sln
+++ b/Rectify11Installer.sln
@@ -113,8 +113,8 @@ Global
{45F8D600-1B82-4B91-B60C-5F8D9EBFDE9E}.Debug|Mixed Platforms.Build.0 = Debug|x64
{45F8D600-1B82-4B91-B60C-5F8D9EBFDE9E}.Debug|Win32.ActiveCfg = Debug|x86
{45F8D600-1B82-4B91-B60C-5F8D9EBFDE9E}.Debug|Win32.Build.0 = Debug|x86
- {45F8D600-1B82-4B91-B60C-5F8D9EBFDE9E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {45F8D600-1B82-4B91-B60C-5F8D9EBFDE9E}.Debug|x64.Build.0 = Debug|Any CPU
+ {45F8D600-1B82-4B91-B60C-5F8D9EBFDE9E}.Debug|x64.ActiveCfg = Debug|x64
+ {45F8D600-1B82-4B91-B60C-5F8D9EBFDE9E}.Debug|x64.Build.0 = Debug|x64
{45F8D600-1B82-4B91-B60C-5F8D9EBFDE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45F8D600-1B82-4B91-B60C-5F8D9EBFDE9E}.Release|Any CPU.Build.0 = Release|Any CPU
{45F8D600-1B82-4B91-B60C-5F8D9EBFDE9E}.Release|ARM64.ActiveCfg = Release|Any CPU
@@ -133,8 +133,8 @@ Global
{FE77612F-1E5C-42CA-B3E6-14ADF64A35CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{FE77612F-1E5C-42CA-B3E6-14ADF64A35CF}.Debug|Win32.ActiveCfg = Debug|Any CPU
{FE77612F-1E5C-42CA-B3E6-14ADF64A35CF}.Debug|Win32.Build.0 = Debug|Any CPU
- {FE77612F-1E5C-42CA-B3E6-14ADF64A35CF}.Debug|x64.ActiveCfg = Debug|Any CPU
- {FE77612F-1E5C-42CA-B3E6-14ADF64A35CF}.Debug|x64.Build.0 = Debug|Any CPU
+ {FE77612F-1E5C-42CA-B3E6-14ADF64A35CF}.Debug|x64.ActiveCfg = Debug|x64
+ {FE77612F-1E5C-42CA-B3E6-14ADF64A35CF}.Debug|x64.Build.0 = Debug|x64
{FE77612F-1E5C-42CA-B3E6-14ADF64A35CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE77612F-1E5C-42CA-B3E6-14ADF64A35CF}.Release|Any CPU.Build.0 = Release|Any CPU
{FE77612F-1E5C-42CA-B3E6-14ADF64A35CF}.Release|ARM64.ActiveCfg = Release|Any CPU
diff --git a/Rectify11Installer/App.cs b/Rectify11Installer/App.cs
index 4d567fff1..50ba05adc 100644
--- a/Rectify11Installer/App.cs
+++ b/Rectify11Installer/App.cs
@@ -9,81 +9,83 @@
using WinUIForms;
using Application = Microsoft.UI.Xaml.Application;
-namespace Rectify11Installer;
-
-///
-/// C# equivalent of App.xaml
-///
-internal class App : Application, IXamlMetadataProvider
+namespace Rectify11Installer
{
- private static XamlControlsXamlMetaDataProvider? xamlMetaDataProvider = null;
- private bool _contentLoaded;
- private Window _mainWindow;
- private XamlControlsXamlMetaDataProvider _AppProvider
+ ///
+ /// C# equivalent of App.xaml
+ ///
+ internal class App : Application, IXamlMetadataProvider
{
- get
+ private static XamlControlsXamlMetaDataProvider? xamlMetaDataProvider = null;
+ private bool _contentLoaded;
+ private Window _mainWindow;
+
+ private XamlControlsXamlMetaDataProvider _AppProvider
{
- if (xamlMetaDataProvider == null)
+ get
{
- xamlMetaDataProvider = new XamlControlsXamlMetaDataProvider();
+ if (xamlMetaDataProvider == null)
+ {
+ xamlMetaDataProvider = new XamlControlsXamlMetaDataProvider();
+ }
+ return xamlMetaDataProvider;
}
- return xamlMetaDataProvider;
}
- }
-
- public App()
- {
- InitializeComponent();
- }
- public IXamlType GetXamlType(Type type)
- {
- return _AppProvider.GetXamlType(type);
- }
-
- public IXamlType GetXamlType(string fullName)
- {
- return _AppProvider.GetXamlType(fullName);
- }
-
- public XmlnsDefinition[] GetXmlnsDefinitions()
- {
- return _AppProvider.GetXmlnsDefinitions();
- }
+ public App()
+ {
+ InitializeComponent();
+ }
- public void InitializeComponent()
- {
- if (_contentLoaded)
+ public IXamlType GetXamlType(Type type)
{
- return;
+ return _AppProvider.GetXamlType(type);
}
- _contentLoaded = true;
- base.DebugSettings.BindingFailed += delegate (object sender, BindingFailedEventArgs args)
+
+ public IXamlType GetXamlType(string fullName)
{
- Debug.WriteLine(args.Message);
- };
- base.DebugSettings.XamlResourceReferenceFailed += delegate (DebugSettings sender, XamlResourceReferenceFailedEventArgs args)
+ return _AppProvider.GetXamlType(fullName);
+ }
+
+ public XmlnsDefinition[] GetXmlnsDefinitions()
{
- Debug.WriteLine(args.Message);
- };
- base.UnhandledException += delegate
+ return _AppProvider.GetXmlnsDefinitions();
+ }
+
+ public void InitializeComponent()
{
- if (Debugger.IsAttached)
+ if (_contentLoaded)
{
- Debugger.Break();
+ return;
}
- };
- }
+ _contentLoaded = true;
+ base.DebugSettings.BindingFailed += delegate (object sender, BindingFailedEventArgs args)
+ {
+ Debug.WriteLine(args.Message);
+ };
+ base.DebugSettings.XamlResourceReferenceFailed += delegate (DebugSettings sender, XamlResourceReferenceFailedEventArgs args)
+ {
+ Debug.WriteLine(args.Message);
+ };
+ base.UnhandledException += delegate
+ {
+ if (Debugger.IsAttached)
+ {
+ Debugger.Break();
+ }
+ };
+ }
- protected override void OnLaunched(LaunchActivatedEventArgs args)
- {
- base.OnLaunched(args);
+ protected override void OnLaunched(LaunchActivatedEventArgs args)
+ {
+ base.OnLaunched(args);
- this.Resources.MergedDictionaries.Add(new XamlControlsResources());
+ this.Resources.MergedDictionaries.Add(new XamlControlsResources());
- Form tmp = new FrmWizard();
- _mainWindow = tmp.ToWinUI(new MicaBackdrop());
- _mainWindow.Activate();
+ Form tmp = new FrmWizard();
+ _mainWindow = tmp.ToWinUI(new MicaBackdrop());
+ _mainWindow.Activate();
+ }
}
-}
+}
\ No newline at end of file
diff --git a/Rectify11Installer/Properties/Resources.resx b/Rectify11Installer/Properties/Resources.resx
index 046d2d1ad..60f832d07 100644
--- a/Rectify11Installer/Properties/Resources.resx
+++ b/Rectify11Installer/Properties/Resources.resx
@@ -1640,7 +1640,7 @@
..\Resources\ResourceHacker.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- ..\Resources\net7.0-windows10.0.20348.0\Rectify11.Phase2.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ ..\Resources\Rectify11.Phase2.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
..\Core\rectify11.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
diff --git a/Rectify11Installer/Rectify11Installer.csproj b/Rectify11Installer/Rectify11Installer.csproj
index 45df7e473..6d88939d3 100644
--- a/Rectify11Installer/Rectify11Installer.csproj
+++ b/Rectify11Installer/Rectify11Installer.csproj
@@ -5,30 +5,25 @@
WinExe
false
output\
- false
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 6
- 3.0.1.%2a
- false
10.0
true
true
false
true
true
+ AnyCPU;x64
+ latest
x64
true
empty.ruleset
+
+ x64
+ true
+ empty.ruleset
+
x64
none
@@ -36,6 +31,13 @@
false
On
+
+ x64
+ none
+ true
+ false
+ On
+
845D9F3BB67E632FF0863EF4126FA9373741D7B9
diff --git a/Rectify11Installer/Rectify11Installer.csproj.user b/Rectify11Installer/Rectify11Installer.csproj.user
index 4dc73d8b3..746b02bb4 100644
--- a/Rectify11Installer/Rectify11Installer.csproj.user
+++ b/Rectify11Installer/Rectify11Installer.csproj.user
@@ -21,9 +21,4 @@
Form
-
-
- Designer
-
-
\ No newline at end of file
diff --git a/Resources/Tools/rebuild_archives.bat b/Resources/Tools/rebuild_archives.bat
index 8bc4874d5..b7ce7d1d2 100644
--- a/Resources/Tools/rebuild_archives.bat
+++ b/Resources/Tools/rebuild_archives.bat
@@ -3,7 +3,7 @@ REM This script generates the files.7z, extras.7z, and themes.7z needed for the
REM load command line arguments
set SolutionDir=%1
-set ProjectDir=%2
+set ProjectDir=%2\
REM Validate command line
if not exist %SolutionDir% (