From 996270e214674d4ffdc0ccd130d6d2c47d949fa9 Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Thu, 24 Oct 2024 21:08:25 +0200
Subject: [PATCH] Try to fix index/main

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
---
 src/Raylib.NET.Native/Raylib.NET.Native.csproj       | 12 ++++++------
 .../buildTransitive/Raylib.NET.Native.props          |  6 ++----
 .../buildTransitive/Raylib.NET.Native.targets        |  3 +--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/Raylib.NET.Native/Raylib.NET.Native.csproj b/src/Raylib.NET.Native/Raylib.NET.Native.csproj
index 0f693b6..4d552e2 100644
--- a/src/Raylib.NET.Native/Raylib.NET.Native.csproj
+++ b/src/Raylib.NET.Native/Raylib.NET.Native.csproj
@@ -130,16 +130,16 @@
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <PackagePath>runtimes/</PackagePath>
         </Content>
-        <Content Include="index.html" Link="index.html" Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
+        <Content Include="index.html"">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <PackagePath>runtimes/$(RuntimeIdentifier)/native</PackagePath>
+            <PackagePath>runtimes/browser-wasm/native/</PackagePath>
         </Content>
-        <Content Include="main.js" Link="main.js" Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
+        <Content Include="main.js">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <PackagePath>runtimes/$(RuntimeIdentifier)/native</PackagePath>
+            <PackagePath>runtimes/browser-wasm/native/</PackagePath>
         </Content>
-        <None Pack="true" Include="buildTransitive/Raylib.NET.Native.props" PackagePath="buildTransitive/Raylib.NET.Native.props"/>
-        <None Pack="true" Include="buildTransitive/Raylib.NET.Native.targets" PackagePath="buildTransitive/Raylib.NET.Native.targets"/>
+        <None Pack="true" Include="buildTransitive/Raylib.NET.Native.props" PackagePath="buildTransitive/$(PackageId).props"/>
+        <None Pack="true" Include="buildTransitive/Raylib.NET.Native.targets" PackagePath="buildTransitive/$(PackageId).targets"/>
     </ItemGroup>
 
     <Target Name="CompileNatives" AfterTargets="Build" Condition="'$(SkipNatives)' != 'true'">
diff --git a/src/Raylib.NET.Native/buildTransitive/Raylib.NET.Native.props b/src/Raylib.NET.Native/buildTransitive/Raylib.NET.Native.props
index b2aefcb..7314c65 100644
--- a/src/Raylib.NET.Native/buildTransitive/Raylib.NET.Native.props
+++ b/src/Raylib.NET.Native/buildTransitive/Raylib.NET.Native.props
@@ -1,13 +1,11 @@
-<Project>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
+    <!-- Build native code for WASM -->
     <WasmBuildNative>true</WasmBuildNative>
-
     <!-- Reduces file size by a lot -->
     <InvariantGlobalization>true</InvariantGlobalization>
-
     <!-- ASYNCIFY and exception handling dont rly work together -->
     <WasmEnableExceptionHandling>false</WasmEnableExceptionHandling>
-
     <!-- Enable ASYNCIFY, needed for main loop -->
     <EmccFlags>-s USE_GLFW=3 -sASYNCIFY=1 -O3</EmccFlags>
   </PropertyGroup>
diff --git a/src/Raylib.NET.Native/buildTransitive/Raylib.NET.Native.targets b/src/Raylib.NET.Native/buildTransitive/Raylib.NET.Native.targets
index c93d51f..4f7bbc5 100644
--- a/src/Raylib.NET.Native/buildTransitive/Raylib.NET.Native.targets
+++ b/src/Raylib.NET.Native/buildTransitive/Raylib.NET.Native.targets
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<Project>
+<Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
     <NativeFileReference Include="$(OutputPath)raylib.a"/>
     <WasmExtraFilesToDeploy Include="$(OutputPath)index.html"/>