コミット: 1bed29561da2c12fe6e5c172c82d2d7dbe3c4c6c - FolderCategorizer2 (git)

ファイル整理用ツールのPrism+WPFサンプル実装

コミットメタ情報

• リビジョン: 1bed29561da2c12fe6e5c172c82d2d7dbe3c4c6c (tree)
• 日時: 2023-09-30 22:39:49
• 作者: yoshy <yoshy.org.bitbucket@gz.j...>
• コミッター: yoshy

ログメッセージ

[MOD] Appプロジェクトの接尾辞 .00App を削除
[MOD] OuterEdge 配下の Behavior を Infra に移動
[MOD] アセンブリ名・ルート名前空間をプロジェクト名を置換して生成するように修正

変更サマリ

• delete: FolderCategorizer2.00App/FolderCategorizer2.00App.csproj => FolderCategorizer2/FolderCategorizer2.csproj
• modified: FolderCategorizer2.01Domain/FolderCategorizer2.01Domain.csproj
• modified: FolderCategorizer2.02UseCase/FolderCategorizer2.02UseCase.csproj
• modified: FolderCategorizer2.03Adaptor/FolderCategorizer2.03Adaptor.csproj
• modified: FolderCategorizer2.04OuterEdge/FolderCategorizer2.04OuterEdge.csproj
• modified: FolderCategorizer2.04OuterEdge/UI/View/CategorizePromptView.xaml
• modified: FolderCategorizer2.04OuterEdge/UI/View/UserPromptView.xaml
• modified: FolderCategorizer2.05Infra/AssemblyInfo.cs
• modified: FolderCategorizer2.05Infra/FolderCategorizer2.05Infra.csproj
• modified: FolderCategorizer2.sln
• delete: {FolderCategorizer2.00App => FolderCategorizer2}/App.xaml
• delete: {FolderCategorizer2.00App => FolderCategorizer2}/App.xaml.cs
• delete: {FolderCategorizer2.00App => FolderCategorizer2}/AppResource.xaml
• delete: {FolderCategorizer2.00App => FolderCategorizer2}/Core/Config/AppConfig.cs
• delete: {FolderCategorizer2.00App => FolderCategorizer2}/Core/Mapper/MapperFactory.cs
• delete: {FolderCategorizer2.00App => FolderCategorizer2}/NLog.config
• delete: {FolderCategorizer2.00App => FolderCategorizer2}/app.manifest
• delete: {FolderCategorizer2.04OuterEdge/UI => FolderCategorizer2.05Infra/Xaml}/Behavior/GotFocusSelectAllBehavior.cs
• delete: {FolderCategorizer2.04OuterEdge/UI => FolderCategorizer2.05Infra/Xaml}/Behavior/OnLoadedSelectAllBehavior.cs
• delete: {FolderCategorizer2.04OuterEdge/UI => FolderCategorizer2.05Infra/Xaml}/Behavior/OnLoadedSetFocusBehavior.cs

差分

--- a/FolderCategorizer2.01Domain/FolderCategorizer2.01Domain.csproj
+++ b/FolderCategorizer2.01Domain/FolderCategorizer2.01Domain.csproj
@@ -2,8 +2,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <UseWPF>true</UseWPF>
-    <AssemblyName>FolderCategorizer2.Domain</AssemblyName>
-    <RootNamespace>FolderCategorizer2.Domain</RootNamespace>
+	<NameRegex><![CDATA[\.[0-9]+]]></NameRegex>
+	<AssemblyName>$([System.Text.RegularExpressions.Regex]::Replace($(MSBuildProjectName),$(NameRegex),"."))</AssemblyName>
+	<RootNamespace>$(AssemblyName)</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\FolderCategorizer2.05Infra\FolderCategorizer2.05Infra.csproj" />

--- a/FolderCategorizer2.02UseCase/FolderCategorizer2.02UseCase.csproj
+++ b/FolderCategorizer2.02UseCase/FolderCategorizer2.02UseCase.csproj
@@ -4,9 +4,9 @@
     <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
-    <RootNamespace>FolderCategorizer2.UseCase</RootNamespace>
-    <AssemblyName>FolderCategorizer2.UseCase</AssemblyName>
+	<NameRegex><![CDATA[\.[0-9]+]]></NameRegex>
+	<AssemblyName>$([System.Text.RegularExpressions.Regex]::Replace($(MSBuildProjectName),$(NameRegex),"."))</AssemblyName>
+	<RootNamespace>$(AssemblyName)</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

--- a/FolderCategorizer2.03Adaptor/FolderCategorizer2.03Adaptor.csproj
+++ b/FolderCategorizer2.03Adaptor/FolderCategorizer2.03Adaptor.csproj
@@ -2,8 +2,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <UseWPF>true</UseWPF>
-    <AssemblyName>FolderCategorizer2.Adaptor</AssemblyName>
-    <RootNamespace>FolderCategorizer2.Adaptor</RootNamespace>
+	<NameRegex><![CDATA[\.[0-9]+]]></NameRegex>
+	<AssemblyName>$([System.Text.RegularExpressions.Regex]::Replace($(MSBuildProjectName),$(NameRegex),"."))</AssemblyName>
+	<RootNamespace>$(AssemblyName)</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\FolderCategorizer2.02UseCase\FolderCategorizer2.02UseCase.csproj" />

