From 666f928da43480de013e6b660474646f4851d846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Fri, 4 Oct 2019 18:06:15 -0700
Subject: [PATCH 1/2] Run _GenerateResxSource target before BeforeCompile
 target. (#4062)

The Common.targets convention is to hook code-generation targets to BeforeCompile.
Fixes https://github.com/dotnet/sourcelink/issues/392
---
 .../tools/GenerateResxSource.targets                         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateResxSource.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateResxSource.targets
index 986cdd4c5fd..d7292b0f2a6 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateResxSource.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateResxSource.targets
@@ -18,8 +18,11 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <!--
+    Note: Targets that generate Compile items are expected to run before BeforeCompile targets (common targets convention).
+  -->
   <Target Name="_GenerateResxSource"
-          BeforeTargets="CoreCompile"
+          BeforeTargets="BeforeCompile"
           DependsOnTargets="PrepareResourceNames;
                             _GetEmbeddedResourcesWithSourceGeneration;
                             _BatchGenerateResxSource">

From 7953c20e4cace1f37c6c138ab097600ed0d94206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Wed, 16 Oct 2019 14:52:46 -0700
Subject: [PATCH 2/2] Change BeforeTargets of _GenerateResxSource to
 BeforeCompile;CoreCompile (#4134)

---
 .../tools/GenerateResxSource.targets                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateResxSource.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateResxSource.targets
index d7292b0f2a6..a70496f10c8 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateResxSource.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateResxSource.targets
@@ -22,7 +22,7 @@
     Note: Targets that generate Compile items are expected to run before BeforeCompile targets (common targets convention).
   -->
   <Target Name="_GenerateResxSource"
-          BeforeTargets="BeforeCompile"
+          BeforeTargets="BeforeCompile;CoreCompile"
           DependsOnTargets="PrepareResourceNames;
                             _GetEmbeddedResourcesWithSourceGeneration;
                             _BatchGenerateResxSource">