Skip to content

Commit 60b3338

Browse files
author
tom-englert
committed
- Stick with System.Composition.AttributedModel Version="[1.4.1]" for compatibility with older VS versions.
1 parent 050d07c commit 60b3338

File tree

5 files changed

+40
-38
lines changed

5 files changed

+40
-38
lines changed

‎src/Directory.Packages.props

+12-12
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageVersion Include="DocumentFormat.OpenXml" Version="[2.20.0]" />
99
<PackageVersion Include="Community.VisualStudio.Toolkit" Version="[15.0.76.309]" />
1010
<PackageVersion Include="Fody" Version="6.8.2" />
11-
<PackageVersion Include="HtmlAgilityPack" Version="1.11.65" />
11+
<PackageVersion Include="HtmlAgilityPack" Version="1.11.66" />
1212
<PackageVersion Include="ILMerge.Fody" Version="1.24.0" />
1313
<PackageVersion Include="JetBrains.Annotations" Version="2024.2.0" />
1414
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
@@ -22,27 +22,27 @@
2222
<PackageVersion Include="Nullable.Extended.Analyzer" Version="1.15.6169" />
2323
<PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
2424
<PackageVersion Include="Resourcer.Fody" Version="1.8.1" />
25-
<PackageVersion Include="System.Composition.AttributedModel" Version="8.0.0" />
25+
<PackageVersion Include="System.Composition.AttributedModel" Version="[1.4.1]" />
2626
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
2727
<PackageVersion Include="System.Data.DataSetExtensions" Version="4.5.0" />
2828
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
2929
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="[6.0.4]" />
3030
<PackageVersion Include="System.ServiceModel.Primitives" Version="[4.10.2]" />
3131
<PackageVersion Include="System.ServiceModel.Http" Version="[4.10.2]" />
3232
<PackageVersion Include="Throttle.Fody" Version="1.7.0" />
33-
<PackageVersion Include="TomsToolbox.Composition" Version="2.18.1" />
34-
<PackageVersion Include="TomsToolbox.Composition.Ninject" Version="2.18.1" />
35-
<PackageVersion Include="TomsToolbox.Essentials" Version="2.18.1" />
36-
<PackageVersion Include="TomsToolbox.ObservableCollections" Version="2.18.1" />
37-
<PackageVersion Include="TomsToolbox.Wpf" Version="2.18.1" />
38-
<PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.18.1" />
39-
<PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.18.1" />
40-
<PackageVersion Include="TomsToolbox.Wpf.Composition.Styles" Version="2.18.1" />
41-
<PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.18.1" />
33+
<PackageVersion Include="TomsToolbox.Composition" Version="2.19.1" />
34+
<PackageVersion Include="TomsToolbox.Composition.Ninject" Version="2.19.1" />
35+
<PackageVersion Include="TomsToolbox.Essentials" Version="2.19.1" />
36+
<PackageVersion Include="TomsToolbox.ObservableCollections" Version="2.19.1" />
37+
<PackageVersion Include="TomsToolbox.Wpf" Version="2.19.1" />
38+
<PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.19.1" />
39+
<PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.19.1" />
40+
<PackageVersion Include="TomsToolbox.Wpf.Composition.Styles" Version="2.19.1" />
41+
<PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.19.1" />
4242
<PackageVersion Include="Verify.Xunit" Version="26.5.0" />
4343
<PackageVersion Include="VSIX-SdkProjectAdapter" Version="3.0.0" />
4444
<PackageVersion Include="WindowsAPICodePack-Shell" Version="1.1.1" />
45-
<PackageVersion Include="xunit" Version="2.9.0" />
45+
<PackageVersion Include="xunit" Version="2.9.1" />
4646
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
4747
</ItemGroup>
4848
</Project>

‎src/ResXManager.Model/WebFilesExporter.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private void Export()
9292
key += FormatTemplateSuffix;
9393
}
9494

95-
node.Add(key, JToken.FromObject(resourceNode.Text));
95+
node.Add(key, JToken.FromObject(resourceNode.Text ?? string.Empty));
9696
}
9797

