diff --git a/MFACodeGenerator.sln b/MFACodeGenerator.sln
index df81915..da27d74 100644
--- a/MFACodeGenerator.sln
+++ b/MFACodeGenerator.sln
@@ -1,12 +1,14 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32825.248
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MFACodeGenerator", "MFACodeGenerator\MFACodeGenerator.csproj", "{8C1E3884-2C2E-443D-B658-1613A10EB6A5}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MFASetup", "MFASetup\MFASetup.vdproj", "{67CD3671-FAB0-4124-8C50-0756E7E35D3E}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MFACodeGenerator.MAUI", "MFACodeGenerator.MAUI\MFACodeGenerator.MAUI.csproj", "{40F6FD20-9870-45B7-BC7F-62A17D16BF61}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -19,6 +21,12 @@ Global
{8C1E3884-2C2E-443D-B658-1613A10EB6A5}.Release|Any CPU.Build.0 = Release|Any CPU
{67CD3671-FAB0-4124-8C50-0756E7E35D3E}.Debug|Any CPU.ActiveCfg = Debug
{67CD3671-FAB0-4124-8C50-0756E7E35D3E}.Release|Any CPU.ActiveCfg = Release
+ {40F6FD20-9870-45B7-BC7F-62A17D16BF61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {40F6FD20-9870-45B7-BC7F-62A17D16BF61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {40F6FD20-9870-45B7-BC7F-62A17D16BF61}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+ {40F6FD20-9870-45B7-BC7F-62A17D16BF61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {40F6FD20-9870-45B7-BC7F-62A17D16BF61}.Release|Any CPU.Build.0 = Release|Any CPU
+ {40F6FD20-9870-45B7-BC7F-62A17D16BF61}.Release|Any CPU.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/MFACodeGenerator/App.config b/MFACodeGenerator/App.config
index d1428ad..4bfa005 100644
--- a/MFACodeGenerator/App.config
+++ b/MFACodeGenerator/App.config
@@ -1,6 +1,6 @@
-
+
diff --git a/MFACodeGenerator/MFACodeGenerator.csproj b/MFACodeGenerator/MFACodeGenerator.csproj
index 83b42f5..52dcfe0 100644
--- a/MFACodeGenerator/MFACodeGenerator.csproj
+++ b/MFACodeGenerator/MFACodeGenerator.csproj
@@ -8,7 +8,7 @@
WinExe
MFACodeGenerator
MFACodeGenerator
- v4.5
+ v4.8
512
true
true
@@ -38,7 +38,8 @@
bin\Debug\
DEBUG;TRACE
prompt
- 4
+ 0
+ false
AnyCPU
@@ -50,7 +51,7 @@
4
- 25959F1C21FCA9FFDED624C1BC14F6D1248B0FDD
+ 2E1111A4FD53711C312630B995C08CA96D2A21DF
MFACodeGenerator_TemporaryKey.pfx
@@ -100,6 +101,7 @@
True
Resources.resx
+ True
diff --git a/MFACodeGenerator/Properties/Resources.Designer.cs b/MFACodeGenerator/Properties/Resources.Designer.cs
index 0ac1809..73e8af0 100644
--- a/MFACodeGenerator/Properties/Resources.Designer.cs
+++ b/MFACodeGenerator/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace MFACodeGenerator.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
diff --git a/MFACodeGenerator/Properties/Settings.Designer.cs b/MFACodeGenerator/Properties/Settings.Designer.cs
index 117d445..7125058 100644
--- a/MFACodeGenerator/Properties/Settings.Designer.cs
+++ b/MFACodeGenerator/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace MFACodeGenerator.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/MFASetup/MFASetup.vdproj b/MFASetup/MFASetup.vdproj
index 36d8abc..f3ef0dd 100644
--- a/MFASetup/MFASetup.vdproj
+++ b/MFASetup/MFASetup.vdproj
@@ -21,44 +21,44 @@
}
"Entry"
{
- "MsmKey" = "8:_7289385591163C37224C52B307236548"
+ "MsmKey" = "8:_3ED698188BC9FE0300C852FA5B313D96"
"OwnerKey" = "8:_3448545F8BC8403F8AC835455C6F131C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A4844841241A7971AE8BEC535C0E488C"
+ "MsmKey" = "8:_91CA8CFFA8E9FF58209B89C530311B3F"
"OwnerKey" = "8:_3448545F8BC8403F8AC835455C6F131C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F9DC3B7188913C7D9C455F9E96F82BB6"
+ "MsmKey" = "8:_93F203079AD02B47285EED17F29DE6F3"
"OwnerKey" = "8:_3448545F8BC8403F8AC835455C6F131C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_F9DC3B7188913C7D9C455F9E96F82BB6"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_3448545F8BC8403F8AC835455C6F131C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_A4844841241A7971AE8BEC535C0E488C"
+ "OwnerKey" = "8:_91CA8CFFA8E9FF58209B89C530311B3F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_7289385591163C37224C52B307236548"
+ "OwnerKey" = "8:_3ED698188BC9FE0300C852FA5B313D96"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_93F203079AD02B47285EED17F29DE6F3"
"MsmSig" = "8:_UNDEFINED"
}
}
@@ -79,6 +79,14 @@
"PrivateKeyFile" = "8:"
"TimeStampServer" = "8:"
"InstallerBootstrapper" = "3:2"
+ "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+ {
+ "Enabled" = "11:TRUE"
+ "PromptEnabled" = "11:TRUE"
+ "PrerequisitesLocation" = "2:1"
+ "Url" = "8:"
+ "ComponentsUrl" = "8:"
+ }
}
"Release"
{
@@ -95,6 +103,22 @@
"PrivateKeyFile" = "8:"
"TimeStampServer" = "8:"
"InstallerBootstrapper" = "3:2"
+ "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+ {
+ "Enabled" = "11:TRUE"
+ "PromptEnabled" = "11:TRUE"
+ "PrerequisitesLocation" = "2:1"
+ "Url" = "8:"
+ "ComponentsUrl" = "8:"
+ "Items"
+ {
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.8"
+ {
+ "Name" = "8:Microsoft .NET Framework 4.8 (x86 and x64)"
+ "ProductCode" = "8:.NETFramework,Version=v4.8"
+ }
+ }
+ }
}
}
"Deployable"
@@ -116,7 +140,7 @@
{
"Name" = "8:.NET Framework"
"Message" = "8:[VSDNETMSG]"
- "FrameworkVersion" = "8:.NETFramework,Version=v4.5"
+ "FrameworkVersion" = "8:.NETFramework,Version=v4.8"
"AllowLaterVersions" = "11:FALSE"
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=863262"
}
@@ -124,14 +148,14 @@
}
"File"
{
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7289385591163C37224C52B307236548"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3ED698188BC9FE0300C852FA5B313D96"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:NtpClient, Version=1.0.14.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_7289385591163C37224C52B307236548"
+ "_3ED698188BC9FE0300C852FA5B313D96"
{
"Name" = "8:NtpClient.dll"
"Attributes" = "3:512"
@@ -155,14 +179,14 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A4844841241A7971AE8BEC535C0E488C"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_91CA8CFFA8E9FF58209B89C530311B3F"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Otp.NET, Version=1.2.2.0, Culture=neutral, PublicKeyToken=38a48df817e173a6, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_A4844841241A7971AE8BEC535C0E488C"
+ "_91CA8CFFA8E9FF58209B89C530311B3F"
{
"Name" = "8:Otp.NET.dll"
"Attributes" = "3:512"
@@ -186,14 +210,14 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F9DC3B7188913C7D9C455F9E96F82BB6"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_93F203079AD02B47285EED17F29DE6F3"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+ "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ScatterAssemblies"
{
- "_F9DC3B7188913C7D9C455F9E96F82BB6"
+ "_93F203079AD02B47285EED17F29DE6F3"
{
"Name" = "8:System.Net.Http.dll"
"Attributes" = "3:512"
@@ -285,7 +309,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MFA Code Generator"
"ProductCode" = "8:{3FEA1002-739E-4B04-838F-51A39CFB0E96}"
- "PackageCode" = "8:{8B281215-4544-421F-BBF2-AA8C1FF9B4C8}"
+ "PackageCode" = "8:{6896515C-FECC-4650-991C-ACA979CF94E9}"
"UpgradeCode" = "8:{06AB1818-13F2-4C10-9B75-1DCE76562A8F}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"