diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-08-06 16:01:23 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-08-06 18:45:31 -0700 |
| commit | b7dc41e27aeb391bbf0d5722e0eac790c49af18f (patch) | |
| tree | 5fbd631567eb49a8f67c39b96ff9260cccf3f966 | |
| parent | 02c1eeab7c905833a6a5e3bc6225409ebd7349aa (diff) | |
| download | wix-b7dc41e27aeb391bbf0d5722e0eac790c49af18f.tar.gz wix-b7dc41e27aeb391bbf0d5722e0eac790c49af18f.tar.bz2 wix-b7dc41e27aeb391bbf0d5722e0eac790c49af18f.zip | |
Use DefaultProjectTypeGuid in WiX SDK
It isn't documented but other SDK projects use DefaultProjectTypeGuid
not ProjectTypeGuids to provide the project type. The project type
is used in .sln files and .wixproj cannot be added to .sln without a
ProjectTypeGuids property or the SDK providing DefaultProjectTypeGuid
so we provide the default here.
| -rw-r--r-- | src/wix/WixToolset.Sdk/tools/wix.props | 1 | ||||
| -rw-r--r-- | src/wix/WixToolset.Sdk/tools/wix.targets | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/wix/WixToolset.Sdk/tools/wix.props b/src/wix/WixToolset.Sdk/tools/wix.props index 6a7f353d..cd4aa4ac 100644 --- a/src/wix/WixToolset.Sdk/tools/wix.props +++ b/src/wix/WixToolset.Sdk/tools/wix.props | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | </PropertyGroup> | 20 | </PropertyGroup> |
| 21 | 21 | ||
| 22 | <PropertyGroup> | 22 | <PropertyGroup> |
| 23 | <ProjectTypeGuids>B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0</ProjectTypeGuids> | ||
| 24 | <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences> | 23 | <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences> |
| 25 | <DisableTransitiveProjectReferences>true</DisableTransitiveProjectReferences> | 24 | <DisableTransitiveProjectReferences>true</DisableTransitiveProjectReferences> |
| 26 | </PropertyGroup> | 25 | </PropertyGroup> |
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets index 2f64f7b2..521b2d17 100644 --- a/src/wix/WixToolset.Sdk/tools/wix.targets +++ b/src/wix/WixToolset.Sdk/tools/wix.targets | |||
| @@ -55,6 +55,7 @@ | |||
| 55 | --> | 55 | --> |
| 56 | 56 | ||
| 57 | <PropertyGroup> | 57 | <PropertyGroup> |
| 58 | <DefaultProjectTypeGuid Condition=" '$(DefaultProjectTypeGuid)' == '' ">{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}</DefaultProjectTypeGuid> | ||
| 58 | <DefaultLanguageSourceExtension>.wxs</DefaultLanguageSourceExtension> | 59 | <DefaultLanguageSourceExtension>.wxs</DefaultLanguageSourceExtension> |
| 59 | <Language>wix</Language> | 60 | <Language>wix</Language> |
| 60 | <TargetRuntime>wix</TargetRuntime> | 61 | <TargetRuntime>wix</TargetRuntime> |