diff --git a/EasyPlot.sln b/EasyPlot.sln index e464cdd..1555042 100644 --- a/EasyPlot.sln +++ b/EasyPlot.sln @@ -10,10 +10,12 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM Debug|arm64 = Debug|arm64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM Release|arm64 = Release|arm64 Release|x64 = Release|x64 Release|x86 = Release|x86 @@ -22,6 +24,9 @@ Global {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Debug|Any CPU.ActiveCfg = Debug|x64 {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Debug|Any CPU.Build.0 = Debug|x64 {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Debug|Any CPU.Deploy.0 = Debug|x64 + {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Debug|ARM.ActiveCfg = Debug|x64 + {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Debug|ARM.Build.0 = Debug|x64 + {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Debug|ARM.Deploy.0 = Debug|x64 {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Debug|arm64.ActiveCfg = Debug|arm64 {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Debug|arm64.Build.0 = Debug|arm64 {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Debug|arm64.Deploy.0 = Debug|arm64 @@ -34,6 +39,9 @@ Global {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Release|Any CPU.ActiveCfg = Release|x64 {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Release|Any CPU.Build.0 = Release|x64 {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Release|Any CPU.Deploy.0 = Release|x64 + {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Release|ARM.ActiveCfg = Release|x64 + {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Release|ARM.Build.0 = Release|x64 + {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Release|ARM.Deploy.0 = Release|x64 {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Release|arm64.ActiveCfg = Release|arm64 {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Release|arm64.Build.0 = Release|arm64 {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Release|arm64.Deploy.0 = Release|arm64 @@ -45,6 +53,8 @@ Global {B5478F20-6EEA-4E63-A93D-ABA24B059B35}.Release|x86.Deploy.0 = Release|x86 {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Debug|ARM.ActiveCfg = Debug|Any CPU + {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Debug|ARM.Build.0 = Debug|Any CPU {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Debug|arm64.ActiveCfg = Debug|arm64 {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Debug|arm64.Build.0 = Debug|arm64 {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Debug|x64.ActiveCfg = Debug|x64 @@ -53,6 +63,8 @@ Global {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Debug|x86.Build.0 = Debug|x86 {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Release|Any CPU.ActiveCfg = Release|Any CPU {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Release|Any CPU.Build.0 = Release|Any CPU + {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Release|ARM.ActiveCfg = Release|Any CPU + {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Release|ARM.Build.0 = Release|Any CPU {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Release|arm64.ActiveCfg = Release|arm64 {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Release|arm64.Build.0 = Release|arm64 {1436CA9A-B9B4-4C50-BD11-960FC8DB3CF4}.Release|x64.ActiveCfg = Release|x64 diff --git a/EasyPlot/App.xaml.cs b/EasyPlot/App.xaml.cs index a49d156..9dfb658 100644 --- a/EasyPlot/App.xaml.cs +++ b/EasyPlot/App.xaml.cs @@ -11,6 +11,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; namespace EasyPlot; @@ -87,10 +88,15 @@ public App() UnhandledException += App_UnhandledException; } - private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e) + private async void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e) { - // TODO: Log and handle exceptions as appropriate. - // https://docs.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.application.unhandledexception. + var dialog = new ContentDialog + { + Title = "不明なエラーが発生しました", + Content = $"{e.Message}\n{e.Exception.StackTrace}", + CloseButtonText = "Ok" + }; + await dialog.ShowAsync(); } protected async override void OnLaunched(LaunchActivatedEventArgs args) diff --git a/EasyPlot/EasyPlot.csproj b/EasyPlot/EasyPlot.csproj index 62b3446..8b1a017 100644 --- a/EasyPlot/EasyPlot.csproj +++ b/EasyPlot/EasyPlot.csproj @@ -1,4 +1,4 @@ - + WinExe net7.0-windows10.0.19041.0 @@ -12,7 +12,7 @@ enable enable true - True + False False False True @@ -21,6 +21,8 @@ 55C2EC7BEC9FC97A601C6229C333D4EF89E30819 True x64 + SHA256 + Never diff --git a/EasyPlot/Package.appxmanifest b/EasyPlot/Package.appxmanifest index 2fd3fd0..26eec9b 100644 --- a/EasyPlot/Package.appxmanifest +++ b/EasyPlot/Package.appxmanifest @@ -13,7 +13,7 @@ + Version="0.3.1.0" /> diff --git a/EasyPlot/Properties/launchSettings.json b/EasyPlot/Properties/launchSettings.json index 6ced450..0b9f903 100644 --- a/EasyPlot/Properties/launchSettings.json +++ b/EasyPlot/Properties/launchSettings.json @@ -2,17 +2,16 @@ "profiles": { "EasyPlot (Package)": { "commandName": "MsixPackage", - "commandLineArgs": "", /* Command line arguments to pass to the app. */ - "alwaysReinstallApp": false, /* Uninstall and then reinstall the app. All information about the app state is deleted. */ - "remoteDebugEnabled": false, /* Indicates that the debugger should attach to a process on a remote machine. */ - "allowLocalNetworkLoopbackProperty": true, /* Allow the app to make network calls to the device it is installed on. */ - "authenticationMode": "Windows", /* The authentication scheme to use when connecting to the remote machine. */ - "doNotLaunchApp": false, /* Do not launch the app, but debug my code when it starts. */ - "remoteDebugMachine": "", /* The name of the remote machine. */ - "nativeDebugging": false /* Enable debugging for managed and native code together, also known as mixed-mode debugging. */ + "alwaysReinstallApp": false, + "remoteDebugEnabled": false, + "allowLocalNetworkLoopbackProperty": true, + "authenticationMode": "Windows", + "doNotLaunchApp": false, + "remoteDebugMachine": "", + "nativeDebugging": false }, - "EasyPlot (Unpackaged)": { - "commandName": "Project" - } + "EasyPlot (Unpackaged)": { + "commandName": "Project" + } } }