From a6d943fc8366ff8135d3a15960da4edaf10e0094 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 6 Jul 2022 10:21:17 -0700
Subject: Detect when Restore is required for a .wixproj to build

Closes 6701
---
 src/wix/WixToolset.Sdk/tools/wix.targets | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 247e0dd2..0e50ad0d 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -215,6 +215,7 @@
     <ResolveReferencesDependsOn>
       BeforeResolveReferences;
       AssignProjectConfiguration;
+      _ValidateProjectAssetsFile;
       ResolveProjectReferences;
       FindInvalidProjectReferences;
       ResolveNativeProjectReferences;
@@ -226,6 +227,27 @@
     </ResolveReferencesDependsOn>
   </PropertyGroup>
 
+  <!--
+    ================================================================================================
+                                        _ValidateProjectAssetsFile
+
+    Ensures that the project assets file exists which indicates restore was completed. Restore is
+    required if there are any PackageReferences in the project.
+
+    [IN]
+    @(PackageReference) - Package references, if any.
+    $(ProjectAssetsFile) - Project assets file that should be created during restore.
+    ================================================================================================
+    -->
+  <Target
+    Name="_ValidateProjectAssetsFile"
+    Condition=" '@(PackageReference)' != '' ">
+
+    <Error Text="The $(ProjectAssetsFile) file does not exist. Restore the project before trying to build again. Restore and build with &quot;MSBuild -Restore&quot; or &quot;dotnet build&quot;."
+           Condition="!Exists('$(ProjectAssetsFile)')" />
+
+  </Target>
+
   <!--
     ================================================================================================
                                         _WixUpdateProjectReferenceMetadata
@@ -332,7 +354,7 @@
       <_ResolvedProjectReferencePaths Remove="@(WixLibrary)" />
     </ItemGroup>
 
-    <!-- Convert resolved project references into compiler defines and named and unamed bind paths-->
+    <!-- Convert resolved project references into compiler defines and named and unamed bind paths -->
     <CreateProjectReferenceDefineConstantsAndBindPaths
         ResolvedProjectReferences="@(_ResolvedProjectReferencePaths)"
         ProjectConfigurations="$(VSProjectConfigurations)">
-- 
cgit v1.2.3-55-g6feb