diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2018-09-02 14:16:30 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2018-09-02 14:16:30 -0500 |
commit | 23729f907e527bc2965b9ea1a80d3ab447c3b423 (patch) | |
tree | c2678885225f58d06ff321f35bac64bbfca7105c /src/WixToolset.Core | |
parent | 1cb859042736096a43928e770c73fbd7c6065da7 (diff) | |
download | wix-23729f907e527bc2965b9ea1a80d3ab447c3b423.tar.gz wix-23729f907e527bc2965b9ea1a80d3ab447c3b423.tar.bz2 wix-23729f907e527bc2965b9ea1a80d3ab447c3b423.zip |
Fix namespace in WixStrings.
Diffstat (limited to 'src/WixToolset.Core')
-rw-r--r-- | src/WixToolset.Core/Harvester.cs | 3 | ||||
-rw-r--r-- | src/WixToolset.Core/WixStrings.Designer.cs | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/WixToolset.Core/Harvester.cs b/src/WixToolset.Core/Harvester.cs index 55d56e64..3f066d15 100644 --- a/src/WixToolset.Core/Harvester.cs +++ b/src/WixToolset.Core/Harvester.cs | |||
@@ -1,9 +1,8 @@ | |||
1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
2 | 2 | ||
3 | namespace WixToolset | 3 | namespace WixToolset.Core |
4 | { | 4 | { |
5 | using System; | 5 | using System; |
6 | using System.Collections; | ||
7 | using System.Diagnostics.CodeAnalysis; | 6 | using System.Diagnostics.CodeAnalysis; |
8 | using WixToolset.Data; | 7 | using WixToolset.Data; |
9 | using Wix = WixToolset.Data.Serialize; | 8 | using Wix = WixToolset.Data.Serialize; |
diff --git a/src/WixToolset.Core/WixStrings.Designer.cs b/src/WixToolset.Core/WixStrings.Designer.cs index ab98ed6a..63b0b648 100644 --- a/src/WixToolset.Core/WixStrings.Designer.cs +++ b/src/WixToolset.Core/WixStrings.Designer.cs | |||
@@ -1,6 +1,6 @@ | |||
1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
2 | 2 | ||
3 | namespace WixToolset { | 3 | namespace WixToolset.Core { |
4 | using System; | 4 | using System; |
5 | 5 | ||
6 | 6 | ||
@@ -31,7 +31,7 @@ namespace WixToolset { | |||
31 | internal static global::System.Resources.ResourceManager ResourceManager { | 31 | internal static global::System.Resources.ResourceManager ResourceManager { |
32 | get { | 32 | get { |
33 | if (object.ReferenceEquals(resourceMan, null)) { | 33 | if (object.ReferenceEquals(resourceMan, null)) { |
34 | global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WixToolset.WixStrings", typeof(WixStrings).Assembly); | 34 | global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WixToolset.Core.WixStrings", typeof(WixStrings).Assembly); |
35 | resourceMan = temp; | 35 | resourceMan = temp; |
36 | } | 36 | } |
37 | return resourceMan; | 37 | return resourceMan; |