--- a/FolderCategorizer2.04OuterEdge/FolderCategorizer2.04OuterEdge.csproj
+++ b/FolderCategorizer2.04OuterEdge/FolderCategorizer2.04OuterEdge.csproj
@@ -2,8 +2,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <UseWPF>true</UseWPF>
-    <AssemblyName>FolderCategorizer2.OuterEdge</AssemblyName>
-    <RootNamespace>FolderCategorizer2.OuterEdge</RootNamespace>
+	<NameRegex><![CDATA[\.[0-9]+]]></NameRegex>
+	<AssemblyName>$([System.Text.RegularExpressions.Regex]::Replace($(MSBuildProjectName),$(NameRegex),"."))</AssemblyName>
+	<RootNamespace>$(AssemblyName)</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\FolderCategorizer2.03Adaptor\FolderCategorizer2.03Adaptor.csproj" />

--- a/FolderCategorizer2.04OuterEdge/UI/View/CategorizePromptView.xaml
+++ b/FolderCategorizer2.04OuterEdge/UI/View/CategorizePromptView.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:prism="http://prismlibrary.com/"
              xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-             xmlns:bh="clr-namespace:FolderCategorizer2.OuterEdge.UI.Behavior"
+             xmlns:bh="http://schemas.drillion.net/folderCategorizer2/behavior"
              xmlns:vm="http://schemas.drillion.net/folderCategorizer2/viewmodel"
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=vm:ICategorizePromptViewModel}"

--- a/FolderCategorizer2.04OuterEdge/UI/View/UserPromptView.xaml
+++ b/FolderCategorizer2.04OuterEdge/UI/View/UserPromptView.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:prism="http://prismlibrary.com/"
              xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-             xmlns:bh="clr-namespace:FolderCategorizer2.OuterEdge.UI.Behavior"
+             xmlns:bh="http://schemas.drillion.net/folderCategorizer2/behavior"
              xmlns:vm="http://schemas.drillion.net/folderCategorizer2/viewmodel"
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=vm:IUserPromptViewModel}"

--- a/FolderCategorizer2.05Infra/AssemblyInfo.cs
+++ b/FolderCategorizer2.05Infra/AssemblyInfo.cs
@@ -14,4 +14,5 @@ using System.Windows.Markup;
 
 [assembly: Guid("f63f7e9f-b879-470f-a987-91f744f74de7")]
 
+[assembly: XmlnsDefinition("http://schemas.drillion.net/folderCategorizer2/behavior", "FolderCategorizer2.Infra.Xaml.Behavior")]
 [assembly: XmlnsDefinition("http://schemas.drillion.net/folderCategorizer2/xaml/markup", "FolderCategorizer2.Infra.Xaml.Markup")]

--- a/FolderCategorizer2.05Infra/FolderCategorizer2.05Infra.csproj
+++ b/FolderCategorizer2.05Infra/FolderCategorizer2.05Infra.csproj
@@ -2,8 +2,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <UseWPF>true</UseWPF>
-    <AssemblyName>FolderCategorizer2.Infra</AssemblyName>
-    <RootNamespace>FolderCategorizer2.Infra</RootNamespace>
+	<NameRegex><![CDATA[\.[0-9]+]]></NameRegex>
+	<AssemblyName>$([System.Text.RegularExpressions.Regex]::Replace($(MSBuildProjectName),$(NameRegex),"."))</AssemblyName>
+	<RootNamespace>$(AssemblyName)</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Resources\Image\FolderError_256x.png" />

