3 files changed, 23 insertions, 10 deletions

diff --git a/src/internal/WixInternal.BaseBuildTasks.Sources/WixCommandLineBuilder.cs b/src/internal/WixInternal.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
index 61d7095d..985ef855 100644
--- a/src/internal/WixInternal.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
+++ b/src/internal/WixInternal.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
@@ -120,5 +120,18 @@ namespace WixToolset.BaseBuildTasks
                 this.AppendTextUnquoted(textToAppend);
             }
         }
+
+        /// <summary>
+        /// Append arbitrary text to the command-line if specified quoted if needed.
+        /// </summary>
+        /// <param name="textToAppend">Text to append.</param>
+        public void AppendTextQuotedIfNotWhitespace(string textToAppend)
+        {
+            if (!String.IsNullOrWhiteSpace(textToAppend))
+            {
+                this.AppendSpaceIfNotEmpty();
+                this.AppendTextWithQuoting(textToAppend);
+            }
+        }
     }
 }
diff --git a/src/wix/WixToolset.BuildTasks/WixAcceptEula.cs b/src/wix/WixToolset.BuildTasks/WixAcceptEula.cs
index 8e398996..e71e4711 100644
--- a/src/wix/WixToolset.BuildTasks/WixAcceptEula.cs
+++ b/src/wix/WixToolset.BuildTasks/WixAcceptEula.cs
@@ -14,16 +14,16 @@ namespace WixToolset.BuildTasks
     public sealed class WixAcceptEula : WixExeBaseTask
     {
         [Required]
-        public string EulaVersion { get; set; }
+        public string EulaId { get; set; }
 
         protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
         {
             commandLineBuilder.AppendTextUnquoted("eula");
-            commandLineBuilder.AppendTextUnquoted("accept");
+            commandLineBuilder.AppendTextUnquoted(" accept");
 
-            foreach (var version in SplitEulaVersions(this.EulaVersion))
+            foreach (var eulaId in SplitEulaVersions(this.EulaId))
             {
-                commandLineBuilder.AppendTextUnquoted(version);
+                commandLineBuilder.AppendTextQuotedIfNotWhitespace(eulaId);
             }
 
             base.BuildCommandLine(commandLineBuilder);
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 2dcfd0e9..88317edc 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -192,14 +192,14 @@
   <Target
     Name="AcceptEula">
 
-    <PropertyGroup>
-      <_AcceptEulaVersion Condition="'$(AcceptEulaVersion)' != ''">$(AcceptEulaVersion)</_AcceptEulaVersion>
-      <_AcceptEulaVersion Condition="'$(_AcceptEulaVersion)' == '' and '$(AcceptEula)' != ''">$(AcceptEula)</_AcceptEulaVersion>
-      <_AcceptEulaVersion Condition="'$(_AcceptEulaVersion)' == ''">$(WixEulaVersion)</_AcceptEulaVersion>
-    </PropertyGroup>
+    <Error
+      Text="The 'EulaId' property is required. Add '-p:EulaId={eulaId}' to your command-line. For instructions, see https://wixtoolset.org/osmf/"
+      File="$(MSBuildProjectFile)"
+      HelpLink="https://wixtoolset.org/osmf"
+      Condition=" '$(EulaId)' == '' " />
 
     <WixAcceptEula
-        EulaVersion="$(_AcceptEulaVersion)"
+        EulaId="$(EulaId)"
         NoLogo="true"
         ToolExe="$(WixToolExe)"
         ToolPath="$(WixToolDir)" />