diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-04-20 12:59:50 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-04-20 13:06:49 -0700 |
| commit | 543c9851d7cacbf85f575b1f6f52e41da7a1d66b (patch) | |
| tree | 72ede6b549b10bfed78a37bef4efa209f4bd3ae0 | |
| parent | bc6cf51b0e617ccaf461ff356ad7309f5f1a8945 (diff) | |
| download | wix-543c9851d7cacbf85f575b1f6f52e41da7a1d66b.tar.gz wix-543c9851d7cacbf85f575b1f6f52e41da7a1d66b.tar.bz2 wix-543c9851d7cacbf85f575b1f6f52e41da7a1d66b.zip | |
Integrate latest tooling
| -rw-r--r-- | global.json | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs | 8 | ||||
| -rw-r--r-- | src/wixext/DifxAppExtensionFactory.cs | 2 | ||||
| -rw-r--r-- | src/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/global.json b/global.json index 77a81322..23dd3fa6 100644 --- a/global.json +++ b/global.json | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | { | 1 | { |
| 2 | "msbuild-sdks": { | 2 | "msbuild-sdks": { |
| 3 | "WixToolset.Sdk": "4.0.0-build-0170" | 3 | "WixToolset.Sdk": "4.0.0-build-0211" |
| 4 | } | 4 | } |
| 5 | } | 5 | } |
diff --git a/src/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs b/src/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs index 082ac4cc..411893bc 100644 --- a/src/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs +++ b/src/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs | |||
| @@ -8,10 +8,8 @@ | |||
| 8 | </Package> | 8 | </Package> |
| 9 | 9 | ||
| 10 | <Fragment> | 10 | <Fragment> |
| 11 | <Directory Id="TARGETDIR" Name="SourceDir"> | 11 | <StandardDirectory Id="ProgramFilesFolder"> |
| 12 | <Directory Id="ProgramFilesFolder"> | 12 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
| 13 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 13 | </StandardDirectory> |
| 14 | </Directory> | ||
| 15 | </Directory> | ||
| 16 | </Fragment> | 14 | </Fragment> |
| 17 | </Wix> | 15 | </Wix> |
diff --git a/src/wixext/DifxAppExtensionFactory.cs b/src/wixext/DifxAppExtensionFactory.cs index 4565ce17..3932685d 100644 --- a/src/wixext/DifxAppExtensionFactory.cs +++ b/src/wixext/DifxAppExtensionFactory.cs | |||
| @@ -8,7 +8,7 @@ namespace WixToolset.DifxApp | |||
| 8 | 8 | ||
| 9 | public class DifxAppExtensionFactory : BaseExtensionFactory | 9 | public class DifxAppExtensionFactory : BaseExtensionFactory |
| 10 | { | 10 | { |
| 11 | protected override IEnumerable<Type> ExtensionTypes => new[] | 11 | protected override IReadOnlyCollection<Type> ExtensionTypes => new[] |
| 12 | { | 12 | { |
| 13 | typeof(DifxAppCompiler), | 13 | typeof(DifxAppCompiler), |
| 14 | typeof(DifxAppExtensionData), | 14 | typeof(DifxAppExtensionData), |
diff --git a/src/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs b/src/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs index d3bbc0eb..41f01175 100644 --- a/src/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs +++ b/src/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs | |||
| @@ -8,6 +8,6 @@ namespace WixToolset.DifxApp | |||
| 8 | 8 | ||
| 9 | public class DifxAppWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension | 9 | public class DifxAppWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension |
| 10 | { | 10 | { |
| 11 | public override IEnumerable<TableDefinition> TableDefinitions => DifxAppTableDefinitions.All; | 11 | public override IReadOnlyCollection<TableDefinition> TableDefinitions => DifxAppTableDefinitions.All; |
| 12 | } | 12 | } |
| 13 | } | 13 | } |