Skip to content

Commit 967b0f9

Browse files
committed
v1.2.0.0
1 parent 4c7e63d commit 967b0f9

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

.github/workflows/publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313

1414
runs-on: windows-latest
1515
env:
16-
output: PanoramaApp/bin/Release/net7.0-windows/win-x64/publish/
16+
output: PanoramaApp/bin/Release/net8.0-windows/win-x64/publish/
1717

1818
steps:
1919
- uses: actions/checkout@v3
2020
- name: Setup .NET
2121
uses: actions/setup-dotnet@v3
2222
with:
23-
dotnet-version: 7.0.x
23+
dotnet-version: 8.0.x
2424
- name: Publish
2525
run: dotnet publish -c Release --self-contained true -p:PublishSingleFile=true
2626
- name: Create Zip

PanoramaApp/App.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ResourceDictionary>
99
<ResourceDictionary.MergedDictionaries>
1010
<materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
11-
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
11+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
1212
</ResourceDictionary.MergedDictionaries>
1313
</ResourceDictionary>
1414
</Application.Resources>

PanoramaApp/MainWindow.xaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@
5858
<ColumnDefinition Width="*"/>
5959
<ColumnDefinition Width="auto"/>
6060
</Grid.ColumnDefinitions>
61-
<TextBlock Grid.Column="0" Text="{Binding }" Margin="0,0,10,0" VerticalAlignment="Center"/>
61+
<TextBlock Grid.Column="0" Text="{Binding }" Margin="0,0,10,0" VerticalAlignment="Center" ToolTip="{Binding }"/>
6262
<Button Grid.Column="1" Style="{StaticResource MaterialDesignFlatSecondaryMidBgButton}" Height="25" Width="39"
63-
Content="×" Command="{Binding Path=DataContext.RemoveFileCommand, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" CommandParameter="{Binding }" Cursor=""/>
63+
Content="×" Command="{Binding Path=DataContext.RemoveFileCommand, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
64+
CommandParameter="{Binding }" ToolTip="削除"/>
6465
</Grid>
6566
</DataTemplate>
6667
</ListBox.ItemTemplate>

PanoramaApp/MainWindowVM.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public partial class MainWindowVM : ObservableObject
1818
private Visibility _isOverRapperEnabled = Visibility.Hidden;
1919

2020
[RelayCommand]
21-
private async void CreatePanorama()
21+
private async Task CreatePanorama()
2222
{
2323
IsOverRapperEnabled = Visibility.Visible;
2424
IEnumerable<Mat> images = new List<Mat>();

PanoramaApp/PanoramaApp.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net7.0-windows</TargetFramework>
5+
<TargetFramework>net8.0-windows</TargetFramework>
66
<Nullable>enable</Nullable>
77
<UseWPF>true</UseWPF>
88
<ImplicitUsings>enable</ImplicitUsings>
99
<StartupObject>PanoramaApp.App</StartupObject>
10-
<Version>1.1.0.0</Version>
10+
<Version>1.2.0.0</Version>
1111
</PropertyGroup>
1212

1313
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
1414
<DebugType>none</DebugType>
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
19-
<PackageReference Include="OpenCvSharp4.Windows" Version="4.7.0.20230115" />
20-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
18+
<PackageReference Include="MaterialDesignThemes" Version="5.0.0" />
19+
<PackageReference Include="OpenCvSharp4.Windows" Version="4.9.0.20240103" />
20+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
2121
</ItemGroup>
2222

2323
</Project>

0 commit comments

Comments
 (0)