[Build] Temporary workaround for .NET Core 3.0 new runtime identifier…

… system (credits go to Solr for finding this fix)
stride3d · Oct 2, 2019 · 4a624c6 · 4a624c6
1 parent aa48bc6
commit 4a624c6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/sources/engine/Xenko/Xenko.csproj b/sources/engine/Xenko/Xenko.csproj
@@ -28,6 +28,10 @@
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <None Include="build\**\*.targets" PackagePath="build\" Pack="true" />
+    <None Include="build\**\*.props" PackagePath="build\" Pack="true" />
+    <None Include="build\**\*.targets" PackagePath="buildTransitive\" Pack="true" />
+    <None Include="build\**\*.props" PackagePath="buildTransitive\" Pack="true" />
     <None Include="runtime.json" Pack="true" PackagePath="/">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>

diff --git a/sources/engine/Xenko/build/Xenko.targets b/sources/engine/Xenko/build/Xenko.targets
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- 
+  *****************************************************************************************************************************
+  Runtime identifiers
+  *****************************************************************************************************************************
+  -->
+  <PropertyGroup>
+    <!-- Temporary workaround for https://github.com/NuGet/Home/issues/7351 (necessary since VS2019 includes .NET Core 3)
+         We need to figure out a better way to handle RID and solve this. -->
+    <RuntimeIdentifierGraphPath></RuntimeIdentifierGraphPath>
+  </PropertyGroup>
+</Project>