--- a/FolderCategorizer2.04OuterEdge/UI/Behavior/GotFocusSelectAllBehavior.cs
+++ b/FolderCategorizer2.05Infra/Xaml/Behavior/GotFocusSelectAllBehavior.cs
@@ -3,9 +3,9 @@ using NLog;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace FolderCategorizer2.OuterEdge.UI.Behavior
+namespace FolderCategorizer2.Infra.Xaml.Behavior
 {
-    internal class GotFocusSelectAllBehavior : Behavior<TextBox>
+    public class GotFocusSelectAllBehavior : Behavior<TextBox>
     {
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 

--- a/FolderCategorizer2.04OuterEdge/UI/Behavior/OnLoadedSelectAllBehavior.cs
+++ b/FolderCategorizer2.05Infra/Xaml/Behavior/OnLoadedSelectAllBehavior.cs
@@ -3,9 +3,9 @@ using NLog;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace FolderCategorizer2.OuterEdge.UI.Behavior
+namespace FolderCategorizer2.Infra.Xaml.Behavior
 {
-    internal class OnLoadedSelectAllBehavior : Behavior<TextBox>
+    public class OnLoadedSelectAllBehavior : Behavior<TextBox>
     {
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 

--- a/FolderCategorizer2.04OuterEdge/UI/Behavior/OnLoadedSetFocusBehavior.cs
+++ b/FolderCategorizer2.05Infra/Xaml/Behavior/OnLoadedSetFocusBehavior.cs
@@ -3,9 +3,9 @@ using NLog;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace FolderCategorizer2.OuterEdge.UI.Behavior
+namespace FolderCategorizer2.Infra.Xaml.Behavior
 {
-    internal class OnLoadedSetFocusBehavior : Behavior<TextBox>
+    public class OnLoadedSetFocusBehavior : Behavior<TextBox>
     {
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 

--- a/FolderCategorizer2.sln
+++ b/FolderCategorizer2.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FolderCategorizer2.00App", "FolderCategorizer2.00App\FolderCategorizer2.00App.csproj", "{F4F34524-B841-4393-83DE-7516B58AD2B2}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FolderCategorizer2.01Domain", "FolderCategorizer2.01Domain\FolderCategorizer2.01Domain.csproj", "{94876FAE-BA0C-4961-8C98-5C6D40795526}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FolderCategorizer2.02UseCase", "FolderCategorizer2.02UseCase\FolderCategorizer2.02UseCase.csproj", "{EDC87115-3518-49D5-9F3D-193A031CE5AE}"
@@ -29,16 +27,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.ObservableColle
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanAuLait.Prism.WPF", "..\CleanAuLait.Prism.WPF\CleanAuLait.Prism.WPF.csproj", "{9F83D4FE-6925-44C3-A0C4-715A7A87F13B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FolderCategorizer2", "FolderCategorizer2\FolderCategorizer2.csproj", "{06ED7A57-E285-4E59-B4EB-3354300A9DE5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F4F34524-B841-4393-83DE-7516B58AD2B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4F34524-B841-4393-83DE-7516B58AD2B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4F34524-B841-4393-83DE-7516B58AD2B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4F34524-B841-4393-83DE-7516B58AD2B2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{94876FAE-BA0C-4961-8C98-5C6D40795526}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{94876FAE-BA0C-4961-8C98-5C6D40795526}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{94876FAE-BA0C-4961-8C98-5C6D40795526}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -75,6 +71,10 @@ Global
 		{9F83D4FE-6925-44C3-A0C4-715A7A87F13B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9F83D4FE-6925-44C3-A0C4-715A7A87F13B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9F83D4FE-6925-44C3-A0C4-715A7A87F13B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06ED7A57-E285-4E59-B4EB-3354300A9DE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06ED7A57-E285-4E59-B4EB-3354300A9DE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06ED7A57-E285-4E59-B4EB-3354300A9DE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06ED7A57-E285-4E59-B4EB-3354300A9DE5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/FolderCategorizer2.00App/App.xaml.cs
+++ b/FolderCategorizer2/App.xaml.cs
@@ -208,11 +208,17 @@ namespace FolderCategorizer2
 
             // Show Application Version
 
-            AssemblyName asm = Assembly.GetExecutingAssembly().GetName();
-            Version ver = asm.Version;
+            Assembly asm = Assembly.GetExecutingAssembly();
+            AssemblyName asmInfo = asm.GetName();
 
-            logger.Info("{0} v{1}.{2}.{3}.{4} initialized.",
-                 asm.Name, ver.Major, ver.Minor, ver.Build, ver.Revision);
+            Version ver = asmInfo.Version;
+            string asmVer = $"{ver.Major}.{ver.Minor}.{ver.Build}.{ver.Revision}";
+            string infoVer = asm.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+            infoVer = asmVer.StartsWith(infoVer) ? infoVer + "-release" : infoVer;
+
+            string appVersion = $"{asmInfo.Name} v{infoVer} ({asmVer})";
+
+            logger.Info("{0} initialized.", appVersion);
 
             logger.Trace("OnStartup end");
         }

--- a/FolderCategorizer2.00App/FolderCategorizer2.00App.csproj
+++ b/FolderCategorizer2/FolderCategorizer2.csproj
@@ -2,11 +2,15 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
-    <UseWPF>true</UseWPF>
+	<VersionPrefix>1.0.0</VersionPrefix>
+	<UseWPF>true</UseWPF>
     <AssemblyName>FolderCategorizer2</AssemblyName>
 	<RootNamespace>FolderCategorizer2</RootNamespace>
 	<ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+	<VersionSuffix>pre$([System.DateTime]::Now.ToString(yyyyMMdd-HHmm))</VersionSuffix>
+  </PropertyGroup>
   <ItemGroup>
     <None Remove="C:\Users\yoshy\.nuget\packages\nlog.config\4.7.13\contentFiles\any\any\NLog.config" />
   </ItemGroup>