From ec4c3e94ed27fdacbbe6c12bc955250e8dc4b875 Mon Sep 17 00:00:00 2001
From: heku <heku.git@outlook.com>
Date: Sat, 18 Mar 2023 15:45:14 +0800
Subject: [PATCH] refactor

---
 Kool.VsDiff.2019/Kool.VsDiff.2019.csproj       | 18 ++++++++++++------
 Kool.VsDiff.2022/Kool.VsDiff.2022.csproj       | 18 ++++++++++++------
 ...{VSPackage.Designer.cs => I18n.Designer.cs} |  8 +++-----
 .../{VSPackage.en.resx => I18n.en.resx}        |  0
 Kool.VsDiff.Linked/{VSPackage.tt => I18n.tt}   |  3 +--
 ...SPackage.zh-Hans.resx => I18n.zh-Hans.resx} |  0
 Kool.VsDiff.Shared/Commands/BaseCommand.cs     |  2 +-
 .../Pages/VsDiffOptionsPage.xaml               | 16 ++++++++--------
 .../Pages/VsDiffOptionsPage.xaml.cs            |  2 +-
 9 files changed, 38 insertions(+), 29 deletions(-)
 rename Kool.VsDiff.Linked/{VSPackage.Designer.cs => I18n.Designer.cs} (90%)
 rename Kool.VsDiff.Linked/{VSPackage.en.resx => I18n.en.resx} (100%)
 rename Kool.VsDiff.Linked/{VSPackage.tt => I18n.tt} (90%)
 rename Kool.VsDiff.Linked/{VSPackage.zh-Hans.resx => I18n.zh-Hans.resx} (100%)

diff --git a/Kool.VsDiff.2019/Kool.VsDiff.2019.csproj b/Kool.VsDiff.2019/Kool.VsDiff.2019.csproj
index a122d64..6e8eed7 100644
--- a/Kool.VsDiff.2019/Kool.VsDiff.2019.csproj
+++ b/Kool.VsDiff.2019/Kool.VsDiff.2019.csproj
@@ -57,18 +57,18 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Kool.VsDiff.Linked\VSPackage.Designer.cs" Link="VSPackage.Designer.cs">
+    <Compile Include="..\Kool.VsDiff.Linked\I18n.Designer.cs" Link="I18n.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>VSPackage.tt</DependentUpon>
+      <DependentUpon>I18n.tt</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="source.extension.vsixmanifest" />
     <None Include="..\Kool.VsDiff.Linked\Menus.vsct" Link="Menus.vsct" />
-    <None Include="..\Kool.VsDiff.Linked\VSPackage.tt" Link="VSPackage.tt">
+    <None Include="..\Kool.VsDiff.Linked\I18n.tt" Link="I18n.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>VSPackage.Designer.cs</LastGenOutput>
+      <LastGenOutput>I18n.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
   <ItemGroup>
@@ -79,18 +79,24 @@
   <ItemGroup>
     <VSCTCompile Include="..\Kool.VsDiff.Linked\Menus.en.vsct" Link="Menus.en.vsct">
       <ResourceName>Menus.ctmenu</ResourceName>
+      <DependentUpon>Menus.vsct</DependentUpon>
     </VSCTCompile>
     <VSCTCompile Include="..\Kool.VsDiff.Linked\Menus.zh-Hans.vsct" Link="Menus.zh-Hans.vsct">
       <ResourceName>Menus.ctmenu</ResourceName>
+      <DependentUpon>Menus.vsct</DependentUpon>
     </VSCTCompile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Kool.VsDiff.Linked\VSPackage.en.resx" Link="VSPackage.en.resx">
+    <EmbeddedResource Include="..\Kool.VsDiff.Linked\I18n.en.resx" Link="I18n.en.resx">
       <MergeWithCTO>true</MergeWithCTO>
+      <LogicalName>VSPackage.en.resources</LogicalName>
+      <DependentUpon>I18n.tt</DependentUpon>      
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\Kool.VsDiff.Linked\VSPackage.zh-Hans.resx" Link="VSPackage.zh-Hans.resx">
+    <EmbeddedResource Include="..\Kool.VsDiff.Linked\I18n.zh-Hans.resx" Link="I18n.zh-Hans.resx">
       <MergeWithCTO>true</MergeWithCTO>
