Skip to content

Commit 71f0d29

Browse files
committed
1 parent c7b753a commit 71f0d29

File tree

9 files changed

+14
-9
lines changed

9 files changed

+14
-9
lines changed

Release notes.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
[url:Reviews|https://visualstudiogallery.msdn.microsoft.com/3b64e04c-e8de-4b97-8358-06c73a97cc68/view/Reviews]
44
[url:GitHub|https://github.com/tom-englert/ResXResourceManager/releases]
55

6+
1.0.0.91:
7+
* WI4762: Solution specific configuration is not reloaded correctly when the solution changes.
68
1.0.0.90:
79
* Support the new Azure translator.
810
1.0.0.89:

ResXManager.VSIX/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="43b35fe0-1f30-48de-887a-68256474202a" Version="1.0.0.90" Language="en-US" Publisher="tom-englert.de" />
4+
<Identity Id="43b35fe0-1f30-48de-887a-68256474202a" Version="1.0.0.91" Language="en-US" Publisher="tom-englert.de" />
55
<DisplayName>ResXManager</DisplayName>
66
<Description xml:space="preserve">Manage localization of all ResX-Based resources in one place. Shows all resources of a solution and let's you edit the strings and their localizations in a well-arranged data grid.</Description>
77
<MoreInfo>http://resxresourcemanager.codeplex.com/</MoreInfo>

ResXManager/App.xaml.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ protected override void OnStartup(StartupEventArgs e)
4343
_compositionHost.AddCatalog(assembly);
4444
_compositionHost.AddCatalog(new DirectoryCatalog(folder, "*.dll"));
4545

46+
// ReSharper disable once PossibleNullReferenceException
4647
Resources.MergedDictionaries.Add(DataTemplateManager.CreateDynamicDataTemplates(_compositionHost.Container));
4748

4849
var tracer = _compositionHost.GetExportedValue<ITracer>();
@@ -52,6 +53,7 @@ protected override void OnStartup(StartupEventArgs e)
5253
tracer.WriteLine(ResXManager.Properties.Resources.AssemblyLocation, folder);
5354
tracer.WriteLine(ResXManager.Properties.Resources.Version, new AssemblyName(assembly.FullName).Version);
5455

56+
// ReSharper disable once PossibleNullReferenceException
5557
VisualComposition.Error += (_, args) => tracer.TraceError(args.Text);
5658

5759
MainWindow = _compositionHost.GetExportedValue<MainWindow>();

ResXManager/MainWindow.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,13 @@ protected override void OnInitialized(EventArgs e)
7777
Top = Math.Max(0, location.Y);
7878
}
7979

80-
protected override void OnClosing(CancelEventArgs e)
80+
protected override void OnClosing([NotNull] CancelEventArgs e)
8181
{
8282
base.OnClosing(e);
8383

8484
var resourceManager = this.GetExportProvider().GetExportedValue<ResourceManager>();
8585

86+
// ReSharper disable once PossibleNullReferenceException
8687
if (!resourceManager.HasChanges)
8788
return;
8889

@@ -118,7 +119,7 @@ protected override void OnClosed(EventArgs e)
118119
Settings.StartupSize = _lastKnownSize;
119120
}
120121

121-
private static Settings Settings => Properties.Settings.Default;
122+
private static Settings Settings => Settings.Default;
122123

123124
protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
124125
{

ResXManager/OutputViewModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ private void Append([NotNull] string prefix, [NotNull] string value)
6161

6262
var lines = value.Split('\n');
6363

64+
// ReSharper disable once PossibleNullReferenceException
6465
_lines.Add(DateTime.Now.ToShortTimeString() + "\t" + prefix + lines[0].Trim('\r'));
66+
// ReSharper disable once PossibleNullReferenceException
6567
_lines.AddRange(lines.Skip(1).Select(l => l.Trim('\r')));
6668
}
6769

ResXManager/Properties/Resources.de.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,4 @@ Die Datei wird nicht automatisch dem Visual Studio-Projekt hinzugefügt.</value>
137137

138138
{0}</value>
139139
</data>
140-
<data name="Version" xml:space="preserve">
141-
<value>Version: {0}</value>
142-
</data>
143140
</root>

ResXManager/Properties/Settings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ public sealed partial class Settings
44
{
55
static Settings()
66
{
7+
// ReSharper disable once PossibleNullReferenceException
78
Default.PropertyChanged += (sender, _) => ((Settings)sender).Save();
89
}
910
}

ResXManager/ResXManager.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<SupportUrl>https://resxresourcemanager.codeplex.com</SupportUrl>
3535
<ProductName>ResX Resource Manager</ProductName>
3636
<PublisherName>tom-englert.de</PublisherName>
37-
<ApplicationRevision>90</ApplicationRevision>
38-
<ApplicationVersion>1.0.0.90</ApplicationVersion>
37+
<ApplicationRevision>91</ApplicationRevision>
38+
<ApplicationVersion>1.0.0.91</ApplicationVersion>
3939
<UseApplicationTrust>false</UseApplicationTrust>
4040
<PublishWizardCompleted>true</PublishWizardCompleted>
4141
<BootstrapperEnabled>true</BootstrapperEnabled>

Version.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55

66
internal static class Product
77
{
8-
public const string Version = "1.0.0.90";
8+
public const string Version = "1.0.0.91";
99
}

0 commit comments

Comments
 (0)