Skip to content

Commit 73c279f

Browse files
Ignore non-resx files - fixes #714
1 parent 2fe3223 commit 73c279f

2 files changed

Lines changed: 2 additions & 13 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
44

55
## [Unreleased]
66

7-
8-
### Vsix
9-
10-
11-
### VB -> C#
12-
13-
14-
### C# -> VB
15-
16-
17-
## [8.2.3] - 2021-04-04
18-
197
### Command line
208
* The --Core-Only flag no longer requires a value [#704](https://github.com/icsharpcode/CodeConverter/issues/704)
219

@@ -28,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
2816
* Implicilty typed inherited events no longer create extra delegates [#700](https://github.com/icsharpcode/CodeConverter/issues/700)
2917
* Keep optional parameters for parameterized properties [#642](https://github.com/icsharpcode/CodeConverter/issues/642)
3018
* Maintain leading whitespace in comments [#711](https://github.com/icsharpcode/CodeConverter/issues/711)
19+
* Avoid XmlException when referencing certain nuget packages [#714](https://github.com/icsharpcode/CodeConverter/issues/714)
3120

3221
### C# -> VB
3322

CodeConverter/CSharp/VBToCSProjectContentsConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public async IAsyncEnumerable<ConversionResult> GetAdditionalConversionResults(I
9494
string projDirPath = SourceProject.GetDirectoryPath();
9595
foreach (var doc in additionalDocumentsToConvert) {
9696
string newPath = Path.Combine(projDirPath, Path.GetFileName(doc.FilePath));
97-
if (newPath != doc.FilePath) {
97+
if (Path.GetExtension(doc.FilePath).Equals(".resx", StringComparison.OrdinalIgnoreCase) && newPath != doc.FilePath) {
9898
string newText = RebaseResxPaths(projDirPath, Path.GetDirectoryName(doc.FilePath), (await doc.GetTextAsync(cancellationToken)).ToString());
9999
yield return new ConversionResult(newText) {
100100
SourcePathOrNull = doc.FilePath,

0 commit comments

Comments
 (0)