Commit: master - TestNarou3 (git)

なろうブックマーク分析用ツールのPrism+WinUI3サンプル実装

Commit MetaInfo

• Revision: 91b05482e5b7288185c0f453ccfc74c20099b04b (tree)
• Time: 2023-09-30 19:37:53
• Author: yoshy <yoshy.org.bitbucket@gz.j...>
• Commiter: yoshy

Log Message

[MOD] プロジェクト間の依存関係、外部パッケージへの依存関係の修正
[UPG] ClearAuLaitのCaptionFormatterの変更に伴う修正

Change Summary

• modified: TestNarou3.Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
• modified: TestNarou3.Adaptor/TestNarou3.30Adaptor.csproj
• modified: TestNarou3.Domain/TestNarou3.10Domain.csproj
• modified: TestNarou3.Infra/TestNarou3.90Infra.csproj
• modified: TestNarou3.OuterEdge/TestNarou3.40OuterEdge.csproj
• modified: TestNarou3.UseCase/TestNarou3.20UseCase.csproj
• modified: TestNarou3.sln
• modified: TestNarou3/Assets/message.properties

Incremental Difference

--- a/TestNarou3.Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
@@ -31,7 +31,7 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
             this.wc = wc;
             this.rm = rm;
 
-            this.Title = new ReactiveProperty<string>(caption.GetCaption()).AddTo(disposables);
+            this.Title = new ReactiveProperty<string>(caption.GetDefaultCaption()).AddTo(disposables);
         }
 
         public void OnClosing()

--- a/TestNarou3.Adaptor/TestNarou3.30Adaptor.csproj
+++ b/TestNarou3.Adaptor/TestNarou3.30Adaptor.csproj
@@ -11,7 +11,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\TestNarou3.Infra\TestNarou3.90Infra.csproj" />
     <ProjectReference Include="..\TestNarou3.UseCase\TestNarou3.20UseCase.csproj" />
   </ItemGroup>
 </Project>

--- a/TestNarou3.Domain/TestNarou3.10Domain.csproj
+++ b/TestNarou3.Domain/TestNarou3.10Domain.csproj
@@ -11,11 +11,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.4" />
-	<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
-  </ItemGroup>
-
-  <ItemGroup>
     <ProjectReference Include="..\TestNarou3.Infra\TestNarou3.90Infra.csproj" />
   </ItemGroup>
 </Project>

--- a/TestNarou3.Infra/TestNarou3.90Infra.csproj
+++ b/TestNarou3.Infra/TestNarou3.90Infra.csproj
@@ -10,12 +10,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.4" />
-      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
-      <PackageReference Include="ReactiveProperty" Version="8.1.2" />
-  </ItemGroup>
-
-  <ItemGroup>
     <ProjectReference Include="..\..\CleanAuLait.ObservableCollectionsMod\CleanAuLait.ObservableCollectionsMod.csproj" />
     <ProjectReference Include="..\..\CleanAuLait.Prism.WinUI3\CleanAuLait.Prism.WinUI3.csproj" />
   </ItemGroup>

--- a/TestNarou3.OuterEdge/TestNarou3.40OuterEdge.csproj
+++ b/TestNarou3.OuterEdge/TestNarou3.40OuterEdge.csproj
@@ -18,11 +18,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.8" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TestNarou3.Adaptor\TestNarou3.30Adaptor.csproj" />
-    <ProjectReference Include="..\TestNarou3.Infra\TestNarou3.90Infra.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Page Update="UI\View\MainWindowView.xaml">

--- a/TestNarou3.UseCase/TestNarou3.20UseCase.csproj
+++ b/TestNarou3.UseCase/TestNarou3.20UseCase.csproj
@@ -11,12 +11,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.4" />
-	<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
-  </ItemGroup>
-
-  <ItemGroup>
     <ProjectReference Include="..\TestNarou3.Domain\TestNarou3.10Domain.csproj" />
-    <ProjectReference Include="..\TestNarou3.Infra\TestNarou3.90Infra.csproj" />
   </ItemGroup>
 </Project>

--- a/TestNarou3.sln
+++ b/TestNarou3.sln
@@ -27,8 +27,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestNarou3.20UseCase", "Tes
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.ObservableCollectionsMod", "..\CleanAuLait.ObservableCollectionsMod\CleanAuLait.ObservableCollectionsMod.csproj", "{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObservableCollections", "D:\Repo\gitroot\ObservableCollectionsMod\src\ObservableCollections\ObservableCollections.csproj", "{73A95F88-084E-40E2-8C7B-2324AA8A9E81}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -241,22 +239,6 @@ Global
 		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Release|x64.Build.0 = Release|Any CPU
 		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Release|x86.ActiveCfg = Release|Any CPU
 		{B9BA0032-9C0E-4B3A-A646-8280D64EF45B}.Release|x86.Build.0 = Release|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Debug|arm64.Build.0 = Debug|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Debug|x64.Build.0 = Debug|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Debug|x86.Build.0 = Debug|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Release|arm64.ActiveCfg = Release|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Release|arm64.Build.0 = Release|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Release|x64.ActiveCfg = Release|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Release|x64.Build.0 = Release|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Release|x86.ActiveCfg = Release|Any CPU
-		{73A95F88-084E-40E2-8C7B-2324AA8A9E81}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/TestNarou3/Assets/message.properties
+++ b/TestNarou3/Assets/message.properties
@@ -1,5 +1,5 @@
 Caption = テストなろう３
-Caption.Info = {0} - 通知
-Caption.Warn = {0} - 警告
-Caption.Error = {0} - エラー
-Caption.Exception = {0} - {1}
+Caption.Format.Info = {0} - 通知
+Caption.Format.Warn = {0} - 警告
+Caption.Format.Error = {0} - エラー
+Caption.Format.Exception = {0} - {1}
\ No newline at end of file