Translator configuration can be collapsed.

dotnet · Dec 21, 2024 · 5387f61 · 5387f61
1 parent 0828088
commit 5387f61
Show file tree

Hide file tree

Showing 9 changed files with 223 additions and 138 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -1,25 +1,26 @@
-  <Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AutoProperties.Fody" Version="1.25.0" />
     <PackageVersion Include="DataGridExtensions" Version="2.6.0" />
     <PackageVersion Include="DocumentFormat.OpenXml" Version="[2.20.0]" />
     <PackageVersion Include="Community.VisualStudio.Toolkit" Version="[15.0.76.309]" />
-    <PackageVersion Include="Fody" Version="6.8.2" />
-    <PackageVersion Include="HtmlAgilityPack" Version="1.11.67" />
+    <PackageVersion Include="Fody" Version="6.9.1" />
+    <PackageVersion Include="HtmlAgilityPack" Version="1.11.71" />
     <PackageVersion Include="ILMerge.Fody" Version="1.24.0" />
-    <PackageVersion Include="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageVersion Include="Microsoft.ML.Tokenizers" Version="0.22.0-preview.24378.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="[15.0.1]" />
     <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="[17.6.2164]" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="NSubstitute" Version="5.1.0" />
-    <PackageVersion Include="Nullable.Extended.Analyzer" Version="1.15.6169" />
+    <PackageVersion Include="NSubstitute" Version="5.3.0" />
+    <PackageVersion Include="Nullable.Extended.Analyzer" Version="1.15.6495" />
     <PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
     <PackageVersion Include="Resourcer.Fody" Version="1.8.1" />
     <PackageVersion Include="System.Composition.AttributedModel" Version="[1.4.1]" />
@@ -30,20 +31,25 @@
     <PackageVersion Include="System.ServiceModel.Primitives" Version="[4.10.2]" />
     <PackageVersion Include="System.ServiceModel.Http" Version="[4.10.2]" />
     <PackageVersion Include="Throttle.Fody" Version="1.7.0" />
-    <PackageVersion Include="TomsToolbox.Composition" Version="2.20.0" />
-    <PackageVersion Include="TomsToolbox.Composition.Ninject" Version="2.20.0" />
-    <PackageVersion Include="TomsToolbox.Essentials" Version="2.20.0" />
-    <PackageVersion Include="TomsToolbox.ObservableCollections" Version="2.20.0" />
-    <PackageVersion Include="TomsToolbox.Wpf" Version="2.20.0" />
-    <PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.20.0" />
-    <PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.20.0" />
-    <PackageVersion Include="TomsToolbox.Wpf.Composition.Styles" Version="2.20.0" />
-    <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.20.0" />
-    <PackageVersion Include="Verify.Xunit" Version="27.0.1" />
+    <PackageVersion Include="TomsToolbox.Composition" Version="2.21.0" />
+    <PackageVersion Include="TomsToolbox.Composition.Ninject" Version="2.21.0" />
+    <PackageVersion Include="TomsToolbox.Essentials" Version="2.21.0" />
+    <PackageVersion Include="TomsToolbox.ObservableCollections" Version="2.21.0" />
+    <PackageVersion Include="TomsToolbox.Wpf" Version="2.21.0" />
+    <PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.21.0" />
+    <PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.21.0" />
+    <PackageVersion Include="TomsToolbox.Wpf.Composition.Styles" Version="2.21.0" />
+    <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.21.0" />
+    <PackageVersion Include="Verify.Xunit" Version="28.6.1" />
     <PackageVersion Include="VSIX-SdkProjectAdapter" Version="3.0.0" />
     <PackageVersion Include="WindowsAPICodePack-Shell" Version="1.1.1" />
     <PackageVersion Include="xunit" Version="2.9.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageMitigation Include="Newtonsoft.Json" Version="8.0.3" Justification="VS 2019 requirement" />
+    <PackageMitigation Include="MessagePack" Version="2.2.85" Justification="VS Sdk dependency" />
   </ItemGroup>
 </Project>
 
diff --git a/src/ResXManager.Model/ResXManager.Model.csproj b/src/ResXManager.Model/ResXManager.Model.csproj
@@ -20,6 +20,7 @@
     <PackageReference Include="AutoProperties.Fody" PrivateAssets="all" />
     <PackageReference Include="DocumentFormat.OpenXml" />
     <PackageReference Include="Fody" PrivateAssets="all" />
