Merge branch 'feature/xplat/core-presentation-avalonia' into xplat-ed…

…itor
stride3d · Feb 27, 2024 · b71176b · b71176b
2 parents c4d6807 + f436ee1
commit b71176b
Show file tree

Hide file tree

Showing 1,159 changed files with 13,708 additions and 17,654 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -400,6 +400,51 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "acastrodev",
+      "name": "Alexandre Castro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6575712?v=4",
+      "profile": "https://github.com/acastrodev",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "SVNMLR",
+      "name": "SVNMLR",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44621949?v=4",
+      "profile": "https://github.com/SVNMLR",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "JeromyWalsh",
+      "name": "Jeromy Walsh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17633767?v=4",
+      "profile": "https://chroniclesofelyria.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "parhamgholami",
+      "name": "Parham Gholami",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7075456?v=4",
+      "profile": "https://pa.rh.am/",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "adrsch",
+      "name": "adrsch",
+      "avatar_url": "https://avatars.githubusercontent.com/u/35346279?v=4",
+      "profile": "https://github.com/adrsch",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -32,4 +32,5 @@
 
 - [ ] My change requires a change to the documentation.
 - [ ] I have added tests to cover my changes.
-- [ ] All new and existing tests passed.
+- [ ] All new and existing tests passed.
+- [ ] **I have built and run the editor to try this change out.**
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ Bin/
 ipch/
 obj/
 .vs/
+.idea/
 Cache/
 /doc/stride_doc_output/
 /build/Stride.version

diff --git a/NuGet.config b/NuGet.config
diff --git a/build/Stride.Android.TestApks.proj b/build/Stride.Android.TestApks.proj
@@ -1,6 +1,5 @@
 <Project DefaultTargets="SignAndroidPackage" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
     <SolutionName>Stride.Android</SolutionName>
     <Platform>Android</Platform>
     <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
@@ -12,8 +11,8 @@
   <Target Name="SignAndroidPackage">
     <MSBuild Projects ="@(ProjectsToBuild)" 
              Targets="SignAndroidPackage"
-             Properties="Configuration=$(Configuration);Platform=$(Platform);SolutionName=$(SolutionName);SolutionDir=$(SolutionDir);AndroidDeploymentMode=AndroidAPKDeployment">
+             Properties="Configuration=$(Configuration);Platform=$(Platform);SolutionName=$(SolutionName);AndroidDeploymentMode=AndroidAPKDeployment">
       <Output ItemName="OutputFiles" TaskParameter="TargetOutputs"/>
     </MSBuild>
   </Target>
-</Project>
+</Project>
diff --git a/build/Stride.Editor.Avalonia.slnf b/build/Stride.Editor.Avalonia.slnf
@@ -41,6 +41,7 @@
       "..\\sources\\engine\\Stride.Video\\Stride.Video.csproj",
       "..\\sources\\engine\\Stride.VirtualReality\\Stride.VirtualReality.csproj",
       "..\\sources\\engine\\Stride\\Stride.csproj",
+      "..\\sources\\presentation\\Stride.Core.Presentation\\Stride.Core.Presentation.csproj",
       "..\\sources\\presentation\\Stride.Core.Quantum\\Stride.Core.Quantum.csproj",
       "..\\sources\\shaders\\Irony\\Irony.csproj",
       "..\\sources\\shaders\\Stride.Core.Shaders\\Stride.Core.Shaders.csproj",
@@ -56,8 +57,8 @@
       "..\\sources\\xplat-editor\\Stride.Core.Assets.Editor.Avalonia\\Stride.Core.Assets.Editor.Avalonia.csproj",
       "..\\sources\\xplat-editor\\Stride.Core.Assets.Editor\\Stride.Core.Assets.Editor.csproj",
       "..\\sources\\xplat-editor\\Stride.Core.Assets.Presentation\\Stride.Core.Assets.Presentation.csproj",
+      "..\\sources\\xplat-editor\\Stride.Core.Presentation.Avalonia\\Stride.Core.Presentation.Avalonia.csproj",
       "..\\sources\\xplat-editor\\Stride.Core.Presentation.Quantum\\Stride.Core.Presentation.Quantum.csproj",
