v1.2.0.0

aiueo-1234 · Apr 2, 2024 · 967b0f9 · 967b0f9
1 parent 4c7e63d
commit 967b0f9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,14 +13,14 @@ jobs:
 
         runs-on: windows-latest
         env:
-            output: PanoramaApp/bin/Release/net7.0-windows/win-x64/publish/
+            output: PanoramaApp/bin/Release/net8.0-windows/win-x64/publish/
 
         steps:
         - uses: actions/checkout@v3
         - name: Setup .NET
           uses: actions/setup-dotnet@v3
           with:
-            dotnet-version: 7.0.x
+            dotnet-version: 8.0.x
         - name: Publish
           run: dotnet publish -c Release --self-contained true -p:PublishSingleFile=true
         - name: Create Zip

diff --git a/PanoramaApp/App.xaml b/PanoramaApp/App.xaml
@@ -8,7 +8,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

diff --git a/PanoramaApp/MainWindow.xaml b/PanoramaApp/MainWindow.xaml
@@ -58,9 +58,10 @@
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="auto"/>
                                 </Grid.ColumnDefinitions>
-                                <TextBlock Grid.Column="0" Text="{Binding }" Margin="0,0,10,0" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Column="0" Text="{Binding }" Margin="0,0,10,0" VerticalAlignment="Center" ToolTip="{Binding }"/>
                                 <Button Grid.Column="1" Style="{StaticResource MaterialDesignFlatSecondaryMidBgButton}" Height="25" Width="39"
-                                    Content="×" Command="{Binding Path=DataContext.RemoveFileCommand, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"  CommandParameter="{Binding }" Cursor=""/>
+                                    Content="×" Command="{Binding Path=DataContext.RemoveFileCommand, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
+                                        CommandParameter="{Binding }" ToolTip="削除"/>
                             </Grid>
                         </DataTemplate>
                     </ListBox.ItemTemplate>

diff --git a/PanoramaApp/MainWindowVM.cs b/PanoramaApp/MainWindowVM.cs
@@ -18,7 +18,7 @@ public partial class MainWindowVM : ObservableObject
     private Visibility _isOverRapperEnabled = Visibility.Hidden;
 
     [RelayCommand]
-    private async void CreatePanorama()
+    private async Task CreatePanorama()
     {
         IsOverRapperEnabled = Visibility.Visible;
         IEnumerable<Mat> images = new List<Mat>();

diff --git a/PanoramaApp/PanoramaApp.csproj b/PanoramaApp/PanoramaApp.csproj
@@ -2,22 +2,22 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <ImplicitUsings>enable</ImplicitUsings>
     <StartupObject>PanoramaApp.App</StartupObject>
-    <Version>1.1.0.0</Version>
+    <Version>1.2.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>none</DebugType>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
-    <PackageReference Include="OpenCvSharp4.Windows" Version="4.7.0.20230115" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
+    <PackageReference Include="MaterialDesignThemes" Version="5.0.0" />
+    <PackageReference Include="OpenCvSharp4.Windows" Version="4.9.0.20240103" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
   </ItemGroup>
 
 </Project>