diff options
Diffstat (limited to 'src')
4 files changed, 6 insertions, 18 deletions
diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs index 83053725..3348e49c 100644 --- a/src/WixToolset.Converters/WixConverter.cs +++ b/src/WixToolset.Converters/WixConverter.cs | |||
| @@ -290,7 +290,7 @@ namespace WixToolset.Converters | |||
| 290 | 290 | ||
| 291 | // Start converting the nodes at the top. | 291 | // Start converting the nodes at the top. |
| 292 | this.ConvertNodes(document.Nodes(), 0); | 292 | this.ConvertNodes(document.Nodes(), 0); |
| 293 | this.RemoveUnusedNamspaces(document.Root); | 293 | this.RemoveUnusedNamespaces(document.Root); |
| 294 | 294 | ||
| 295 | return this.Errors; | 295 | return this.Errors; |
| 296 | } | 296 | } |
| @@ -343,7 +343,7 @@ namespace WixToolset.Converters | |||
| 343 | 343 | ||
| 344 | // Start converting the nodes at the top. | 344 | // Start converting the nodes at the top. |
| 345 | this.ConvertNodes(document.Nodes(), 0); | 345 | this.ConvertNodes(document.Nodes(), 0); |
| 346 | this.RemoveUnusedNamspaces(document.Root); | 346 | this.RemoveUnusedNamespaces(document.Root); |
| 347 | 347 | ||
| 348 | return this.Errors; | 348 | return this.Errors; |
| 349 | } | 349 | } |
| @@ -1557,7 +1557,7 @@ namespace WixToolset.Converters | |||
| 1557 | /// Removes unused namespaces from the element and its children. | 1557 | /// Removes unused namespaces from the element and its children. |
| 1558 | /// </summary> | 1558 | /// </summary> |
| 1559 | /// <param name="root">Root element to start at.</param> | 1559 | /// <param name="root">Root element to start at.</param> |
| 1560 | private void RemoveUnusedNamspaces(XElement root) | 1560 | private void RemoveUnusedNamespaces(XElement root) |
| 1561 | { | 1561 | { |
| 1562 | var declarations = new List<XAttribute>(); | 1562 | var declarations = new List<XAttribute>(); |
| 1563 | var namespaces = new HashSet<string>(); | 1563 | var namespaces = new HashSet<string>(); |
diff --git a/src/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj b/src/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj index 57ff1968..995d9297 100644 --- a/src/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj +++ b/src/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <Content Include="TestData\Integration\test.wixout" CopyToOutputDirectory="PreserveNewest" /> | 12 | <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
diff --git a/src/test/WixToolsetTest.Converters/ConverterFixture.cs b/src/test/WixToolsetTest.Converters/ConverterFixture.cs index 4d815247..39521da0 100644 --- a/src/test/WixToolsetTest.Converters/ConverterFixture.cs +++ b/src/test/WixToolsetTest.Converters/ConverterFixture.cs | |||
| @@ -157,7 +157,7 @@ namespace WixToolsetTest.Converters | |||
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | [Fact] | 159 | [Fact] |
| 160 | public void CanConvertExtensionNamespace() | 160 | public void CanRemoveUnusedNamespaces() |
| 161 | { | 161 | { |
| 162 | var parse = String.Join(Environment.NewLine, | 162 | var parse = String.Join(Environment.NewLine, |
| 163 | "<?xml version='1.0' encoding='utf-8'?>", | 163 | "<?xml version='1.0' encoding='utf-8'?>", |
diff --git a/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj b/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj index 902494a2..8b525497 100644 --- a/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj +++ b/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj | |||
| @@ -8,19 +8,7 @@ | |||
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
| 10 | <ItemGroup> | 10 | <ItemGroup> |
| 11 | <Content Include="TestData\PermissionEx\v3.wxs" CopyToOutputDirectory="PreserveNewest" /> | 11 | <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" /> |
| 12 | <Content Include="TestData\PermissionEx\v4_expected.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 13 | <Content Include="TestData\Preprocessor\ConvertedPreprocessor.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 14 | <Content Include="TestData\Preprocessor\Preprocessor.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 15 | <Content Include="TestData\Preprocessor\wixcop.settings.xml" CopyToOutputDirectory="PreserveNewest" /> | ||
| 16 | <Content Include="TestData\QtExec\v3.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 17 | <Content Include="TestData\QtExec\v4_expected.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 18 | <Content Include="TestData\QtExec.bad\v3.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 19 | <Content Include="TestData\QtExec.bad\v4_expected.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 20 | <Content Include="TestData\SingleFile\ConvertedSingleFile.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 21 | <Content Include="TestData\SingleFile\SingleFile.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 22 | <Content Include="TestData\PackageSummaryInformation\TypicalV3.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 23 | <Content Include="TestData\PackageSummaryInformation\TypicalV3.msi" CopyToOutputDirectory="PreserveNewest" /> | ||
| 24 | </ItemGroup> | 12 | </ItemGroup> |
| 25 | 13 | ||
| 26 | <ItemGroup> | 14 | <ItemGroup> |