3 files changed, 17 insertions, 3 deletions

diff --git a/src/wix/WixToolset.Converters/WixConverter.cs b/src/wix/WixToolset.Converters/WixConverter.cs
index f962dc9c..460bb3af 100644
--- a/src/wix/WixToolset.Converters/WixConverter.cs
+++ b/src/wix/WixToolset.Converters/WixConverter.cs
@@ -1123,6 +1123,8 @@ namespace WixToolset.Converters
                     if (this.OnInformation(ConverterTestType.StandardDirectoryRefDeprecated, element, "The {0} directory should no longer be explicitly referenced. Remove the DirectoryRef element with Id attribute '{0}'.", id))
                     {
                         RemoveElementKeepChildren(element);
+
+                        this.OnError(ConverterTestType.TargetDirRefRemoved, element, "A reference to the TARGETDIR Directory was removed. This may cause the Fragment that defined TARGETDIR to not be included in the final output. If this happens, reference a different element in the Fragment to replace the old reference to TARGEDIR.");
                     }
                 }
                 else if (this.OnInformation(ConverterTestType.StandardDirectoryRefDeprecated, element, "The standard directory '{0}' should no longer be directly referenced. Use the StandardDirectory element instead.", id))
@@ -3300,6 +3302,11 @@ namespace WixToolset.Converters
             /// The magic WixVariable 'WixMbaPrereqPackageId' has been removed. Add bal:PrereqPackage="yes" to the target package instead.
             /// </summary>
             WixMbaPrereqPackageIdDeprecated,
+
+            /// <summary>
+            /// A reference to the TARGETDIR Directory was removed. This may cause the Fragment that defined TARGETDIR to not be included in the final output. If this happens, reference a different element in the Fragment to replace the old reference to TARGEDIR.
+            /// </summary>
+            TargetDirRefRemoved,
         }
     }
 }
diff --git a/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs b/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs
index 7aa1c959..736229da 100644
--- a/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs
@@ -298,7 +298,7 @@ namespace WixToolsetTest.Converters
 
             WixAssert.CompareLineByLine(expected, actual);
             Assert.Equal(Wix4Namespace, document.Root.GetDefaultNamespace());
-            Assert.Equal(3, errors);
+            Assert.Equal(4, errors);
         }
 
         [Fact]
diff --git a/src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs b/src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs
index e992bf30..c938b9ad 100644
--- a/src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs
@@ -89,7 +89,14 @@ namespace WixToolsetTest.Converters
 
             var actualLines = UnformattedDocumentLines(document);
             WixAssert.CompareLineByLine(expected, actualLines);
-            Assert.Equal(3, errors);
+            WixAssert.CompareLineByLine(new[]
+            {
+                "[Converted] This file contains an XML declaration on the first line. (DeclarationPresent)",
+                "[Converted] The namespace 'http://schemas.microsoft.com/wix/2006/wi' is out of date. It must be 'http://wixtoolset.org/schemas/v4/wxs'. (XmlnsValueWrong)",
+                "[Converted] The TARGETDIR directory should no longer be explicitly referenced. Remove the DirectoryRef element with Id attribute 'TARGETDIR'. (StandardDirectoryRefDeprecated)",
+                "A reference to the TARGETDIR Directory was removed. This may cause the Fragment that defined TARGETDIR to not be included in the final output. If this happens, reference a different element in the Fragment to replace the old reference to TARGEDIR. (TargetDirRefRemoved)",
+            }, messaging.Messages.Select(m => m.ToString()).ToArray());
+            Assert.Equal(4, errors);
         }
 
         [Fact]
@@ -201,7 +208,7 @@ namespace WixToolsetTest.Converters
 
             var actualLines = UnformattedDocumentLines(document);
             WixAssert.CompareLineByLine(expected, actualLines);
-            Assert.Equal(4, errors);
+            Assert.Equal(5, errors);
         }
 
         [Fact]