-      "..\\sources\\xplat-editor\\Stride.Core.Presentation\\Stride.Core.Presentation.csproj",
       "..\\sources\\xplat-editor\\Stride.Editor.Avalonia\\Stride.Editor.Avalonia.csproj",
       "..\\sources\\xplat-editor\\Stride.Editor\\Stride.Editor.csproj",
       "..\\sources\\xplat-editor\\Stride.GameStudio.Avalonia.Desktop\\Stride.GameStudio.Avalonia.Desktop.csproj",

diff --git a/build/Stride.Launcher.Build.props b/build/Stride.Launcher.Build.props
@@ -6,6 +6,6 @@
     <!-- Defines the platform used by Stride - Values are Windows/Android/iOS...etc. -->
     <StridePlatform Condition=" '$(StridePlatform)' == '' ">Windows</StridePlatform>
 
-    <StrideEditorTargetFrameworks>net6.0-windows7.0</StrideEditorTargetFrameworks>
+    <StrideEditorTargetFrameworks>net8.0-windows7.0</StrideEditorTargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/build/Stride.Launcher.sln b/build/Stride.Launcher.sln
@@ -21,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.IO", "..\source
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.MicroThreading", "..\sources\core\Stride.Core.MicroThreading\Stride.Core.MicroThreading.csproj", "{076940AD-70F3-47A8-827C-8E722714F937}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Presentation", "..\sources\presentation\Stride.Core.Presentation\Stride.Core.Presentation.csproj", "{61E90191-22FF-4ADC-AFD0-FAB662589AB4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Presentation.Wpf", "..\sources\presentation\Stride.Core.Presentation.Wpf\Stride.Core.Presentation.Wpf.csproj", "{61E90191-22FF-4ADC-AFD0-FAB662589AB4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Presentation.Dialogs", "..\sources\presentation\Stride.Core.Presentation.Dialogs\Stride.Core.Presentation.Dialogs.csproj", "{5EB0493A-076D-4488-AF08-D812FB3FDF7C}"
 EndProject
@@ -31,6 +31,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Translation.Pre
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Packages", "..\sources\assets\Stride.Core.Packages\Stride.Core.Packages.csproj", "{1F5FBA04-C334-41C2-895A-ACC4B786F99E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stride.Core.Presentation", "..\sources\presentation\Stride.Core.Presentation\Stride.Core.Presentation.csproj", "{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		..\sources\assets\Stride.Core.Assets.Yaml\Stride.Core.Assets.Yaml.projitems*{0f8be30e-c41f-4747-b52b-d2d4e13ec6a2}*SharedItemsImports = 5
@@ -99,6 +101,10 @@ Global
 		{1F5FBA04-C334-41C2-895A-ACC4B786F99E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F5FBA04-C334-41C2-895A-ACC4B786F99E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F5FBA04-C334-41C2-895A-ACC4B786F99E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/build/Stride.VisualStudio.sln b/build/Stride.VisualStudio.sln
@@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.VisualStudio.Package
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.VisualStudio.PackageInstall", "..\sources\tools\Stride.VisualStudio.PackageInstall\Stride.VisualStudio.PackageInstall.csproj", "{5A19D2C0-EA79-437A-AE19-8D82D6B93A34}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.VisualStudio.Commands", "..\sources\tools\Stride.VisualStudio.Commands\Stride.VisualStudio.Commands.csproj", "{42D8A705-3C78-44BC-95F3-00047BAF8837}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,8 +35,15 @@ Global
 		{5A19D2C0-EA79-437A-AE19-8D82D6B93A34}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5A19D2C0-EA79-437A-AE19-8D82D6B93A34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A19D2C0-EA79-437A-AE19-8D82D6B93A34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42D8A705-3C78-44BC-95F3-00047BAF8837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42D8A705-3C78-44BC-95F3-00047BAF8837}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42D8A705-3C78-44BC-95F3-00047BAF8837}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42D8A705-3C78-44BC-95F3-00047BAF8837}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\sources\shared\Stride.NuGetResolver.Targets\Stride.NuGetResolver.Targets.projitems*{42d8a705-3c78-44bc-95f3-00047baf8837}*SharedItemsImports = 5
+	EndGlobalSection
 EndGlobal
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,7 @@ Bin/ @@
     ipch/
     obj/
     .vs/
+    .idea/
     Cache/
     /doc/stride_doc_output/
     /build/Stride.version
@@ Expand Down @@