Skip to content

Commit

Permalink
initial port to .net 8
Browse files Browse the repository at this point in the history
  • Loading branch information
MishaProductions committed May 28, 2024
1 parent e4661e2 commit bf30e81
Show file tree
Hide file tree
Showing 39 changed files with 5,965 additions and 634 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,16 @@ jobs:
submodules: recursive
lfs: true

- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'

- name: Restore NuGet Packages
run: nuget restore Rectify11Installer.sln

- name: Build
run: msbuild Rectify11Installer.sln /p:Configuration=Release /p:platform=x64

- name: Create single exe
run: Rectify11Installer\ILRepack.exe Rectify11Installer\bin\Release\Rectify11Installer.exe /out:Rectify11Installer\bin\output\Release\Rectify11Installer.exe Rectify11Installer\bin\Release\libmsstyle.dll Rectify11Installer\bin\Release\TaskDialog.dll
run: dotnet publish Rectify11Installer.sln --artifacts-path Rectify11Installer\bin\output\Release\

- name: Upload Rectify11Installer
uses: actions/[email protected]
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,13 @@ Rectify11.Phase2.exe
*.config
*.exe
x64/
/Rectify11Installer/Resources/Rectify11CPL.dll
Rectify11Installer/Resources/Rectify11CPL.dll
Rectify11Installer/Resources/Rectify11.Phase2.dll
Rectify11Installer/Resources/*.7z
libmsstyle/obj/
libmsstyle/bin/
**/bin/**
**/obj/**
*.tmp
*.user
!Resources
Expand Down
24 changes: 0 additions & 24 deletions Rectify11.Phase2/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
using System.Reflection;
using System.Resources;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Rectify11 Installer.2")]
[assembly: AssemblyDescription("Phase 2")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Rectify11")]
[assembly: AssemblyProduct("Rectify11Installer.2")]
[assembly: AssemblyCopyright("Copyright © 2024 The Rectify11 Team")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -21,17 +11,3 @@

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("e1a35136-c05b-419a-8715-a7187e8d31b9")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// 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("3.2.63.4")]
[assembly: AssemblyFileVersion("3.2.63.4")]
[assembly: NeutralResourcesLanguageAttribute("en")]
137 changes: 54 additions & 83 deletions Rectify11.Phase2/Rectify11.Phase2.csproj
Original file line number Diff line number Diff line change
@@ -1,85 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{8D66B017-3A76-439B-847B-C7379191E109}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Rectify11.Phase2</RootNamespace>
<AssemblyName>Rectify11.Phase2</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\Rectify11Installer\Resources\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget>
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\Rectify11Installer\Resources\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>r11.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Helper.cs" />
<Compile Include="Patches.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Variables.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Content Include="r11.ico" />
<None Include="app.manifest" />
<None Include="Resources\rectify11.xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>r11.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
<AssemblyTitle>Rectify11 Installer</AssemblyTitle>
<Description>Phase 2</Description>
<Company>Rectify11</Company>
<Product>Rectify11Installer.</Product>
<Copyright>Copyright © 2024 The Rectify11 Team</Copyright>
<AssemblyVersion>3.2.63.4</AssemblyVersion>
<FileVersion>3.2.63.4</FileVersion>
<NeutralLanguage>en</NeutralLanguage>
</PropertyGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Content Include="r11.ico" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
</ItemGroup>

<PropertyGroup>
<PostBuildEvent></PostBuildEvent>
</PropertyGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<PropertyGroup>
<PreBuildCommands>copy /Y "$(TargetPath)" "$(SolutionDir)Rectify11Installer/Resources/Rectify11.Phase2.dll"</PreBuildCommands>
</PropertyGroup>
<Exec Command="$(PreBuildCommands)" />
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
63 changes: 42 additions & 21 deletions Rectify11Installer.sln
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.7.34031.279
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rectify11Installer", "Rectify11Installer\Rectify11Installer.csproj", "{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rectify11Installer", "Rectify11Installer\Rectify11Installer.csproj", "{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}"
ProjectSection(ProjectDependencies) = postProject
{0B7DE49A-33C6-41B1-A9CE-D353031F8454} = {0B7DE49A-33C6-41B1-A9CE-D353031F8454}
{29613B61-DD82-42A1-AB39-E4FD35EADF6B} = {29613B61-DD82-42A1-AB39-E4FD35EADF6B}
{50A4AEC2-9A0D-4F1C-8F38-EE7542BBE81A} = {50A4AEC2-9A0D-4F1C-8F38-EE7542BBE81A}
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448} = {C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rectify11.Phase2", "Rectify11.Phase2\Rectify11.Phase2.csproj", "{8D66B017-3A76-439B-847B-C7379191E109}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectUI", "RectifyControlPanel2\dui70\DirectUI\DirectUI.vcxproj", "{0B7DE49A-33C6-41B1-A9CE-D353031F8454}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Rectify11CPL", "RectifyControlPanel2\Rectify11CPL\Rectify11CPL.vcxproj", "{50A4AEC2-9A0D-4F1C-8F38-EE7542BBE81A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RectifyStart", "RectifyStart\RectifyStart.vcxproj", "{29613B61-DD82-42A1-AB39-E4FD35EADF6B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libmsstyle", "libmsstyle\libmsstyle.csproj", "{2649BD15-95AC-4789-920F-CEF0988D565F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rectify11.Phase2", "Rectify11.Phase2\Rectify11.Phase2.csproj", "{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -30,33 +32,20 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Any CPU.ActiveCfg = Debug|x64
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Any CPU.Build.0 = Debug|x64
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Mixed Platforms.Build.0 = Debug|x64
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Win32.ActiveCfg = Debug|Any CPU
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|x64.ActiveCfg = Debug|Any CPU
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|x64.Build.0 = Debug|Any CPU
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|x64.ActiveCfg = Debug|x64
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|x64.Build.0 = Debug|x64
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Release|Any CPU.Build.0 = Release|Any CPU
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Release|Win32.ActiveCfg = Release|Any CPU
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Release|x64.ActiveCfg = Release|Any CPU
{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Release|x64.Build.0 = Release|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Debug|Win32.ActiveCfg = Debug|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Debug|x64.ActiveCfg = Debug|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Release|Any CPU.Build.0 = Release|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Release|Win32.ActiveCfg = Release|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Release|x64.ActiveCfg = Release|Any CPU
{8D66B017-3A76-439B-847B-C7379191E109}.Release|x64.Build.0 = Release|Any CPU
{0B7DE49A-33C6-41B1-A9CE-D353031F8454}.Debug|Any CPU.ActiveCfg = Debug|x64
{0B7DE49A-33C6-41B1-A9CE-D353031F8454}.Debug|Any CPU.Build.0 = Debug|x64
{0B7DE49A-33C6-41B1-A9CE-D353031F8454}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
Expand Down Expand Up @@ -105,6 +94,38 @@ Global
{29613B61-DD82-42A1-AB39-E4FD35EADF6B}.Release|Win32.Build.0 = Release|Win32
{29613B61-DD82-42A1-AB39-E4FD35EADF6B}.Release|x64.ActiveCfg = Release|x64
{29613B61-DD82-42A1-AB39-E4FD35EADF6B}.Release|x64.Build.0 = Release|x64
{2649BD15-95AC-4789-920F-CEF0988D565F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Debug|Win32.ActiveCfg = Debug|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Debug|Win32.Build.0 = Debug|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Debug|x64.ActiveCfg = Debug|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Debug|x64.Build.0 = Debug|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Release|Any CPU.Build.0 = Release|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Release|Win32.ActiveCfg = Release|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Release|Win32.Build.0 = Release|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Release|x64.ActiveCfg = Release|Any CPU
{2649BD15-95AC-4789-920F-CEF0988D565F}.Release|x64.Build.0 = Release|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Debug|Win32.ActiveCfg = Debug|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Debug|Win32.Build.0 = Debug|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Debug|x64.ActiveCfg = Debug|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Debug|x64.Build.0 = Debug|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Release|Any CPU.Build.0 = Release|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Release|Win32.ActiveCfg = Release|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Release|Win32.Build.0 = Release|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Release|x64.ActiveCfg = Release|Any CPU
{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion Rectify11Installer/Core/Backend/Common.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static bool CreateUninstall()

// backup
// fails anyways if you use uninstaller.exe
Helper.SafeFileOperation(Assembly.GetExecutingAssembly().Location, Path.Combine(Variables.r11Folder, "Uninstall.exe"), Helper.OperationType.Copy);
Helper.SafeFileOperation(AppDomain.CurrentDomain.BaseDirectory, Path.Combine(Variables.r11Folder, "Uninstall.exe"), Helper.OperationType.Copy);
Logger.WriteLine("Installer copied to " + Path.Combine(Variables.r11Folder, "Uninstall.exe"));

var r11key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", true)?.CreateSubKey("Rectify11", true);
Expand Down
6 changes: 3 additions & 3 deletions Rectify11Installer/Pages/ProgressPage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ private async void NavigationHelper_OnNavigate(object sender, EventArgs e)
{
Common.Cleanup();
Logger.CommitLog();
TaskDialog.Show(text: Rectify11Installer.Strings.Rectify11.r11InstallErrorPart1 + Path.Combine(Variables.r11Folder, "installer.log") + Rectify11Installer.Strings.Rectify11.r11InstallErrorPart2,
KPreisser.UI.TaskDialog.Show(text: Rectify11Installer.Strings.Rectify11.r11InstallErrorPart1 + Path.Combine(Variables.r11Folder, "installer.log") + Rectify11Installer.Strings.Rectify11.r11InstallErrorPart2,
title: "Error",
buttons: TaskDialogButtons.OK,
icon: TaskDialogStandardIcon.Error);
Expand Down Expand Up @@ -184,7 +184,7 @@ private async void NavigationHelper_OnNavigate(object sender, EventArgs e)
{
Common.Cleanup();
Logger.CommitLog();
TaskDialog.Show(text: Rectify11Installer.Strings.Rectify11.r11InstallErrorPart1 + Path.Combine(Variables.r11Folder, "installer.log") + Rectify11Installer.Strings.Rectify11.r11InstallErrorPart2,
KPreisser.UI.TaskDialog.Show(text: Rectify11Installer.Strings.Rectify11.r11InstallErrorPart1 + Path.Combine(Variables.r11Folder, "installer.log") + Rectify11Installer.Strings.Rectify11.r11InstallErrorPart2,
title: "Error",
buttons: TaskDialogButtons.OK,
icon: TaskDialogStandardIcon.Error);
Expand All @@ -199,7 +199,7 @@ private async void NavigationHelper_OnNavigate(object sender, EventArgs e)
{
Common.Cleanup();
Logger.CommitLog();
TaskDialog.Show(text: Rectify11Installer.Strings.Rectify11.r11InstallErrorPart1 + Path.Combine(Variables.r11Folder, "installer.log") + Rectify11Installer.Strings.Rectify11.r11InstallErrorPart2,
KPreisser.UI.TaskDialog.Show(text: Rectify11Installer.Strings.Rectify11.r11InstallErrorPart1 + Path.Combine(Variables.r11Folder, "installer.log") + Rectify11Installer.Strings.Rectify11.r11InstallErrorPart2,
title: "Error",
buttons: TaskDialogButtons.OK,
icon: TaskDialogStandardIcon.Error);
Expand Down
Loading

0 comments on commit bf30e81

Please sign in to comment.