+      <LogicalName>VSPackage.zh-Hans.resources</LogicalName>
+      <DependentUpon>I18n.tt</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/Kool.VsDiff.2022/Kool.VsDiff.2022.csproj b/Kool.VsDiff.2022/Kool.VsDiff.2022.csproj
index cf61b0e..2c0625c 100644
--- a/Kool.VsDiff.2022/Kool.VsDiff.2022.csproj
+++ b/Kool.VsDiff.2022/Kool.VsDiff.2022.csproj
@@ -57,18 +57,18 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Kool.VsDiff.Linked\VSPackage.Designer.cs" Link="VSPackage.Designer.cs">
+    <Compile Include="..\Kool.VsDiff.Linked\I18n.Designer.cs" Link="I18n.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>VSPackage.tt</DependentUpon>
+      <DependentUpon>I18n.tt</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="source.extension.vsixmanifest" />
     <None Include="..\Kool.VsDiff.Linked\Menus.vsct" Link="Menus.vsct" />
-    <None Include="..\Kool.VsDiff.Linked\VSPackage.tt" Link="VSPackage.tt">
+    <None Include="..\Kool.VsDiff.Linked\I18n.tt" Link="I18n.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>VSPackage.Designer.cs</LastGenOutput>
+      <LastGenOutput>I18n.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
   <ItemGroup>
@@ -79,18 +79,24 @@
   <ItemGroup>
     <VSCTCompile Include="..\Kool.VsDiff.Linked\Menus.en.vsct" Link="Menus.en.vsct">
       <ResourceName>Menus.ctmenu</ResourceName>
+      <DependentUpon>Menus.vsct</DependentUpon>
     </VSCTCompile>
     <VSCTCompile Include="..\Kool.VsDiff.Linked\Menus.zh-Hans.vsct" Link="Menus.zh-Hans.vsct">
       <ResourceName>Menus.ctmenu</ResourceName>
+      <DependentUpon>Menus.vsct</DependentUpon>
     </VSCTCompile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Kool.VsDiff.Linked\VSPackage.en.resx" Link="VSPackage.en.resx">
+    <EmbeddedResource Include="..\Kool.VsDiff.Linked\I18n.en.resx" Link="I18n.en.resx">
       <MergeWithCTO>true</MergeWithCTO>
+      <LogicalName>VSPackage.en.resources</LogicalName>
+      <DependentUpon>I18n.tt</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\Kool.VsDiff.Linked\VSPackage.zh-Hans.resx" Link="VSPackage.zh-Hans.resx">
+    <EmbeddedResource Include="..\Kool.VsDiff.Linked\I18n.zh-Hans.resx" Link="I18n.zh-Hans.resx">
       <MergeWithCTO>true</MergeWithCTO>
+      <LogicalName>VSPackage.zh-Hans.resources</LogicalName>
+      <DependentUpon>I18n.tt</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/Kool.VsDiff.Linked/VSPackage.Designer.cs b/Kool.VsDiff.Linked/I18n.Designer.cs
similarity index 90%
rename from Kool.VsDiff.Linked/VSPackage.Designer.cs
rename to Kool.VsDiff.Linked/I18n.Designer.cs
index ddd2f3a..7dafc93 100644
--- a/Kool.VsDiff.Linked/VSPackage.Designer.cs
+++ b/Kool.VsDiff.Linked/I18n.Designer.cs
@@ -1,6 +1,4 @@
-
-
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This file was generated by T4 Template.
 // </auto-generated>
@@ -13,9 +11,9 @@ namespace Kool.VsDiff
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings.
     /// </summary>
