From de1b73456711d1432b9798affe18c32b3bd63232 Mon Sep 17 00:00:00 2001
From: Juan Sebastian Hoyos Ayala <juan.hoyos@microsoft.com>
Date: Fri, 20 May 2022 02:04:26 -0700
Subject: [PATCH 1/2] Fix native sourcelink support

---
 eng/versioning.targets           | 10 +++++++++-
 src/coreclr/runtime-prereqs.proj | 14 +++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/eng/versioning.targets b/eng/versioning.targets
index 9a4ea04f85d001..85f6eb4609d075 100644
--- a/eng/versioning.targets
+++ b/eng/versioning.targets
@@ -178,10 +178,18 @@
   </Target>
 
   <Target Name="GenerateNativeSourcelinkFile"
-          DependsOnTargets="GenerateSourceLinkFile"
           Condition="'$(DisableSourceLink)' != 'true'"
+          DependsOnTargets="_CopyGeneratedSourcelinkFile;_VerifyNativeSourceLinkFileExists" />
+
+  <Target Name="_CopyGeneratedSourcelinkFile"
+          DependsOnTargets="GenerateSourceLinkFile"
           Inputs="$(SourceLink)" Outputs="$(NativeSourceLinkFile)">
     <Error Condition="'$(NativeSourceLinkFile)' == ''" Text="Please set NativeSourceLinkFile to forward appropriate information for sourcelink."/>
     <Copy SourceFiles="$(SourceLink)" DestinationFiles="$(NativeSourceLinkFile)" />
   </Target>
+
+  <Target Name="_VerifyNativeSourceLinkFileExists"
+          Condition="'$(VerifySourceLinkFileExists)' == true">
+    <Error Condition="!Exists('$(NativeSourceLinkFile)')" Text="Native SourceLink file could not be made available to the native build. Ensure that $(MSBuildProjectName) ran the sourcelink targets."/>
+  </Target>
 </Project>
diff --git a/src/coreclr/runtime-prereqs.proj b/src/coreclr/runtime-prereqs.proj
index 00f4ea1025279e..2af3065c4ac5d0 100644
--- a/src/coreclr/runtime-prereqs.proj
+++ b/src/coreclr/runtime-prereqs.proj
@@ -1,9 +1,12 @@
-<Project Sdk="Microsoft.Build.NoTargets">
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.Build.NoTargets" />
   <PropertyGroup>
     <NativeVersionFile Condition="$([MSBuild]::IsOsPlatform(Windows))">$(ArtifactsObjDir)_version.h</NativeVersionFile>
     <NativeVersionFile Condition="!$([MSBuild]::IsOsPlatform(Windows))">$(ArtifactsObjDir)_version.c</NativeVersionFile>
     <RuntimeVersionFile>$(ArtifactsObjDir)runtime_version.h</RuntimeVersionFile>
     <NativeSourceLinkFile>$(ArtifactsObjDir)native.sourcelink.json</NativeSourceLinkFile>
+    <VerifySourceLinkFileExists>false</VerifySourceLinkFileExists>
+    <VerifySourceLinkFileExists Condition="'$(ContinuousIntegrationBuild)' == 'true'">true</VerifySourceLinkFileExists>
     <AssemblyName>.NET Runtime</AssemblyName>
   </PropertyGroup>
 
@@ -11,4 +14,13 @@
   <Import Project="$(RepositoryEngineeringDir)nativepgo.targets" />
 
   <Target Name="BuildPrereqs" BeforeTargets="Build" DependsOnTargets="GenerateRuntimeVersionFile;GenerateNativeSourcelinkFile;OutputPgoPathForCI" />
+  <Import Project="Sdk.Targets" Sdk="Microsoft.Build.NoTargets" />
+  <!--
+    This is relatively ugly. The NoTargets SDK sets DebugType=None, but that makes it such that the sourcelink targets
+    don't run, and we wouldn't generate the sourcelink file for native compilation. It would be better if we could call
+    the target directly and have it generate the file, but it's guarded by this property anyway...
+  -->
+  <PropertyGroup>
+    <DebugType>Portable</DebugType>
+  </PropertyGroup>
 </Project>

From 3ce98efc627a67dc332749f72f2e4d18858a3b4a Mon Sep 17 00:00:00 2001
From: Juan Hoyos <juan.hoyos@microsoft.com>
Date: Fri, 20 May 2022 10:38:02 -0700
Subject: [PATCH 2/2] Correctly case Sdk.Targets

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 src/coreclr/runtime-prereqs.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/runtime-prereqs.proj b/src/coreclr/runtime-prereqs.proj
index 2af3065c4ac5d0..5d660044a096c7 100644
--- a/src/coreclr/runtime-prereqs.proj
+++ b/src/coreclr/runtime-prereqs.proj
@@ -14,7 +14,7 @@
   <Import Project="$(RepositoryEngineeringDir)nativepgo.targets" />
 
   <Target Name="BuildPrereqs" BeforeTargets="Build" DependsOnTargets="GenerateRuntimeVersionFile;GenerateNativeSourcelinkFile;OutputPgoPathForCI" />
-  <Import Project="Sdk.Targets" Sdk="Microsoft.Build.NoTargets" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.Build.NoTargets" />
   <!--
     This is relatively ugly. The NoTargets SDK sets DebugType=None, but that makes it such that the sourcelink targets
     don't run, and we wouldn't generate the sourcelink file for native compilation. It would be better if we could call