Merge pull request #73 from overdrive1708/update-library

overdrive1708 · web-flow · commit c14fefddf417 · 2024-08-31T10:28:32.000+09:00
update Prism.Wpf
diff --git a/src/Modules/SDAT.Modules.AboutInfo/SDAT.Modules.AboutInfo.csproj b/src/Modules/SDAT.Modules.AboutInfo/SDAT.Modules.AboutInfo.csproj
@@ -8,7 +8,7 @@
     <Resource Include="Resources\AppIconExe-multisize.ico" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Prism.Wpf" Version="8.1.97" />
+    <PackageReference Include="Prism.Wpf" Version="9.0.537" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\SDAT.Core\SDAT.Core.csproj" />
diff --git a/src/Modules/SDAT.Modules.AboutInfo/ViewModels/AboutInfoViewModel.cs b/src/Modules/SDAT.Modules.AboutInfo/ViewModels/AboutInfoViewModel.cs
@@ -1,5 +1,5 @@
 ﻿using Prism.Commands;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 using SDAT.Core.Mvvm;
 using SDAT.Services.Interfaces;
 using System.Collections.ObjectModel;
diff --git a/src/Modules/SDAT.Modules.CompareCLangDefine/SDAT.Modules.CompareCLangDefine.csproj b/src/Modules/SDAT.Modules.CompareCLangDefine/SDAT.Modules.CompareCLangDefine.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MaterialDesignThemes" Version="5.1.0" />
-    <PackageReference Include="Prism.Wpf" Version="8.1.97" />
+    <PackageReference Include="Prism.Wpf" Version="9.0.537" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\SDAT.Core\SDAT.Core.csproj" />
diff --git a/src/Modules/SDAT.Modules.CompareCLangDefine/ViewModels/CompareCLangDefineViewModel.cs b/src/Modules/SDAT.Modules.CompareCLangDefine/ViewModels/CompareCLangDefineViewModel.cs
@@ -1,5 +1,5 @@
 ﻿using Prism.Commands;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 using SDAT.Core.Mvvm;
 using SDAT.Services.Interfaces;
 using System;
diff --git a/src/Modules/SDAT.Modules.CompareListItem/SDAT.Modules.CompareListItem.csproj b/src/Modules/SDAT.Modules.CompareListItem/SDAT.Modules.CompareListItem.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MaterialDesignThemes" Version="5.1.0" />
-    <PackageReference Include="Prism.Wpf" Version="8.1.97" />
+    <PackageReference Include="Prism.Wpf" Version="9.0.537" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\SDAT.Core\SDAT.Core.csproj" />
diff --git a/src/Modules/SDAT.Modules.CompareListItem/ViewModels/CompareListItemViewModel.cs b/src/Modules/SDAT.Modules.CompareListItem/ViewModels/CompareListItemViewModel.cs
@@ -1,5 +1,5 @@
 ﻿using Prism.Commands;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 using SDAT.Core.Mvvm;
 using SDAT.Services.Interfaces;
 using System;
diff --git a/src/Modules/SDAT.Modules.ConvertRadix/SDAT.Modules.ConvertRadix.csproj b/src/Modules/SDAT.Modules.ConvertRadix/SDAT.Modules.ConvertRadix.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MaterialDesignThemes" Version="5.1.0" />
-    <PackageReference Include="Prism.Wpf" Version="8.1.97" />
+    <PackageReference Include="Prism.Wpf" Version="9.0.537" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\SDAT.Core\SDAT.Core.csproj" />
diff --git a/src/Modules/SDAT.Modules.ConvertRadix/ViewModels/ConvertRadixViewModel.cs b/src/Modules/SDAT.Modules.ConvertRadix/ViewModels/ConvertRadixViewModel.cs
@@ -1,5 +1,5 @@
 ﻿using Prism.Commands;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 using SDAT.Core.Mvvm;
 using SDAT.Services.Interfaces;
 
diff --git a/src/Modules/SDAT.Modules.WelcomeInfo/SDAT.Modules.WelcomeInfo.csproj b/src/Modules/SDAT.Modules.WelcomeInfo/SDAT.Modules.WelcomeInfo.csproj
@@ -5,7 +5,7 @@
     <VersionPrefix>1.0.0</VersionPrefix>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Prism.Wpf" Version="8.1.97" />
+    <PackageReference Include="Prism.Wpf" Version="9.0.537" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\SDAT.Core\SDAT.Core.csproj" />
diff --git a/src/Modules/SDAT.Modules.WelcomeInfo/ViewModels/WelcomeInfoViewModel.cs b/src/Modules/SDAT.Modules.WelcomeInfo/ViewModels/WelcomeInfoViewModel.cs
@@ -1,4 +1,4 @@
-﻿using Prism.Regions;
+﻿using Prism.Navigation.Regions;
 using SDAT.Core.Mvvm;
 
 namespace SDAT.Modules.WelcomeInfo.ViewModels
diff --git a/src/Modules/SDAT.Modules.WelcomeInfo/WelcomeInfoModule.cs b/src/Modules/SDAT.Modules.WelcomeInfo/WelcomeInfoModule.cs
@@ -1,6 +1,6 @@
 ﻿using Prism.Ioc;
 using Prism.Modularity;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 using SDAT.Core;
 
 namespace SDAT.Modules.WelcomeInfo
diff --git a/src/SDAT.Core/Mvvm/RegionViewModelBase.cs b/src/SDAT.Core/Mvvm/RegionViewModelBase.cs
@@ -1,4 +1,4 @@
-﻿using Prism.Regions;
+﻿using Prism.Navigation.Regions;
 using System;
 
 namespace SDAT.Core.Mvvm
diff --git a/src/SDAT.Core/SDAT.Core.csproj b/src/SDAT.Core/SDAT.Core.csproj
@@ -5,7 +5,7 @@
     <VersionPrefix>1.0.0</VersionPrefix>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Prism.Wpf" Version="8.1.97" />
+    <PackageReference Include="Prism.Wpf" Version="9.0.537" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Resources\Strings.Designer.cs">
diff --git a/src/SDAT/SDAT.csproj b/src/SDAT/SDAT.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="MaterialDesignThemes" Version="5.1.0" />
     <PackageReference Include="MaterialDesignThemes.MahApps" Version="3.1.0" />
-    <PackageReference Include="Prism.Unity" Version="8.1.97" />
+    <PackageReference Include="Prism.Unity" Version="9.0.537" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Modules\SDAT.Modules.AboutInfo\SDAT.Modules.AboutInfo.csproj" />
diff --git a/src/SDAT/ViewModels/MainWindowViewModel.cs b/src/SDAT/ViewModels/MainWindowViewModel.cs
@@ -1,6 +1,6 @@
 ﻿using Prism.Commands;
 using Prism.Mvvm;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 using SDAT.Core;
 
 namespace SDAT.ViewModels
@@ -68,7 +68,7 @@ private void ExecuteCommandTransitionScreen(string screenName)
             // 指定された画面に遷移する
             _regionManager.RequestNavigate(RegionNames.ContentRegion, screenName, navigationResult =>
             {
-                if (navigationResult.Result == true)
+                if (navigationResult.Success == true)
                 {
                     // 画面遷移成功時にタイトルを更新する
                     Title = screenName switch

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Prism.Regions;`
	`1`	`+using Prism.Navigation.Regions;`
`2`	`2`	`using SDAT.Core.Mvvm;`
`3`	`3`
`4`	`4`	`namespace SDAT.Modules.WelcomeInfo.ViewModels`