-    static class VSPackage
+    static class I18n
     {
-        static readonly ResourceManager Resx = new ResourceManager("Kool.VsDiff.VSPackage", typeof(VSPackage).Assembly);
+        static readonly ResourceManager Resx = new ResourceManager("VSPackage", typeof(I18n).Assembly);
 
         public static string _110 { get; } = Resx.GetString("110");
         public static string _112 { get; } = Resx.GetString("112");
diff --git a/Kool.VsDiff.Linked/VSPackage.en.resx b/Kool.VsDiff.Linked/I18n.en.resx
similarity index 100%
rename from Kool.VsDiff.Linked/VSPackage.en.resx
rename to Kool.VsDiff.Linked/I18n.en.resx
diff --git a/Kool.VsDiff.Linked/VSPackage.tt b/Kool.VsDiff.Linked/I18n.tt
similarity index 90%
rename from Kool.VsDiff.Linked/VSPackage.tt
rename to Kool.VsDiff.Linked/I18n.tt
index 9c175fe..4fefa46 100644
--- a/Kool.VsDiff.Linked/VSPackage.tt
+++ b/Kool.VsDiff.Linked/I18n.tt
@@ -11,7 +11,6 @@ const string BenchmarkLanguage = "en";
 
 var resourceNameWithoutCulture = Path.GetFileNameWithoutExtension(Host.TemplateFile);
 var resourceNamespace = Host.ResolveParameterValue("directiveId", "namespaceDirectiveProcessor", "namespaceHint") ?? string.Empty;
-var resourceFullNameWithoutCulture = resourceNamespace + "." + resourceNameWithoutCulture;
 #>
 
 // ------------------------------------------------------------------------------
@@ -29,7 +28,7 @@ namespace <#= resourceNamespace#>
     /// </summary>
     static class <#= resourceNameWithoutCulture#>
     {
-        static readonly ResourceManager Resx = new ResourceManager("<#= resourceFullNameWithoutCulture#>", typeof(<#= resourceNameWithoutCulture#>).Assembly);
+        static readonly ResourceManager Resx = new ResourceManager("VSPackage", typeof(<#= resourceNameWithoutCulture#>).Assembly);
 
 <#
 var resx = Path.ChangeExtension(Host.TemplateFile , BenchmarkLanguage + ".resx");
diff --git a/Kool.VsDiff.Linked/VSPackage.zh-Hans.resx b/Kool.VsDiff.Linked/I18n.zh-Hans.resx
similarity index 100%
rename from Kool.VsDiff.Linked/VSPackage.zh-Hans.resx
rename to Kool.VsDiff.Linked/I18n.zh-Hans.resx
diff --git a/Kool.VsDiff.Shared/Commands/BaseCommand.cs b/Kool.VsDiff.Shared/Commands/BaseCommand.cs
index 58c6478..f8fc3b6 100644
--- a/Kool.VsDiff.Shared/Commands/BaseCommand.cs
+++ b/Kool.VsDiff.Shared/Commands/BaseCommand.cs
@@ -40,7 +40,7 @@ private static void OnBaseCommandEventHandler(object sender, EventArgs e)
         }
         catch (Exception ex)
         {
-            MessageBox.Error(VSPackage.ErrorMessageTitle, ex.Message);
+            MessageBox.Error(I18n.ErrorMessageTitle, ex.Message);
         }
     }
 
diff --git a/Kool.VsDiff.Shared/Pages/VsDiffOptionsPage.xaml b/Kool.VsDiff.Shared/Pages/VsDiffOptionsPage.xaml
index c035897..01046c2 100644
--- a/Kool.VsDiff.Shared/Pages/VsDiffOptionsPage.xaml
+++ b/Kool.VsDiff.Shared/Pages/VsDiffOptionsPage.xaml
@@ -15,10 +15,10 @@
   <StackPanel>
     <GroupBox Padding="0,5">
       <GroupBox.Header>
-        <CheckBox IsChecked="{Binding UseCustomDiffTool}" Content="{x:Static kv:VSPackage.OptionsPage_UseCustomDiffTool}" />
+        <CheckBox IsChecked="{Binding UseCustomDiffTool}" Content="{x:Static kv:I18n.OptionsPage_UseCustomDiffTool}" />
       </GroupBox.Header>
       <StackPanel IsEnabled="{Binding UseCustomDiffTool, Mode=OneWay}">
-        <TextBlock Text="{x:Static kv:VSPackage.OptionsPage_DiffToolPath}" />
+        <TextBlock Text="{x:Static kv:I18n.OptionsPage_DiffToolPath}" />
         <Grid>
           <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
@@ -27,20 +27,20 @@
           <TextBox Name="CustomDiffToolPath" VerticalContentAlignment="Center" Text="{Binding CustomDiffToolPath, UpdateSourceTrigger=PropertyChanged}" />
           <Button Grid.Column="1" Width="40" Height="25" Content="..." Click="OnBrowseButtonClicked" />
         </Grid>
-        <TextBlock Margin="0,5,0,0" Text="{x:Static kv:VSPackage.OptionsPage_Arguments}" />
+        <TextBlock Margin="0,5,0,0" Text="{x:Static kv:I18n.OptionsPage_Arguments}" />
         <Grid>
           <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="50" />
           </Grid.ColumnDefinitions>
           <TextBox VerticalContentAlignment="Center" Text="{Binding CustomDiffToolArgs, UpdateSourceTrigger=PropertyChanged}" />
-          <Button Grid.Column="1" Width="40" Height="25" Content="{x:Static kv:VSPackage.OptionsPage_TestButtonContent}" Click="OnTestButtonClicked" />
+          <Button Grid.Column="1" Width="40" Height="25" Content="{x:Static kv:I18n.OptionsPage_TestButtonContent}" Click="OnTestButtonClicked" />
         </Grid>
       </StackPanel>
     </GroupBox>
-    <CheckBox Margin="0,5,0,0" IsChecked="{Binding DiffClipboardWithCodeEnabled}" Content="{x:Static kv:VSPackage.OptionsPage_EnableDiffClipboardWithCode}" />
-    <CheckBox Margin="0,5,0,0" IsChecked="{Binding DiffClipboardWithFileEnabled}" Content="{x:Static kv:VSPackage.OptionsPage_EnableDiffClipboardWithFile}" />
-    <CheckBox Margin="0,5,0,0" IsChecked="{Binding DiffClipboardWithDocumentEnabled}" Content="{x:Static kv:VSPackage.OptionsPage_EnableDiffClipboardWithDocument}" />
-    <CheckBox Margin="0,5,0,0" IsChecked="{Binding PreferToUsePreviewWindow}" Content="{x:Static kv:VSPackage.OptionsPage_PreferToUsePreviewWindow}" IsEnabled="{Binding UseCustomDiffTool, Mode=OneWay, Converter={StaticResource InverseBooleanConverter}}" />
+    <CheckBox Margin="0,5,0,0" IsChecked="{Binding DiffClipboardWithCodeEnabled}" Content="{x:Static kv:I18n.OptionsPage_EnableDiffClipboardWithCode}" />
+    <CheckBox Margin="0,5,0,0" IsChecked="{Binding DiffClipboardWithFileEnabled}" Content="{x:Static kv:I18n.OptionsPage_EnableDiffClipboardWithFile}" />
+    <CheckBox Margin="0,5,0,0" IsChecked="{Binding DiffClipboardWithDocumentEnabled}" Content="{x:Static kv:I18n.OptionsPage_EnableDiffClipboardWithDocument}" />
+    <CheckBox Margin="0,5,0,0" IsChecked="{Binding PreferToUsePreviewWindow}" Content="{x:Static kv:I18n.OptionsPage_PreferToUsePreviewWindow}" IsEnabled="{Binding UseCustomDiffTool, Mode=OneWay, Converter={StaticResource InverseBooleanConverter}}" />
   </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/Kool.VsDiff.Shared/Pages/VsDiffOptionsPage.xaml.cs b/Kool.VsDiff.Shared/Pages/VsDiffOptionsPage.xaml.cs
index 89b350d..d506012 100644
--- a/Kool.VsDiff.Shared/Pages/VsDiffOptionsPage.xaml.cs
+++ b/Kool.VsDiff.Shared/Pages/VsDiffOptionsPage.xaml.cs
@@ -49,7 +49,7 @@ private void OnTestButtonClicked(object sender, RoutedEventArgs e)
         }
         catch (Exception ex)
         {
-            VS.MessageBox.Error(VSPackage.ErrorMessageTitle, ex.Message);
+            VS.MessageBox.Error(I18n.ErrorMessageTitle, ex.Message);
         }
     }
 }
\ No newline at end of file