0.3.7.757

rbfx · Feb 19, 2024 · cb02b48 · cb02b48
1 parent 442f5ce
commit cb02b48
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 6 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "unofficial.Urho3DNet.Editor": {
-      "version": "0.3.7.750",
+      "version": "0.3.7.757",
       "commands": [
         "rbfx"
       ]

diff --git a/Content/Common/.gitignore b/Content/Common/.gitignore
@@ -1,5 +1,4 @@
 # Ignore asset cache
-/Cache/
 /Cache.json
 
 # Ignore temporary files

diff --git a/Content/Common/Cache/common_cache.txt b/Content/Common/Cache/common_cache.txt
@@ -0,0 +1 @@
+When editor import files it will place assets in the Cache folder.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Urho3DNetVersion>0.3.7.750</Urho3DNetVersion>
+    <Urho3DNetVersion>0.3.7.757</Urho3DNetVersion>
   </PropertyGroup>
 </Project>
diff --git a/RbfxTemplate.Android/RbfxTemplate.Android.csproj b/RbfxTemplate.Android/RbfxTemplate.Android.csproj
@@ -17,6 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <AndroidAsset Include="../Content/Common/Cache/**">
+      <Link>Cache/%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </AndroidAsset>
     <AndroidAsset Include="../Content/Common/Data/**">
       <Link>Data/%(RecursiveDir)%(FileName)%(Extension)</Link>
     </AndroidAsset>

diff --git a/RbfxTemplate.Desktop/RbfxTemplate.Desktop.csproj b/RbfxTemplate.Desktop/RbfxTemplate.Desktop.csproj
@@ -18,6 +18,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Content Include="../Content/Common/Cache/**">
+      <Link>Cache/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="../Content/Common/Data/**">
       <Link>Data/%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/RbfxTemplate.IOS/RbfxTemplate.IOS.csproj b/RbfxTemplate.IOS/RbfxTemplate.IOS.csproj
@@ -14,6 +14,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<BundleResource Include="../Content/Common/Cache/**">
+			<Link>Cache/%(RecursiveDir)%(FileName)%(Extension)</Link>
+		</BundleResource>
 		<BundleResource Include="../Content/Common/Data/**">
 			<Link>Data/%(RecursiveDir)%(FileName)%(Extension)</Link>
 		</BundleResource>

diff --git a/RbfxTemplate.UWP/RbfxTemplate.UWP.csproj b/RbfxTemplate.UWP/RbfxTemplate.UWP.csproj
@@ -70,7 +70,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
   <PropertyGroup>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
@@ -95,6 +95,12 @@
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="../Content/Common/Cache/**">
+      <Link>Cache/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Pack>true</Pack>
+      <PackagePath>Cache/%(RecursiveDir)%(FileName)%(Extension)</PackagePath>
+    </Content>
     <Content Include="../Content/Common/Data/**">
       <Link>Data/%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/RbfxTemplate/Properties/launchSettings.json b/RbfxTemplate/Properties/launchSettings.json
@@ -3,8 +3,7 @@
     "RBFX Editor": {
       "commandName": "Executable",
       "executablePath": "dotnet",
-      "commandLineArgs":
-        "tool run rbfx $(MSBuildProjectDirectory)/../Content/Common --plugin $(TargetDir)$(TargetFileName)",
+      "commandLineArgs": "tool run rbfx $(MSBuildProjectDirectory)/../Content/Common --single-process --plugin $(TargetDir)$(TargetFileName)",
       "nativeDebugging": true
     }
   }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		When editor import files it will place assets in the Cache folder.