+    <PackageReference Include="Newtonsoft.Json" VersionOverride="[9.0.1]" />
     <PackageReference Include="PropertyChanged.Fody" PrivateAssets="all" />
     <PackageReference Include="System.ComponentModel.Annotations" />
     <PackageReference Include="System.Composition.AttributedModel" />

diff --git a/src/ResXManager.Translators/ResXManager.Translators.csproj b/src/ResXManager.Translators/ResXManager.Translators.csproj
@@ -53,6 +53,7 @@
     <PackageReference Include="Fody" PrivateAssets="all" />
     <PackageReference Include="ILMerge.Fody" PrivateAssets="all" />
     <PackageReference Include="Microsoft.ML.Tokenizers" />
+    <PackageReference Include="Newtonsoft.Json" VersionOverride="[9.0.1]" />
     <PackageReference Include="PropertyChanged.Fody" PrivateAssets="all" />
     <PackageReference Include="System.ComponentModel.Annotations" />
     <PackageReference Include="System.Net.Http" />

diff --git a/src/ResXManager.VSIX/Properties/launchSettings.json b/src/ResXManager.VSIX/Properties/launchSettings.json
@@ -1,13 +1,13 @@
 {
   "profiles": {
-    "VS 2022 Enterprise": {
+    "VS 2022 Preview": {
       "commandName": "Executable",
-      "executablePath": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\IDE\\devenv.exe",
+      "executablePath": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Preview\\Common7\\IDE\\devenv.exe",
       "commandLineArgs": "/RootSuffix Exp"
     },
-    "VS 2022 Preview": {
+    "VS 2019": {
       "commandName": "Executable",
-      "executablePath": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Preview\\Common7\\IDE\\devenv.exe",
+      "executablePath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\Common7\\IDE\\devenv.exe",
       "commandLineArgs": "/RootSuffix Exp"
     }
   }

diff --git a/src/ResXManager.View/Properties/Settings.Designer.cs b/src/ResXManager.View/Properties/Settings.Designer.cs
diff --git a/src/ResXManager.View/Properties/Settings.settings b/src/ResXManager.View/Properties/Settings.settings
@@ -32,5 +32,8 @@
     <Setting Name="TranslationUnselectedTargetCultures" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="IsTranslatorConfigurationExpanded" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/src/ResXManager.View/Visuals/TranslationsView.xaml b/src/ResXManager.View/Visuals/TranslationsView.xaml
@@ -10,7 +10,7 @@
              xmlns:infrastructure="clr-namespace:ResXManager.Infrastructure;assembly=ResXManager.Infrastructure"
              xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
              xmlns:styles="urn:TomsToolbox.Wpf.Styles"
-             xmlns:Interactions="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:composition="urn:TomsToolbox.Composition"
              d:DataContext="{d:DesignInstance visuals:TranslationsViewModel}" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
   <UserControl.Resources>
@@ -148,9 +148,9 @@
                       <Popup IsOpen="{Binding Path=IsChecked, ElementName=TargetCulturesButton, Mode=OneWay}"
                              StaysOpen="False"
                              Placement="Bottom" PlacementTarget="{Binding ElementName=TargetCulturesButton}">
-                        <Interactions:Interaction.Behaviors>
+                        <behaviors:Interaction.Behaviors>
                           <toms:PopupFocusManagerBehavior ToggleButton="{Binding ElementName=TargetCulturesButton}" />
-                        </Interactions:Interaction.Behaviors>
+                        </behaviors:Interaction.Behaviors>
                         <Border Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
                           <ListBox ItemsSource="{Binding AllTargetCultures}"
                                    Style="{DynamicResource {x:Static styles:ResourceKeys.ListBoxStyle}}"
@@ -217,9 +217,9 @@
       <toms:LoadingIndicator IsActive="{Binding TranslatorHost.ActiveSession.IsActive}" Header="Translating..." d:IsHidden="True" />
     </Grid>
   </DockPanel>
-  <Interactions:Interaction.Triggers>
-    <Interactions:EventTrigger EventName="Loaded">
-      <Interactions:InvokeCommandAction Command="{Binding InitCommand}" />
-    </Interactions:EventTrigger>
-  </Interactions:Interaction.Triggers>
+  <behaviors:Interaction.Triggers>
+    <behaviors:EventTrigger EventName="Loaded">
+      <behaviors:InvokeCommandAction Command="{Binding InitCommand}" />
+    </behaviors:EventTrigger>
+  </behaviors:Interaction.Triggers>
 </UserControl>