diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-20 12:41:02 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-04-20 12:42:49 -0700 |
commit | eab57c2ddebc3dc8cebc22f5337f50062f415c0d (patch) | |
tree | a12b2b9d6a8e1283ac12439e6df5b91421496c11 | |
parent | 8b371f7f941ba3737f34e52e73545fea0e9c59e8 (diff) | |
download | wix-eab57c2ddebc3dc8cebc22f5337f50062f415c0d.tar.gz wix-eab57c2ddebc3dc8cebc22f5337f50062f415c0d.tar.bz2 wix-eab57c2ddebc3dc8cebc22f5337f50062f415c0d.zip |
Integrate latest tooling
-rw-r--r-- | global.json | 2 | ||||
-rw-r--r-- | src/wixext/ComPlusExtensionFactory.cs | 2 | ||||
-rw-r--r-- | src/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/global.json b/global.json index fc26eb6e..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-0206" | 3 | "WixToolset.Sdk": "4.0.0-build-0211" |
4 | } | 4 | } |
5 | } | 5 | } |
diff --git a/src/wixext/ComPlusExtensionFactory.cs b/src/wixext/ComPlusExtensionFactory.cs index d9405867..76b51bff 100644 --- a/src/wixext/ComPlusExtensionFactory.cs +++ b/src/wixext/ComPlusExtensionFactory.cs | |||
@@ -8,7 +8,7 @@ namespace WixToolset.ComPlus | |||
8 | 8 | ||
9 | public class ComPlusExtensionFactory : BaseExtensionFactory | 9 | public class ComPlusExtensionFactory : BaseExtensionFactory |
10 | { | 10 | { |
11 | protected override IEnumerable<Type> ExtensionTypes => new[] | 11 | protected override IReadOnlyCollection<Type> ExtensionTypes => new[] |
12 | { | 12 | { |
13 | typeof(ComPlusCompiler), | 13 | typeof(ComPlusCompiler), |
14 | typeof(ComPlusExtensionData), | 14 | typeof(ComPlusExtensionData), |
diff --git a/src/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs b/src/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs index 6083c22b..cf226a3d 100644 --- a/src/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs +++ b/src/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs | |||
@@ -8,6 +8,6 @@ namespace WixToolset.ComPlus | |||
8 | 8 | ||
9 | public class ComPlusWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension | 9 | public class ComPlusWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension |
10 | { | 10 | { |
11 | public override IEnumerable<TableDefinition> TableDefinitions => ComPlusTableDefinitions.All; | 11 | public override IReadOnlyCollection<TableDefinition> TableDefinitions => ComPlusTableDefinitions.All; |
12 | } | 12 | } |
13 | } | 13 | } |