Merge pull request #1842 from mono/ILPkgBuild

Allow illink pkg to be referenced directly
dotnet · Feb 18, 2021 · b3d8adb · b3d8adb
2 parents 422f2f7 + 437eeeb
commit b3d8adb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj
@@ -30,9 +30,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="Sdk/Sdk.props">
-      <PackagePath>Sdk</PackagePath>
-    </Content>
+    <Content Include="sdk/Sdk.props" PackagePath="sdk" />
+    <Content Include="build/$(PackageId).props" PackagePath="build" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ILLink.Tasks/Sdk/Sdk.props → ...ks/build/Microsoft.NET.ILLink.Tasks.props b/src/ILLink.Tasks/Sdk/Sdk.props → ...ks/build/Microsoft.NET.ILLink.Tasks.props
@@ -1,6 +1,6 @@
 <!--
 ***********************************************************************************************
-Sdk.props
+Microsoft.NET.ILLink.Tasks.props
 
 WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
           created a backup copy.  Incorrect changes to this file will make it

diff --git a/src/ILLink.Tasks/sdk/Sdk.props b/src/ILLink.Tasks/sdk/Sdk.props
@@ -0,0 +1,16 @@
+<!--
+***********************************************************************************************
+Sdk.props
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project>
+
+  <Import Project="..\build\Microsoft.NET.ILLink.Tasks.props" />
+
+</Project>