aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ext/WixExt.props2
-rw-r--r--src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs2
-rw-r--r--src/wix/WixToolset.Sdk/tools/wix.props2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ext/WixExt.props b/src/ext/WixExt.props
index 4babfb7c..c6afb59f 100644
--- a/src/ext/WixExt.props
+++ b/src/ext/WixExt.props
@@ -6,7 +6,7 @@
6 <IncludeBuildOutput>false</IncludeBuildOutput> 6 <IncludeBuildOutput>false</IncludeBuildOutput>
7 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking> 7 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
8 <NoWarn>NU5100</NoWarn> 8 <NoWarn>NU5100</NoWarn>
9 <WixExtensionPackageFolder>wixext5</WixExtensionPackageFolder> 9 <WixExtensionPackageFolder>wixext6</WixExtensionPackageFolder>
10 </PropertyGroup> 10 </PropertyGroup>
11 11
12 <ItemGroup> 12 <ItemGroup>
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs b/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
index 840b32d4..cad4edc0 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Core.ExtensibilityServices
16 internal class ExtensionManager : IExtensionManager 16 internal class ExtensionManager : IExtensionManager
17 { 17 {
18 // This value needs to stay in sync with the Property in "wix.props" with the same name. 18 // This value needs to stay in sync with the Property in "wix.props" with the same name.
19 private const string WixToolsetExtensionPackageFolder = "wixext5"; 19 private const string WixToolsetExtensionPackageFolder = "wixext6";
20 20
21 private const string UserWixFolderName = ".wix"; 21 private const string UserWixFolderName = ".wix";
22 private const string MachineWixFolderName = "WixToolset"; 22 private const string MachineWixFolderName = "WixToolset";
diff --git a/src/wix/WixToolset.Sdk/tools/wix.props b/src/wix/WixToolset.Sdk/tools/wix.props
index 284b93b0..af26f694 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.props
+++ b/src/wix/WixToolset.Sdk/tools/wix.props
@@ -9,7 +9,7 @@
9 <WixToolsetPatchVersion>$$WixToolsetPatchVersion$$</WixToolsetPatchVersion> 9 <WixToolsetPatchVersion>$$WixToolsetPatchVersion$$</WixToolsetPatchVersion>
10 <WixToolsetMajorMinorVersion>$$WixToolsetMajorMinorVersion$$</WixToolsetMajorMinorVersion> 10 <WixToolsetMajorMinorVersion>$$WixToolsetMajorMinorVersion$$</WixToolsetMajorMinorVersion>
11 <WixToolsetVersion>$$WixToolsetVersion$$</WixToolsetVersion> 11 <WixToolsetVersion>$$WixToolsetVersion$$</WixToolsetVersion>
12 <WixToolsetExtensionPackageFolder>wixext5</WixToolsetExtensionPackageFolder> 12 <WixToolsetExtensionPackageFolder>wixext6</WixToolsetExtensionPackageFolder>
13 </PropertyGroup> 13 </PropertyGroup>
14 14
15 <ImportGroup> 15 <ImportGroup>