From 543c9851d7cacbf85f575b1f6f52e41da7a1d66b Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 20 Apr 2021 12:59:50 -0700
Subject: Integrate latest tooling

---
 global.json                                                      | 2 +-
 src/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs | 8 +++-----
 src/wixext/DifxAppExtensionFactory.cs                            | 2 +-
 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 @@
 {
   "msbuild-sdks": {
-    "WixToolset.Sdk": "4.0.0-build-0170"
+    "WixToolset.Sdk": "4.0.0-build-0211"
   }
 }
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 @@
   </Package>
 
   <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+    </StandardDirectory>
   </Fragment>
 </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
 
     public class DifxAppExtensionFactory : BaseExtensionFactory
     {
-        protected override IEnumerable<Type> ExtensionTypes => new[]
+        protected override IReadOnlyCollection<Type> ExtensionTypes => new[]
         {
             typeof(DifxAppCompiler),
             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
 
     public class DifxAppWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension
     {
-        public override IEnumerable<TableDefinition> TableDefinitions => DifxAppTableDefinitions.All;
+        public override IReadOnlyCollection<TableDefinition> TableDefinitions => DifxAppTableDefinitions.All;
     }
 }
-- 
cgit v1.2.3-55-g6feb