diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2952712..08b534b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,7 +60,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: linux-x64
-          path: Raylib-cs.Native/obj/Release/net6.0/native/raylib/libraylib.so
+          path: Raylib-cs.Native/bin/Release/native/raylib/libraylib.so
           if-no-files-found: error
 
   build-osx:
@@ -93,7 +93,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: osx-${{ matrix.name }}
-          path: Raylib-cs.Native/obj/Release/net6.0/native/raylib/libraylib.dylib
+          path: Raylib-cs.Native/bin/Release/native/raylib/libraylib.dylib
           if-no-files-found: error
 
   build-windows:
@@ -126,7 +126,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: win-${{ matrix.name }}
-          path: Raylib-cs.Native/obj/Release/net6.0/native/raylib/Release/raylib.dll
+          path: Raylib-cs.Native/bin/Release/native/raylib/Release/raylib.dll
           if-no-files-found: error
 
   build-publish:
diff --git a/Raylib-cs.Native/Raylib-cs.Native.csproj b/Raylib-cs.Native/Raylib-cs.Native.csproj
index 1fbe25a..355beb6 100644
--- a/Raylib-cs.Native/Raylib-cs.Native.csproj
+++ b/Raylib-cs.Native/Raylib-cs.Native.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk" InitialTargets="ConfigureNative">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <AssemblyName>Raylib-cs.Native</AssemblyName>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
   <Import Project="../Raylib-cs/Build.props" />
@@ -24,34 +24,35 @@
 
   <ItemGroup>
     <Content
-      Include="$(IntermediateOutputPath)native/raylib/$(NativePre)raylib.$(NativeExt)"
+      Include="$(OutputPath)native/raylib/$(NativePre)raylib.$(NativeExt)"
       Link="%(Filename)%(Extension)"
       CopyToOutputDirectory="PreserveNewest"
-      Condition="Exists('$(IntermediateOutputPath)native/raylib/$(NativePre)raylib.$(NativeExt)')" />
-    <CMakeArgs Include="-B $(IntermediateOutputPath)native" />
-    <CMakeArgs Include="-S $(IntermediateOutputPath)raylib-$(TargetRaylibTag)" />
+      Condition="Exists('$(OutputPath)native/raylib/$(NativePre)raylib.$(NativeExt)')" />
+
+    <CMakeArgs Include="-B $(OutputPath)native" />
+    <CMakeArgs Include="-S $(BaseIntermediateOutputPath)raylib-$(TargetRaylibTag)" />
     <CMakeArgs Include="-D CMAKE_BUILD_TYPE=$(Configuration)" />
     <CMakeArgs Include="-D BUILD_SHARED_LIBS=ON" />
     <CMakeArgs Include="-D BUILD_EXAMPLES=OFF" />
     <!-- <CMakeArgs Include="-D GRAPHICS=GRAPHICS_API_OPENGL_43" /> -->
   </ItemGroup>
 
-  <Target Name="ConfigureNative" BeforeTargets="BuildNative" Condition="$(SkipLocalBuild) != true">
+  <Target Name="ConfigureNative" Condition="$(SkipLocalBuild) != true">
     <DownloadFile
       SourceUrl="https://github.com/raysan5/raylib/archive/refs/tags/$(TargetRaylibTag).zip"
-      DestinationFolder="$(IntermediateOutputPath)"
+      DestinationFolder="$(BaseIntermediateOutputPath)"
       DestinationFileName="raylib.zip"
-      Condition="!Exists('$(IntermediateOutputPath)raylib.zip')" />
-    <Unzip
-      SourceFiles="$(IntermediateOutputPath)raylib.zip"
-      DestinationFolder="$(IntermediateOutputPath)"
-      OverwriteReadOnlyFiles="true"
-      Condition="!Exists('$(IntermediateOutputPath)raylib-$(TargetRaylibTag)')" />
-    <Exec Command="cmake @(CMakeArgs, ' ') $(CMakeExtraArgs)"
-      Condition="!Exists('$(IntermediateOutputPath)native/CMakeCache.txt')" />
-  </Target>
+      Condition="!Exists('$(BaseIntermediateOutputPath)raylib.zip')" />
 
-  <Target Name="BuildNative" BeforeTargets="BeforeBuild" Condition="$(SkipLocalBuild) != true">
-    <Exec Command="cmake --build $(IntermediateOutputPath)native --config $(Configuration)" />
+    <Unzip
+      SourceFiles="$(BaseIntermediateOutputPath)raylib.zip"
+      DestinationFolder="$(BaseIntermediateOutputPath)"
+      OverwriteReadOnlyFiles="true"
+      Condition="!Exists('$(BaseIntermediateOutputPath)raylib-$(TargetRaylibTag)')" />
+    
+    <Exec Command="cmake @(CMakeArgs, ' ') $(CMakeExtraArgs)"
+      Condition="!Exists('$(BaseIntermediateOutputPath)native/CMakeCache.txt')" />
+
+    <Exec Command="cmake --build $(OutputPath)native --config $(Configuration)" />
   </Target>
 </Project>