9898
jsonObjects
@@ -202,4 +202,4 @@ function formatString(template: string, args: any): string {
202202
203203
// noinspection JSUnusedGlobalSymbols,SpellCheckingInspection
204204
";
205-
}
205+
}

‎src/ResXManager.Translators/AzureOpenAITranslator.cs

+16-16
Original file line numberDiff line numberDiff line change
@@ -180,20 +180,20 @@ private async Task TranslateUsingChatModel(ITranslationSession translationSessio
180180
// keep retrying
181181
continue;
182182
}
183-
else
184-
{
185-
completionsResponse.EnsureSuccessStatusCode();
186183

187-
var responseContent = await completionsResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
184+
completionsResponse.EnsureSuccessStatusCode();
188185

189-
var completions = JsonConvert.DeserializeObject<ChatCompletionsResponse>(responseContent);
186+
var responseContent = await completionsResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
190187

188+
var completions = JsonConvert.DeserializeObject<ChatCompletionsResponse>(responseContent);
189+
if (completions != null)
190+
{
191191
await translationSession.MainThread.StartNew(() => ReturnResults(items, completions), cancellationToken).ConfigureAwait(false);
192-
193-
// break out of the retry loop
194-
break;
195192
}
196193

194+
// break out of the retry loop
195+
break;
196+
197197
}
198198
}
199199
}
@@ -450,19 +450,19 @@ private async Task TranslateUsingCompletionsModel(ITranslationSession translatio
450450
// keep retrying
451451
continue;
452452
}
453-
else
454-
{
455-
completionsResponse.EnsureSuccessStatusCode();
456453

457-
var responseContent = await completionsResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
454+
completionsResponse.EnsureSuccessStatusCode();
458455

459-
var completions = JsonConvert.DeserializeObject<CompletionsResponse>(responseContent);
456+
var responseContent = await completionsResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
460457

458+
var completions = JsonConvert.DeserializeObject<CompletionsResponse>(responseContent);
459+
if (completions != null)
460+
{
461461
await translationSession.MainThread.StartNew(() => ReturnResults(batch, completions), cancellationToken).ConfigureAwait(false);
462-
463-
// break out of the retry loop
464-
break;
465462
}
463+
464+
// break out of the retry loop
465+
break;
466466
}
467467
}
468468
}

‎src/ResXManager.Translators/OpenAITranslator.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -183,19 +183,19 @@ private async Task TranslateUsingCompletionsModel(ITranslationSession translatio
183183
// keep retrying
184184
continue;
185185
}
186-
else
187-
{
188-
completionsResponse.EnsureSuccessStatusCode();
189186

190-
var responseContent = await completionsResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
187+
completionsResponse.EnsureSuccessStatusCode();
191188

192-
var completions = JsonConvert.DeserializeObject<CompletionsResponse>(responseContent);
189+
var responseContent = await completionsResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
193190

191+
var completions = JsonConvert.DeserializeObject<CompletionsResponse>(responseContent);
192+
if (completions != null)
193+
{
194194
await translationSession.MainThread.StartNew(() => ReturnResults(batch, completions), cancellationToken).ConfigureAwait(false);
195-
196-
// break out of the retry loop
197-
break;
198195
}
196+
197+
// break out of the retry loop
198+
break;
199199
}
200200
}
201201
}

‎src/ResXResourceManager.sln.DotSettings

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AI/@EntryIndexedValue">AI</s:String>
2424
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MS/@EntryIndexedValue">MS</s:String>
2525
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
26+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=15b5b1f1_002D457c_002D4ca6_002Db278_002D5615aedc07d3/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;&lt;/Policy&gt;</s:String>
2627
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
2728
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
2829
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -32,5 +33,6 @@
3233
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
3334
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
3435
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
36+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
3537
<s:Boolean x:Key="/Default/UserDictionary/Words/=VSIX/@EntryIndexedValue">True</s:Boolean>
3638
</wpf:ResourceDictionary>

0 commit comments

Comments
 (0)