diff --git a/build/Stride.Android.sln b/build/Stride.Android.sln index fac9a110ba..1605299cff 100644 --- a/build/Stride.Android.sln +++ b/build/Stride.Android.sln @@ -1,6 +1,7 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 18 -VisualStudioVersion = 18.0.11205.157 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 18.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "10-CoreRuntime", "10-CoreRuntime", "{2E93E2B5-4500-4E47-9B65-E705218AB578}" EndProject @@ -8,12 +9,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "20-StrideRuntime", "20-Stri EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Targets.Private", "{97978864-95DD-43A6-9159-AA1C881BE99F}" ProjectSection(SolutionItems) = preProject - ..\sources\native\Stride.Native.targets = ..\sources\native\Stride.Native.targets + ..\sources\Directory.Packages.props = ..\sources\Directory.Packages.props + ..\nuget.config = ..\nuget.config + ..\sources\targets\Stride.Core.CompilerServices.props = ..\sources\targets\Stride.Core.CompilerServices.props ..\sources\targets\Stride.Core.PostSettings.Dependencies.targets = ..\sources\targets\Stride.Core.PostSettings.Dependencies.targets ..\sources\targets\Stride.Core.props = ..\sources\targets\Stride.Core.props + ..\sources\targets\Stride.Core.TargetFrameworks.Editor.props = ..\sources\targets\Stride.Core.TargetFrameworks.Editor.props ..\sources\targets\Stride.Core.targets = ..\sources\targets\Stride.Core.targets ..\sources\targets\Stride.GraphicsApi.Dev.targets = ..\sources\targets\Stride.GraphicsApi.Dev.targets ..\sources\targets\Stride.GraphicsApi.PackageReference.targets = ..\sources\targets\Stride.GraphicsApi.PackageReference.targets + ..\sources\native\Stride.Native.targets = ..\sources\native\Stride.Native.targets ..\sources\targets\Stride.PackageVersion.targets = ..\sources\targets\Stride.PackageVersion.targets ..\sources\targets\Stride.props = ..\sources\targets\Stride.props ..\sources\targets\Stride.targets = ..\sources\targets\Stride.targets @@ -30,7 +35,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Config", "00-Config", "{ ..\sources\shared\SharedAssemblyInfo.cs = ..\sources\shared\SharedAssemblyInfo.cs EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stride.Shared", "Stride.Shared", "{1AC70118-C90F-4EC6-9D8B-C628BDF900F7}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "21-StrideRuntime.Tests", "21-StrideRuntime.Tests", "{A7ED9F01-7D78-4381-90A6-D50E51C17250}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "11-CoreRuntime.Tests", "11-CoreRuntime.Tests", "{22ADD4CD-092E-4ADC-A21E-64CF42230152}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Build", "00-Targets.Build", "{0B81090E-4066-4723-A658-8AEDBEADE619}" ProjectSection(SolutionItems) = preProject @@ -43,27 +50,26 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Build", "00-Targ EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Engine", "..\sources\engine\Stride.Engine\Stride.Engine.csproj", "{C121A566-555E-42B9-9B0A-1696529A9088}" - ProjectSection(ProjectDependencies) = postProject - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F} = {F2D52EDB-BC17-4243-B06D-33CD20F87A7F} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Graphics", "..\sources\engine\Stride.Graphics\Stride.Graphics.csproj", "{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Engine.Tests.Android", "..\sources\engine\Stride.Engine.Tests\Stride.Engine.Tests.Android.csproj", "{A8F8D125-7A22-489F-99BC-9A02F545A17F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Input.Tests.Android", "..\sources\engine\Stride.Input.Tests\Stride.Input.Tests.Android.csproj", "{01700344-CF44-482C-BEBC-60213B0F844C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Tests.Android", "..\sources\core\Stride.Core.Tests\Stride.Core.Tests.Android.csproj", "{5AA408BA-E766-453E-B661-E3D7EC46E2A6}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Shaders", "..\sources\shaders\Stride.Core.Shaders\Stride.Core.Shaders.csproj", "{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}" - ProjectSection(ProjectDependencies) = postProject - {5210FB81-B807-49BB-AF0D-31FB6A83A572} = {5210FB81-B807-49BB-AF0D-31FB6A83A572} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Irony", "..\sources\shaders\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Games", "..\sources\engine\Stride.Games\Stride.Games.csproj", "{42780CBD-3FE7-48E3-BD5B-59945EA20137}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Audio.Tests.Android", "..\sources\engine\Stride.Audio.Tests\Stride.Audio.Tests.Android.csproj", "{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core", "..\sources\core\Stride.Core\Stride.Core.csproj", "{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Mathematics", "..\sources\core\Stride.Core.Mathematics\Stride.Core.Mathematics.csproj", "{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}" - ProjectSection(ProjectDependencies) = postProject - {5210FB81-B807-49BB-AF0D-31FB6A83A572} = {5210FB81-B807-49BB-AF0D-31FB6A83A572} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Serialization", "..\sources\core\Stride.Core.Serialization\Stride.Core.Serialization.csproj", "{5210FB81-B807-49BB-AF0D-31FB6A83A572}" EndProject @@ -84,9 +90,10 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Input", "..\sources\engine\Stride.Input\Stride.Input.csproj", "{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.UI", "..\sources\engine\Stride.UI\Stride.UI.csproj", "{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}" - ProjectSection(ProjectDependencies) = postProject - {C121A566-555E-42B9-9B0A-1696529A9088} = {C121A566-555E-42B9-9B0A-1696529A9088} - EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.UI.Tests.Android", "..\sources\engine\Stride.UI.Tests\Stride.UI.Tests.Android.csproj", "{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Graphics.Regression", "..\sources\engine\Stride.Graphics.Regression\Stride.Graphics.Regression.csproj", "{D002FEB1-00A6-4AB1-A83F-1F253465E64D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Physics", "..\sources\engine\Stride.Physics\Stride.Physics.csproj", "{DD592516-B341-40FE-9100-1B0FA784A060}" EndProject @@ -94,9 +101,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.SpriteStudio.Runtime EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Particles", "..\sources\engine\Stride.Particles\Stride.Particles.csproj", "{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Games.Testing", "..\sources\engine\Stride.Games.Testing\Stride.Games.Testing.csproj", "{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Native", "..\sources\engine\Stride.Native\Stride.Native.csproj", "{1DBBC150-F085-43EF-B41D-27C72D133770}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Stride.Refactor", "..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.shproj", "{B33E576F-2279-4BFC-A438-D9B84343B56B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Particles.Tests.Android", "..\sources\engine\Stride.Particles.Tests\Stride.Particles.Tests.Android.csproj", "{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Physics.Tests.Android", "..\sources\engine\Stride.Physics.Tests\Stride.Physics.Tests.Android.csproj", "{4F0E7E04-F067-4CE8-B8C8-1105F319D123}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.VirtualReality", "..\sources\engine\Stride.VirtualReality\Stride.VirtualReality.csproj", "{53782603-3096-40C2-ABD3-F8F311BAE4BE}" EndProject @@ -130,133 +141,272 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr", "fr", "{62E9A8E4-79AF- EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Rendering", "..\sources\engine\Stride.Rendering\Stride.Rendering.csproj", "{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Voxels", "..\sources\engine\Stride.Voxels\Stride.Voxels.csproj", "{66BE41FC-FC52-48D0-9C04-BCE8CC393020}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.CompilerServices.Tests", "..\sources\core\Stride.Core.CompilerServices.Tests\Stride.Core.CompilerServices.Tests.csproj", "{BACD76E5-35D0-4389-9BB9-8743AC4D89DE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stride.Bepu", "Stride.Bepu", "{DE048114-9AE4-467E-A879-188DC0D88A59}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.BepuPhysics", "..\sources\engine\Stride.BepuPhysics\Stride.BepuPhysics\Stride.BepuPhysics.csproj", "{3E424688-EC44-4DFB-9FC0-4BB1F0683651}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.BepuPhysics.Debug", "..\sources\engine\Stride.BepuPhysics\Stride.BepuPhysics.Debug\Stride.BepuPhysics.Debug.csproj", "{7715D094-DF59-4D91-BC9A-9A5118039ECB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.BepuPhysics.Tests", "..\sources\engine\Stride.BepuPhysics\Stride.BepuPhysics.Tests\Stride.BepuPhysics.Tests.csproj", "{7B70C783-4085-4702-B3C6-6570FD85CB8F}" +EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{b33e576f-2279-4bfc-a438-d9b84343b56b}*SharedItemsImports = 13 - ..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 5 - ..\sources\shared\Stride.Core.ShellHelper\Stride.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 5 - ..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{fb06c76a-6bb7-40be-9afa-fec13b045fb5}*SharedItemsImports = 5 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Android = Debug|Android - Release|Android = Release|Android + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Android.ActiveCfg = Debug|Any CPU - {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Android.Build.0 = Debug|Any CPU - {C121A566-555E-42B9-9B0A-1696529A9088}.Release|Android.ActiveCfg = Release|Any CPU - {C121A566-555E-42B9-9B0A-1696529A9088}.Release|Android.Build.0 = Release|Any CPU - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Android.ActiveCfg = Debug|Any CPU - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Android.Build.0 = Debug|Any CPU - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Android.ActiveCfg = Release|Any CPU - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Android.Build.0 = Release|Any CPU - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Android.ActiveCfg = Debug|Any CPU - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Android.Build.0 = Debug|Any CPU - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Android.Deploy.0 = Debug|Any CPU - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Android.ActiveCfg = Release|Any CPU - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Android.Build.0 = Release|Any CPU - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Android.Deploy.0 = Release|Any CPU - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Android.ActiveCfg = Debug|Any CPU - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Android.Build.0 = Debug|Any CPU - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Android.Deploy.0 = Debug|Any CPU - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Android.ActiveCfg = Release|Any CPU - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Android.Build.0 = Release|Any CPU - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Android.Deploy.0 = Release|Any CPU - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Android.ActiveCfg = Debug|Any CPU - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Android.Build.0 = Debug|Any CPU - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Android.ActiveCfg = Release|Any CPU - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Android.Build.0 = Release|Any CPU - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Android.ActiveCfg = Debug|Any CPU - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Android.Build.0 = Debug|Any CPU - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Android.ActiveCfg = Release|Any CPU - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Android.Build.0 = Release|Any CPU - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Android.ActiveCfg = Debug|Any CPU - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Android.Build.0 = Debug|Any CPU - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Android.ActiveCfg = Release|Any CPU - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Android.Build.0 = Release|Any CPU - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Android.ActiveCfg = Debug|Any CPU - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Android.Build.0 = Debug|Any CPU - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Android.ActiveCfg = Release|Any CPU - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Android.Build.0 = Release|Any CPU - {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Android.ActiveCfg = Debug|Any CPU - {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Android.Build.0 = Debug|Any CPU - {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Android.ActiveCfg = Release|Any CPU - {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Android.Build.0 = Release|Any CPU - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Android.ActiveCfg = Debug|Any CPU - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Android.Build.0 = Debug|Any CPU - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Android.ActiveCfg = Release|Any CPU - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Android.Build.0 = Release|Any CPU - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Android.ActiveCfg = Debug|Any CPU - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Android.Build.0 = Debug|Any CPU - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Android.ActiveCfg = Release|Any CPU - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Android.Build.0 = Release|Any CPU - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Android.ActiveCfg = Debug|Any CPU - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Android.Build.0 = Debug|Any CPU - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Android.ActiveCfg = Release|Any CPU - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Android.Build.0 = Release|Any CPU - {DE042125-C270-4D1D-9270-0759C167567A}.Debug|Android.ActiveCfg = Debug|Any CPU - {DE042125-C270-4D1D-9270-0759C167567A}.Debug|Android.Build.0 = Debug|Any CPU - {DE042125-C270-4D1D-9270-0759C167567A}.Release|Android.ActiveCfg = Release|Any CPU - {DE042125-C270-4D1D-9270-0759C167567A}.Release|Android.Build.0 = Release|Any CPU - {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Android.ActiveCfg = Debug|Any CPU - {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Android.Build.0 = Debug|Any CPU - {72390339-B2A1-4F61-A800-31ED0975B515}.Release|Android.ActiveCfg = Release|Any CPU - {72390339-B2A1-4F61-A800-31ED0975B515}.Release|Android.Build.0 = Release|Any CPU - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Android.ActiveCfg = Debug|Any CPU - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Android.Build.0 = Debug|Any CPU - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Android.ActiveCfg = Release|Any CPU - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Android.Build.0 = Release|Any CPU - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Android.ActiveCfg = Debug|Any CPU - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Android.Build.0 = Debug|Any CPU - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Android.ActiveCfg = Release|Any CPU - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Android.Build.0 = Release|Any CPU - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Android.ActiveCfg = Debug|Any CPU - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Android.Build.0 = Debug|Any CPU - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Android.ActiveCfg = Release|Any CPU - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Android.Build.0 = Release|Any CPU - {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Android.ActiveCfg = Debug|Any CPU - {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Android.Build.0 = Debug|Any CPU - {DD592516-B341-40FE-9100-1B0FA784A060}.Release|Android.ActiveCfg = Release|Any CPU - {DD592516-B341-40FE-9100-1B0FA784A060}.Release|Android.Build.0 = Release|Any CPU - {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Android.ActiveCfg = Debug|Any CPU - {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Android.Build.0 = Debug|Any CPU - {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Android.ActiveCfg = Release|Any CPU - {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Android.Build.0 = Release|Any CPU - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Android.ActiveCfg = Debug|Any CPU - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Android.Build.0 = Debug|Any CPU - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Android.ActiveCfg = Release|Any CPU - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Android.Build.0 = Release|Any CPU - {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Android.ActiveCfg = Debug|Any CPU - {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Android.Build.0 = Debug|Any CPU - {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Android.ActiveCfg = Release|Any CPU - {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Android.Build.0 = Release|Any CPU - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Android.ActiveCfg = Debug|Any CPU - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Android.Build.0 = Debug|Any CPU - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Android.ActiveCfg = Release|Any CPU - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Android.Build.0 = Release|Any CPU - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Android.ActiveCfg = Debug|Any CPU - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Android.Build.0 = Debug|Any CPU - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Android.ActiveCfg = Release|Any CPU - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Android.Build.0 = Release|Any CPU - {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Android.ActiveCfg = Debug|Any CPU - {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Android.Build.0 = Debug|Any CPU - {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Android.ActiveCfg = Release|Any CPU - {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Android.Build.0 = Release|Any CPU - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Android.ActiveCfg = Debug|Any CPU - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Android.Build.0 = Debug|Any CPU - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Android.ActiveCfg = Release|Any CPU - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Android.Build.0 = Release|Any CPU + {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {C121A566-555E-42B9-9B0A-1696529A9088}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C121A566-555E-42B9-9B0A-1696529A9088}.Release|Any CPU.Build.0 = Release|Any CPU + {C121A566-555E-42B9-9B0A-1696529A9088}.Release|Any CPU.Deploy.0 = Release|Any CPU + {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Any CPU.Build.0 = Release|Any CPU + {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Any CPU.Deploy.0 = Release|Any CPU + {A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Any CPU.Build.0 = Release|Any CPU + {A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Any CPU.Deploy.0 = Release|Any CPU + {01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {01700344-CF44-482C-BEBC-60213B0F844C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01700344-CF44-482C-BEBC-60213B0F844C}.Release|Any CPU.Build.0 = Release|Any CPU + {01700344-CF44-482C-BEBC-60213B0F844C}.Release|Any CPU.Deploy.0 = Release|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Any CPU.Build.0 = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Any CPU.Deploy.0 = Debug|Any CPU + {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Any CPU.Build.0 = Release|Any CPU + {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Any CPU.Deploy.0 = Release|Any CPU + {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.Build.0 = Release|Any CPU + {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.Deploy.0 = Release|Any CPU + {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Any CPU.Build.0 = Release|Any CPU + {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Any CPU.Deploy.0 = Release|Any CPU + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Any CPU.Build.0 = Release|Any CPU + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Any CPU.Deploy.0 = Release|Any CPU + {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Any CPU.Build.0 = Release|Any CPU + {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Any CPU.Deploy.0 = Release|Any CPU + {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Any CPU.Build.0 = Release|Any CPU + {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Any CPU.Deploy.0 = Release|Any CPU + {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Any CPU.Build.0 = Release|Any CPU + {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Any CPU.Deploy.0 = Release|Any CPU + {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Any CPU.Build.0 = Release|Any CPU + {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Any CPU.Deploy.0 = Release|Any CPU + {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Any CPU.Build.0 = Release|Any CPU + {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Any CPU.Deploy.0 = Release|Any CPU + {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Any CPU.Build.0 = Release|Any CPU + {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Any CPU.Deploy.0 = Release|Any CPU + {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Any CPU.Build.0 = Release|Any CPU + {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Any CPU.Deploy.0 = Release|Any CPU + {DE042125-C270-4D1D-9270-0759C167567A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DE042125-C270-4D1D-9270-0759C167567A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DE042125-C270-4D1D-9270-0759C167567A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {DE042125-C270-4D1D-9270-0759C167567A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DE042125-C270-4D1D-9270-0759C167567A}.Release|Any CPU.Build.0 = Release|Any CPU + {DE042125-C270-4D1D-9270-0759C167567A}.Release|Any CPU.Deploy.0 = Release|Any CPU + {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {72390339-B2A1-4F61-A800-31ED0975B515}.Release|Any CPU.ActiveCfg = Release|Any CPU + {72390339-B2A1-4F61-A800-31ED0975B515}.Release|Any CPU.Build.0 = Release|Any CPU + {72390339-B2A1-4F61-A800-31ED0975B515}.Release|Any CPU.Deploy.0 = Release|Any CPU + {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Any CPU.Build.0 = Release|Any CPU + {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Any CPU.Deploy.0 = Release|Any CPU + {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Any CPU.Build.0 = Release|Any CPU + {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Any CPU.Deploy.0 = Release|Any CPU + {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Any CPU.Build.0 = Release|Any CPU + {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Any CPU.Deploy.0 = Release|Any CPU + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Any CPU.Build.0 = Release|Any CPU + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Any CPU.Deploy.0 = Release|Any CPU + {D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Any CPU.Build.0 = Release|Any CPU + {D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Any CPU.Deploy.0 = Release|Any CPU + {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {DD592516-B341-40FE-9100-1B0FA784A060}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD592516-B341-40FE-9100-1B0FA784A060}.Release|Any CPU.Build.0 = Release|Any CPU + {DD592516-B341-40FE-9100-1B0FA784A060}.Release|Any CPU.Deploy.0 = Release|Any CPU + {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Any CPU.Build.0 = Release|Any CPU + {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Any CPU.Deploy.0 = Release|Any CPU + {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Any CPU.Build.0 = Release|Any CPU + {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Any CPU.Deploy.0 = Release|Any CPU + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Any CPU.Build.0 = Release|Any CPU + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Any CPU.Deploy.0 = Release|Any CPU + {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Any CPU.Build.0 = Release|Any CPU + {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Any CPU.Deploy.0 = Release|Any CPU + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Any CPU.Build.0 = Debug|Any CPU + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Any CPU.ActiveCfg = Release|Any CPU + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Any CPU.Build.0 = Release|Any CPU + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Any CPU.Deploy.0 = Release|Any CPU + {4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Any CPU.Build.0 = Release|Any CPU + {4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Any CPU.Deploy.0 = Release|Any CPU + {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Any CPU.Build.0 = Release|Any CPU + {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Any CPU.Deploy.0 = Release|Any CPU + {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Any CPU.Build.0 = Release|Any CPU + {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Any CPU.Deploy.0 = Release|Any CPU + {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Any CPU.Build.0 = Release|Any CPU + {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Any CPU.Deploy.0 = Release|Any CPU + {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Any CPU.Build.0 = Release|Any CPU + {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Any CPU.Deploy.0 = Release|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Any CPU.Build.0 = Release|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Any CPU.Deploy.0 = Release|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Release|Any CPU.Build.0 = Release|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Release|Any CPU.Deploy.0 = Release|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Release|Any CPU.Build.0 = Release|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Release|Any CPU.Deploy.0 = Release|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Release|Any CPU.Build.0 = Release|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Release|Any CPU.Deploy.0 = Release|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Release|Any CPU.Build.0 = Release|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Release|Any CPU.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1AC70118-C90F-4EC6-9D8B-C628BDF900F7} = {4C142567-C42B-40F5-B092-798882190209} {C121A566-555E-42B9-9B0A-1696529A9088} = {4C142567-C42B-40F5-B092-798882190209} {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5} = {4C142567-C42B-40F5-B092-798882190209} + {A8F8D125-7A22-489F-99BC-9A02F545A17F} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} + {01700344-CF44-482C-BEBC-60213B0F844C} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} + {5AA408BA-E766-453E-B661-E3D7EC46E2A6} = {22ADD4CD-092E-4ADC-A21E-64CF42230152} {F2D52EDB-BC17-4243-B06D-33CD20F87A7F} = {10D145AF-C8AE-428F-A80F-CA1B591D0DB2} {D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {10D145AF-C8AE-428F-A80F-CA1B591D0DB2} {42780CBD-3FE7-48E3-BD5B-59945EA20137} = {4C142567-C42B-40F5-B092-798882190209} + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} {0E916AB7-5A6C-4820-8AB1-AA492FE66D68} = {2E93E2B5-4500-4E47-9B65-E705218AB578} {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A} = {2E93E2B5-4500-4E47-9B65-E705218AB578} {5210FB81-B807-49BB-AF0D-31FB6A83A572} = {2E93E2B5-4500-4E47-9B65-E705218AB578} @@ -269,19 +419,35 @@ Global {E8B3553F-A79F-4E50-B75B-ACEE771C320C} = {4C142567-C42B-40F5-B092-798882190209} {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E} = {4C142567-C42B-40F5-B092-798882190209} {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3} = {4C142567-C42B-40F5-B092-798882190209} + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} + {D002FEB1-00A6-4AB1-A83F-1F253465E64D} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} {DD592516-B341-40FE-9100-1B0FA784A060} = {4C142567-C42B-40F5-B092-798882190209} {9BC63BEC-F305-451D-BB31-262938EA964D} = {4C142567-C42B-40F5-B092-798882190209} {F32FDA80-B6DD-47A8-8681-437E2C0D3F31} = {4C142567-C42B-40F5-B092-798882190209} + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} {1DBBC150-F085-43EF-B41D-27C72D133770} = {4C142567-C42B-40F5-B092-798882190209} - {B33E576F-2279-4BFC-A438-D9B84343B56B} = {1AC70118-C90F-4EC6-9D8B-C628BDF900F7} + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} + {4F0E7E04-F067-4CE8-B8C8-1105F319D123} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} {53782603-3096-40C2-ABD3-F8F311BAE4BE} = {4C142567-C42B-40F5-B092-798882190209} {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088} = {4C142567-C42B-40F5-B092-798882190209} {B4EABB0D-E495-405C-B7B1-E2A7A3711AF5} = {FC791F56-C1F1-4C41-A193-868D8197F8E2} {DA355C86-866F-4843-9B4D-63A173C750FB} = {4C142567-C42B-40F5-B092-798882190209} {62E9A8E4-79AF-4081-84D5-FEC5A0B28598} = {FC791F56-C1F1-4C41-A193-868D8197F8E2} {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4} = {4C142567-C42B-40F5-B092-798882190209} + {66BE41FC-FC52-48D0-9C04-BCE8CC393020} = {4C142567-C42B-40F5-B092-798882190209} + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE} = {22ADD4CD-092E-4ADC-A21E-64CF42230152} + {DE048114-9AE4-467E-A879-188DC0D88A59} = {4C142567-C42B-40F5-B092-798882190209} + {3E424688-EC44-4DFB-9FC0-4BB1F0683651} = {DE048114-9AE4-467E-A879-188DC0D88A59} + {7715D094-DF59-4D91-BC9A-9A5118039ECB} = {DE048114-9AE4-467E-A879-188DC0D88A59} + {7B70C783-4085-4702-B3C6-6570FD85CB8F} = {DE048114-9AE4-467E-A879-188DC0D88A59} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{7af4b563-aad3-42ff-b91e-84b9d34d904a}*SharedItemsImports = 5 + ..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 5 + ..\sources\shared\Stride.Core.ShellHelper\Stride.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 5 + ..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{fb06c76a-6bb7-40be-9afa-fec13b045fb5}*SharedItemsImports = 5 + EndGlobalSection EndGlobal diff --git a/build/Stride.Android.sln.DotSettings b/build/Stride.Android.sln.DotSettings index 71e6e00411..20e3e0ba83 100644 --- a/build/Stride.Android.sln.DotSettings +++ b/build/Stride.Android.sln.DotSettings @@ -1,5 +1,5 @@ - ..\Stride.sln.DotSettings - True - True - 1 + ..\Stride.sln.DotSettings + True + True + 1 diff --git a/build/Stride.Build.props b/build/Stride.Build.props index 693766b38f..75f98464c0 100644 --- a/build/Stride.Build.props +++ b/build/Stride.Build.props @@ -8,8 +8,7 @@ Direct3D11 - - OpenGL + Vulkan diff --git a/build/Stride.Runtime.sln b/build/Stride.Runtime.sln index 8171aceb06..e5b2e66cac 100644 --- a/build/Stride.Runtime.sln +++ b/build/Stride.Runtime.sln @@ -1,15 +1,20 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31612.314 -MinimumVisualStudioVersion = 16.0 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 +MinimumVisualStudioVersion = 18.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "10-CoreRuntime", "10-CoreRuntime", "{2E93E2B5-4500-4E47-9B65-E705218AB578}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "20-StrideRuntime", "20-StrideRuntime", "{4C142567-C42B-40F5-B092-798882190209}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Targets.Private", "{97978864-95DD-43A6-9159-AA1C881BE99F}" ProjectSection(SolutionItems) = preProject + ..\sources\Directory.Packages.props = ..\sources\Directory.Packages.props + ..\nuget.config = ..\nuget.config + ..\sources\targets\Stride.Core.CompilerServices.props = ..\sources\targets\Stride.Core.CompilerServices.props ..\sources\targets\Stride.Core.PostSettings.Dependencies.targets = ..\sources\targets\Stride.Core.PostSettings.Dependencies.targets ..\sources\targets\Stride.Core.props = ..\sources\targets\Stride.Core.props + ..\sources\targets\Stride.Core.TargetFrameworks.Editor.props = ..\sources\targets\Stride.Core.TargetFrameworks.Editor.props ..\sources\targets\Stride.Core.targets = ..\sources\targets\Stride.Core.targets ..\sources\targets\Stride.GraphicsApi.Dev.targets = ..\sources\targets\Stride.GraphicsApi.Dev.targets ..\sources\targets\Stride.GraphicsApi.PackageReference.targets = ..\sources\targets\Stride.GraphicsApi.PackageReference.targets @@ -32,6 +37,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Config", "00-Config", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "21-StrideRuntime.Tests", "21-StrideRuntime.Tests", "{A7ED9F01-7D78-4381-90A6-D50E51C17250}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "11-CoreRuntime.Tests", "11-CoreRuntime.Tests", "{22ADD4CD-092E-4ADC-A21E-64CF42230152}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Build", "00-Targets.Build", "{0B81090E-4066-4723-A658-8AEDBEADE619}" ProjectSection(SolutionItems) = preProject Stride.build = Stride.build @@ -43,16 +50,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Build", "00-Targ EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Engine", "..\sources\engine\Stride.Engine\Stride.Engine.csproj", "{C121A566-555E-42B9-9B0A-1696529A9088}" - ProjectSection(ProjectDependencies) = postProject - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F} = {F2D52EDB-BC17-4243-B06D-33CD20F87A7F} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Graphics", "..\sources\engine\Stride.Graphics\Stride.Graphics.csproj", "{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Tests", "..\sources\core\Stride.Core.Tests\Stride.Core.Tests.csproj", "{5AA408BA-E766-453E-B661-E3D7EC46E2A6}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Shaders", "..\sources\shaders\Stride.Core.Shaders\Stride.Core.Shaders.csproj", "{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}" - ProjectSection(ProjectDependencies) = postProject - {5210FB81-B807-49BB-AF0D-31FB6A83A572} = {5210FB81-B807-49BB-AF0D-31FB6A83A572} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Irony", "..\sources\shaders\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}" EndProject @@ -61,9 +64,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core", "..\sources\core\Stride.Core\Stride.Core.csproj", "{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Mathematics", "..\sources\core\Stride.Core.Mathematics\Stride.Core.Mathematics.csproj", "{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}" - ProjectSection(ProjectDependencies) = postProject - {5210FB81-B807-49BB-AF0D-31FB6A83A572} = {5210FB81-B807-49BB-AF0D-31FB6A83A572} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Serialization", "..\sources\core\Stride.Core.Serialization\Stride.Core.Serialization.csproj", "{5210FB81-B807-49BB-AF0D-31FB6A83A572}" EndProject @@ -84,9 +84,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Input", "..\sources\engine\Stride.Input\Stride.Input.csproj", "{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.UI", "..\sources\engine\Stride.UI\Stride.UI.csproj", "{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}" - ProjectSection(ProjectDependencies) = postProject - {C121A566-555E-42B9-9B0A-1696529A9088} = {C121A566-555E-42B9-9B0A-1696529A9088} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Graphics.Regression", "..\sources\engine\Stride.Graphics.Regression\Stride.Graphics.Regression.csproj", "{D002FEB1-00A6-4AB1-A83F-1F253465E64D}" EndProject @@ -104,6 +101,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.VirtualReality", ".. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Navigation", "..\sources\engine\Stride.Navigation\Stride.Navigation.csproj", "{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Mathematics.Tests", "..\sources\core\Stride.Core.Mathematics.Tests\Stride.Core.Mathematics.Tests.csproj", "{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Localization", "00-Localization", "{FC791F56-C1F1-4C41-A193-868D8197F8E2}" ProjectSection(SolutionItems) = preProject ..\sources\localization\Stride.Assets.Presentation.pot = ..\sources\localization\Stride.Assets.Presentation.pot @@ -132,6 +131,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr", "fr", "{62E9A8E4-79AF- EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Rendering", "..\sources\engine\Stride.Rendering\Stride.Rendering.csproj", "{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Voxels", "..\sources\engine\Stride.Voxels\Stride.Voxels.csproj", "{66BE41FC-FC52-48D0-9C04-BCE8CC393020}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.CompilerServices.Tests", "..\sources\core\Stride.Core.CompilerServices.Tests\Stride.Core.CompilerServices.Tests.csproj", "{BACD76E5-35D0-4389-9BB9-8743AC4D89DE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stride.Bepu", "Stride.Bepu", "{DE048114-9AE4-467E-A879-188DC0D88A59}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.BepuPhysics", "..\sources\engine\Stride.BepuPhysics\Stride.BepuPhysics\Stride.BepuPhysics.csproj", "{3E424688-EC44-4DFB-9FC0-4BB1F0683651}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.BepuPhysics.Debug", "..\sources\engine\Stride.BepuPhysics\Stride.BepuPhysics.Debug\Stride.BepuPhysics.Debug.csproj", "{7715D094-DF59-4D91-BC9A-9A5118039ECB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.BepuPhysics.Tests", "..\sources\engine\Stride.BepuPhysics\Stride.BepuPhysics.Tests\Stride.BepuPhysics.Tests.csproj", "{7B70C783-4085-4702-B3C6-6570FD85CB8F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -150,6 +161,12 @@ Global {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Any CPU.ActiveCfg = Release|Any CPU {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Any CPU.Build.0 = Release|Any CPU {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Any CPU.Deploy.0 = Release|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Any CPU.Build.0 = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Any CPU.Deploy.0 = Debug|Any CPU {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -288,6 +305,12 @@ Global {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Any CPU.ActiveCfg = Release|Any CPU {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Any CPU.Build.0 = Release|Any CPU {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Any CPU.Deploy.0 = Release|Any CPU + {A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Release|Any CPU.Build.0 = Release|Any CPU + {A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Release|Any CPU.Deploy.0 = Release|Any CPU {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Any CPU.Build.0 = Debug|Any CPU {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -300,6 +323,36 @@ Global {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Any CPU.Build.0 = Release|Any CPU {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Any CPU.Deploy.0 = Release|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Any CPU.Build.0 = Release|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Any CPU.Deploy.0 = Release|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Release|Any CPU.Build.0 = Release|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Release|Any CPU.Deploy.0 = Release|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Release|Any CPU.Build.0 = Release|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Release|Any CPU.Deploy.0 = Release|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Release|Any CPU.Build.0 = Release|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Release|Any CPU.Deploy.0 = Release|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Release|Any CPU.Build.0 = Release|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Release|Any CPU.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -307,6 +360,7 @@ Global GlobalSection(NestedProjects) = preSolution {C121A566-555E-42B9-9B0A-1696529A9088} = {4C142567-C42B-40F5-B092-798882190209} {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5} = {4C142567-C42B-40F5-B092-798882190209} + {5AA408BA-E766-453E-B661-E3D7EC46E2A6} = {22ADD4CD-092E-4ADC-A21E-64CF42230152} {F2D52EDB-BC17-4243-B06D-33CD20F87A7F} = {10D145AF-C8AE-428F-A80F-CA1B591D0DB2} {D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {10D145AF-C8AE-428F-A80F-CA1B591D0DB2} {42780CBD-3FE7-48E3-BD5B-59945EA20137} = {4C142567-C42B-40F5-B092-798882190209} @@ -330,10 +384,17 @@ Global {1DBBC150-F085-43EF-B41D-27C72D133770} = {4C142567-C42B-40F5-B092-798882190209} {53782603-3096-40C2-ABD3-F8F311BAE4BE} = {4C142567-C42B-40F5-B092-798882190209} {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088} = {4C142567-C42B-40F5-B092-798882190209} + {A9A83BE5-271B-4347-9C4D-340FC3BD0B2B} = {22ADD4CD-092E-4ADC-A21E-64CF42230152} {B4EABB0D-E495-405C-B7B1-E2A7A3711AF5} = {FC791F56-C1F1-4C41-A193-868D8197F8E2} {DA355C86-866F-4843-9B4D-63A173C750FB} = {4C142567-C42B-40F5-B092-798882190209} {62E9A8E4-79AF-4081-84D5-FEC5A0B28598} = {FC791F56-C1F1-4C41-A193-868D8197F8E2} {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4} = {4C142567-C42B-40F5-B092-798882190209} + {66BE41FC-FC52-48D0-9C04-BCE8CC393020} = {4C142567-C42B-40F5-B092-798882190209} + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE} = {22ADD4CD-092E-4ADC-A21E-64CF42230152} + {DE048114-9AE4-467E-A879-188DC0D88A59} = {4C142567-C42B-40F5-B092-798882190209} + {3E424688-EC44-4DFB-9FC0-4BB1F0683651} = {DE048114-9AE4-467E-A879-188DC0D88A59} + {7715D094-DF59-4D91-BC9A-9A5118039ECB} = {DE048114-9AE4-467E-A879-188DC0D88A59} + {7B70C783-4085-4702-B3C6-6570FD85CB8F} = {DE048114-9AE4-467E-A879-188DC0D88A59} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2} diff --git a/build/Stride.Runtime.sln.DotSettings b/build/Stride.Runtime.sln.DotSettings index 9e7c54136e..90de39b762 100644 --- a/build/Stride.Runtime.sln.DotSettings +++ b/build/Stride.Runtime.sln.DotSettings @@ -1,5 +1,5 @@ - ..\Stride.sln.DotSettings - True - True - 1 + ..\Stride.sln.DotSettings + True + True + 1 diff --git a/build/Stride.UnitTests.Build.targets b/build/Stride.UnitTests.Build.targets index 85e422e5e0..596166fd6e 100644 --- a/build/Stride.UnitTests.Build.targets +++ b/build/Stride.UnitTests.Build.targets @@ -1,7 +1,7 @@ - OpenGL + Vulkan Direct3D11 diff --git a/build/Stride.build b/build/Stride.build index 06145dbe98..e343709e06 100644 --- a/build/Stride.build +++ b/build/Stride.build @@ -171,16 +171,6 @@ Example of use: - - - - - - - - - - @@ -211,7 +201,7 @@ Example of use: Linux - + @@ -271,13 +261,13 @@ Example of use: - - - - - - - + + + + + + + diff --git a/build/Stride.iOS.sln b/build/Stride.iOS.sln index 9a513f760b..c632eea102 100644 --- a/build/Stride.iOS.sln +++ b/build/Stride.iOS.sln @@ -1,6 +1,7 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 18 -VisualStudioVersion = 18.0.11205.157 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 18.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "10-CoreRuntime", "10-CoreRuntime", "{2E93E2B5-4500-4E47-9B65-E705218AB578}" EndProject @@ -8,12 +9,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "20-StrideRuntime", "20-Stri EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Targets.Private", "{97978864-95DD-43A6-9159-AA1C881BE99F}" ProjectSection(SolutionItems) = preProject - ..\sources\native\Stride.Native.targets = ..\sources\native\Stride.Native.targets + ..\sources\Directory.Packages.props = ..\sources\Directory.Packages.props + ..\nuget.config = ..\nuget.config + ..\sources\targets\Stride.Core.CompilerServices.props = ..\sources\targets\Stride.Core.CompilerServices.props ..\sources\targets\Stride.Core.PostSettings.Dependencies.targets = ..\sources\targets\Stride.Core.PostSettings.Dependencies.targets ..\sources\targets\Stride.Core.props = ..\sources\targets\Stride.Core.props + ..\sources\targets\Stride.Core.TargetFrameworks.Editor.props = ..\sources\targets\Stride.Core.TargetFrameworks.Editor.props ..\sources\targets\Stride.Core.targets = ..\sources\targets\Stride.Core.targets ..\sources\targets\Stride.GraphicsApi.Dev.targets = ..\sources\targets\Stride.GraphicsApi.Dev.targets ..\sources\targets\Stride.GraphicsApi.PackageReference.targets = ..\sources\targets\Stride.GraphicsApi.PackageReference.targets + ..\sources\native\Stride.Native.targets = ..\sources\native\Stride.Native.targets ..\sources\targets\Stride.PackageVersion.targets = ..\sources\targets\Stride.PackageVersion.targets ..\sources\targets\Stride.props = ..\sources\targets\Stride.props ..\sources\targets\Stride.targets = ..\sources\targets\Stride.targets @@ -30,7 +35,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Config", "00-Config", "{ ..\sources\shared\SharedAssemblyInfo.cs = ..\sources\shared\SharedAssemblyInfo.cs EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stride.Shared", "Stride.Shared", "{1AC70118-C90F-4EC6-9D8B-C628BDF900F7}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "21-StrideRuntime.Tests", "21-StrideRuntime.Tests", "{A7ED9F01-7D78-4381-90A6-D50E51C17250}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "11-CoreRuntime.Tests", "11-CoreRuntime.Tests", "{22ADD4CD-092E-4ADC-A21E-64CF42230152}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Build", "00-Targets.Build", "{0B81090E-4066-4723-A658-8AEDBEADE619}" ProjectSection(SolutionItems) = preProject @@ -43,27 +50,26 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Build", "00-Targ EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Engine", "..\sources\engine\Stride.Engine\Stride.Engine.csproj", "{C121A566-555E-42B9-9B0A-1696529A9088}" - ProjectSection(ProjectDependencies) = postProject - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F} = {F2D52EDB-BC17-4243-B06D-33CD20F87A7F} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Graphics", "..\sources\engine\Stride.Graphics\Stride.Graphics.csproj", "{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Engine.Tests.iOS", "..\sources\engine\Stride.Engine.Tests\Stride.Engine.Tests.iOS.csproj", "{A8F8D125-7A22-489F-99BC-9A02F545A17F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Input.Tests.iOS", "..\sources\engine\Stride.Input.Tests\Stride.Input.Tests.iOS.csproj", "{01700344-CF44-482C-BEBC-60213B0F844C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Tests.iOS", "..\sources\core\Stride.Core.Tests\Stride.Core.Tests.iOS.csproj", "{5AA408BA-E766-453E-B661-E3D7EC46E2A6}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Shaders", "..\sources\shaders\Stride.Core.Shaders\Stride.Core.Shaders.csproj", "{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}" - ProjectSection(ProjectDependencies) = postProject - {5210FB81-B807-49BB-AF0D-31FB6A83A572} = {5210FB81-B807-49BB-AF0D-31FB6A83A572} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Irony", "..\sources\shaders\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Games", "..\sources\engine\Stride.Games\Stride.Games.csproj", "{42780CBD-3FE7-48E3-BD5B-59945EA20137}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Audio.Tests.iOS", "..\sources\engine\Stride.Audio.Tests\Stride.Audio.Tests.iOS.csproj", "{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core", "..\sources\core\Stride.Core\Stride.Core.csproj", "{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Mathematics", "..\sources\core\Stride.Core.Mathematics\Stride.Core.Mathematics.csproj", "{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}" - ProjectSection(ProjectDependencies) = postProject - {5210FB81-B807-49BB-AF0D-31FB6A83A572} = {5210FB81-B807-49BB-AF0D-31FB6A83A572} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Serialization", "..\sources\core\Stride.Core.Serialization\Stride.Core.Serialization.csproj", "{5210FB81-B807-49BB-AF0D-31FB6A83A572}" EndProject @@ -84,9 +90,10 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Input", "..\sources\engine\Stride.Input\Stride.Input.csproj", "{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.UI", "..\sources\engine\Stride.UI\Stride.UI.csproj", "{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}" - ProjectSection(ProjectDependencies) = postProject - {C121A566-555E-42B9-9B0A-1696529A9088} = {C121A566-555E-42B9-9B0A-1696529A9088} - EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.UI.Tests.iOS", "..\sources\engine\Stride.UI.Tests\Stride.UI.Tests.iOS.csproj", "{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Graphics.Regression", "..\sources\engine\Stride.Graphics.Regression\Stride.Graphics.Regression.csproj", "{D002FEB1-00A6-4AB1-A83F-1F253465E64D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Physics", "..\sources\engine\Stride.Physics\Stride.Physics.csproj", "{DD592516-B341-40FE-9100-1B0FA784A060}" EndProject @@ -94,9 +101,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.SpriteStudio.Runtime EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Particles", "..\sources\engine\Stride.Particles\Stride.Particles.csproj", "{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Games.Testing", "..\sources\engine\Stride.Games.Testing\Stride.Games.Testing.csproj", "{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Native", "..\sources\engine\Stride.Native\Stride.Native.csproj", "{1DBBC150-F085-43EF-B41D-27C72D133770}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Stride.Refactor", "..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.shproj", "{B33E576F-2279-4BFC-A438-D9B84343B56B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Particles.Tests.iOS", "..\sources\engine\Stride.Particles.Tests\Stride.Particles.Tests.iOS.csproj", "{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Physics.Tests.iOS", "..\sources\engine\Stride.Physics.Tests\Stride.Physics.Tests.iOS.csproj", "{4F0E7E04-F067-4CE8-B8C8-1105F319D123}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.VirtualReality", "..\sources\engine\Stride.VirtualReality\Stride.VirtualReality.csproj", "{53782603-3096-40C2-ABD3-F8F311BAE4BE}" EndProject @@ -130,331 +141,272 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr", "fr", "{62E9A8E4-79AF- EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Rendering", "..\sources\engine\Stride.Rendering\Stride.Rendering.csproj", "{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Voxels", "..\sources\engine\Stride.Voxels\Stride.Voxels.csproj", "{66BE41FC-FC52-48D0-9C04-BCE8CC393020}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.CompilerServices.Tests", "..\sources\core\Stride.Core.CompilerServices.Tests\Stride.Core.CompilerServices.Tests.csproj", "{BACD76E5-35D0-4389-9BB9-8743AC4D89DE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stride.Bepu", "Stride.Bepu", "{DE048114-9AE4-467E-A879-188DC0D88A59}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.BepuPhysics", "..\sources\engine\Stride.BepuPhysics\Stride.BepuPhysics\Stride.BepuPhysics.csproj", "{3E424688-EC44-4DFB-9FC0-4BB1F0683651}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.BepuPhysics.Debug", "..\sources\engine\Stride.BepuPhysics\Stride.BepuPhysics.Debug\Stride.BepuPhysics.Debug.csproj", "{7715D094-DF59-4D91-BC9A-9A5118039ECB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.BepuPhysics.Tests", "..\sources\engine\Stride.BepuPhysics\Stride.BepuPhysics.Tests\Stride.BepuPhysics.Tests.csproj", "{7B70C783-4085-4702-B3C6-6570FD85CB8F}" +EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{b33e576f-2279-4bfc-a438-d9b84343b56b}*SharedItemsImports = 13 - ..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 4 - ..\sources\shared\Stride.Core.ShellHelper\Stride.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 4 - ..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{fb06c76a-6bb7-40be-9afa-fec13b045fb5}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|iPhone = Debug|iPhone - Debug|iPhoneSimulator = Debug|iPhoneSimulator - Release|iPhone = Release|iPhone - Release|iPhoneSimulator = Release|iPhoneSimulator + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|iPhone.ActiveCfg = Debug|iPhone - {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|iPhone.Build.0 = Debug|iPhone - {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|iPhone.Deploy.0 = Debug|iPhone - {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {C121A566-555E-42B9-9B0A-1696529A9088}.Release|iPhone.ActiveCfg = Release|iPhone - {C121A566-555E-42B9-9B0A-1696529A9088}.Release|iPhone.Build.0 = Release|iPhone - {C121A566-555E-42B9-9B0A-1696529A9088}.Release|iPhone.Deploy.0 = Release|iPhone - {C121A566-555E-42B9-9B0A-1696529A9088}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {C121A566-555E-42B9-9B0A-1696529A9088}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {C121A566-555E-42B9-9B0A-1696529A9088}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|iPhone.ActiveCfg = Debug|iPhone - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|iPhone.Build.0 = Debug|iPhone - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|iPhone.Deploy.0 = Debug|iPhone - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|iPhone.ActiveCfg = Release|iPhone - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|iPhone.Build.0 = Release|iPhone - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|iPhone.Deploy.0 = Release|iPhone - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|iPhone.ActiveCfg = Debug|iPhone - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|iPhone.Build.0 = Debug|iPhone - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|iPhone.Deploy.0 = Debug|iPhone - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|iPhone.ActiveCfg = Release|iPhone - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|iPhone.Build.0 = Release|iPhone - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|iPhone.Deploy.0 = Release|iPhone - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|iPhone.ActiveCfg = Debug|iPhone - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|iPhone.Build.0 = Debug|iPhone - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|iPhone.Deploy.0 = Debug|iPhone - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|iPhone.ActiveCfg = Release|iPhone - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|iPhone.Build.0 = Release|iPhone - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|iPhone.Deploy.0 = Release|iPhone - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|iPhone.ActiveCfg = Debug|iPhone - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|iPhone.Build.0 = Debug|iPhone - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|iPhone.Deploy.0 = Debug|iPhone - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|iPhone.ActiveCfg = Release|iPhone - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|iPhone.Build.0 = Release|iPhone - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|iPhone.Deploy.0 = Release|iPhone - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|iPhone.ActiveCfg = Debug|iPhone - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|iPhone.Build.0 = Debug|iPhone - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|iPhone.Deploy.0 = Debug|iPhone - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|iPhone.ActiveCfg = Release|iPhone - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|iPhone.Build.0 = Release|iPhone - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|iPhone.Deploy.0 = Release|iPhone - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|iPhone.ActiveCfg = Debug|iPhone - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|iPhone.Build.0 = Debug|iPhone - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|iPhone.Deploy.0 = Debug|iPhone - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|iPhone.ActiveCfg = Release|iPhone - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|iPhone.Build.0 = Release|iPhone - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|iPhone.Deploy.0 = Release|iPhone - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|iPhone.ActiveCfg = Debug|iPhone - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|iPhone.Build.0 = Debug|iPhone - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|iPhone.Deploy.0 = Debug|iPhone - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|iPhone.ActiveCfg = Release|iPhone - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|iPhone.Build.0 = Release|iPhone - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|iPhone.Deploy.0 = Release|iPhone - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|iPhone.ActiveCfg = Debug|iPhone - {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|iPhone.Build.0 = Debug|iPhone - {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|iPhone.Deploy.0 = Debug|iPhone - {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|iPhone.ActiveCfg = Release|iPhone - {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|iPhone.Build.0 = Release|iPhone - {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|iPhone.Deploy.0 = Release|iPhone - {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|iPhone.ActiveCfg = Debug|iPhone - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|iPhone.Build.0 = Debug|iPhone - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|iPhone.Deploy.0 = Debug|iPhone - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|iPhone.ActiveCfg = Release|iPhone - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|iPhone.Build.0 = Release|iPhone - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|iPhone.Deploy.0 = Release|iPhone - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|iPhone.ActiveCfg = Debug|iPhone - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|iPhone.Build.0 = Debug|iPhone - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|iPhone.Deploy.0 = Debug|iPhone - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|iPhone.ActiveCfg = Release|iPhone - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|iPhone.Build.0 = Release|iPhone - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|iPhone.Deploy.0 = Release|iPhone - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|iPhone.ActiveCfg = Debug|iPhone - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|iPhone.Build.0 = Debug|iPhone - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|iPhone.Deploy.0 = Debug|iPhone - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|iPhone.ActiveCfg = Release|iPhone - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|iPhone.Build.0 = Release|iPhone - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|iPhone.Deploy.0 = Release|iPhone - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {DE042125-C270-4D1D-9270-0759C167567A}.Debug|iPhone.ActiveCfg = Debug|iPhone - {DE042125-C270-4D1D-9270-0759C167567A}.Debug|iPhone.Build.0 = Debug|iPhone - {DE042125-C270-4D1D-9270-0759C167567A}.Debug|iPhone.Deploy.0 = Debug|iPhone - {DE042125-C270-4D1D-9270-0759C167567A}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {DE042125-C270-4D1D-9270-0759C167567A}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {DE042125-C270-4D1D-9270-0759C167567A}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {DE042125-C270-4D1D-9270-0759C167567A}.Release|iPhone.ActiveCfg = Release|iPhone - {DE042125-C270-4D1D-9270-0759C167567A}.Release|iPhone.Build.0 = Release|iPhone - {DE042125-C270-4D1D-9270-0759C167567A}.Release|iPhone.Deploy.0 = Release|iPhone - {DE042125-C270-4D1D-9270-0759C167567A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {DE042125-C270-4D1D-9270-0759C167567A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {DE042125-C270-4D1D-9270-0759C167567A}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|iPhone.ActiveCfg = Debug|iPhone - {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|iPhone.Build.0 = Debug|iPhone - {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|iPhone.Deploy.0 = Debug|iPhone - {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {72390339-B2A1-4F61-A800-31ED0975B515}.Release|iPhone.ActiveCfg = Release|iPhone - {72390339-B2A1-4F61-A800-31ED0975B515}.Release|iPhone.Build.0 = Release|iPhone - {72390339-B2A1-4F61-A800-31ED0975B515}.Release|iPhone.Deploy.0 = Release|iPhone - {72390339-B2A1-4F61-A800-31ED0975B515}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {72390339-B2A1-4F61-A800-31ED0975B515}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {72390339-B2A1-4F61-A800-31ED0975B515}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|iPhone.ActiveCfg = Debug|iPhone - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|iPhone.Build.0 = Debug|iPhone - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|iPhone.Deploy.0 = Debug|iPhone - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|iPhone.ActiveCfg = Release|iPhone - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|iPhone.Build.0 = Release|iPhone - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|iPhone.Deploy.0 = Release|iPhone - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|iPhone.ActiveCfg = Debug|iPhone - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|iPhone.Build.0 = Debug|iPhone - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|iPhone.Deploy.0 = Debug|iPhone - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|iPhone.ActiveCfg = Release|iPhone - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|iPhone.Build.0 = Release|iPhone - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|iPhone.Deploy.0 = Release|iPhone - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|iPhone.ActiveCfg = Debug|iPhone - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|iPhone.Build.0 = Debug|iPhone - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|iPhone.Deploy.0 = Debug|iPhone - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|iPhone.ActiveCfg = Release|iPhone - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|iPhone.Build.0 = Release|iPhone - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|iPhone.Deploy.0 = Release|iPhone - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|iPhone.ActiveCfg = Debug|iPhone - {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|iPhone.Build.0 = Debug|iPhone - {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|iPhone.Deploy.0 = Debug|iPhone - {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {DD592516-B341-40FE-9100-1B0FA784A060}.Release|iPhone.ActiveCfg = Release|iPhone - {DD592516-B341-40FE-9100-1B0FA784A060}.Release|iPhone.Build.0 = Release|iPhone - {DD592516-B341-40FE-9100-1B0FA784A060}.Release|iPhone.Deploy.0 = Release|iPhone - {DD592516-B341-40FE-9100-1B0FA784A060}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {DD592516-B341-40FE-9100-1B0FA784A060}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {DD592516-B341-40FE-9100-1B0FA784A060}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|iPhone.ActiveCfg = Debug|iPhone - {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|iPhone.Build.0 = Debug|iPhone - {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|iPhone.Deploy.0 = Debug|iPhone - {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|iPhone.ActiveCfg = Release|iPhone - {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|iPhone.Build.0 = Release|iPhone - {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|iPhone.Deploy.0 = Release|iPhone - {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|iPhone.ActiveCfg = Debug|iPhone - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|iPhone.Build.0 = Debug|iPhone - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|iPhone.Deploy.0 = Debug|iPhone - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|iPhone.ActiveCfg = Release|iPhone - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|iPhone.Build.0 = Release|iPhone - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|iPhone.Deploy.0 = Release|iPhone - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|iPhone.ActiveCfg = Debug|iPhone - {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|iPhone.Build.0 = Debug|iPhone - {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|iPhone.Deploy.0 = Debug|iPhone - {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|iPhone.ActiveCfg = Release|iPhone - {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|iPhone.Build.0 = Release|iPhone - {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|iPhone.Deploy.0 = Release|iPhone - {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|iPhone.ActiveCfg = Debug|iPhone - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|iPhone.Build.0 = Debug|iPhone - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|iPhone.Deploy.0 = Debug|iPhone - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|iPhone.ActiveCfg = Release|iPhone - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|iPhone.Build.0 = Release|iPhone - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|iPhone.Deploy.0 = Release|iPhone - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|iPhone.ActiveCfg = Debug|iPhone - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|iPhone.Build.0 = Debug|iPhone - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|iPhone.Deploy.0 = Debug|iPhone - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|iPhone.ActiveCfg = Release|iPhone - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|iPhone.Build.0 = Release|iPhone - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|iPhone.Deploy.0 = Release|iPhone - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|iPhone.ActiveCfg = Debug|iPhone - {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|iPhone.Build.0 = Debug|iPhone - {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|iPhone.Deploy.0 = Debug|iPhone - {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|iPhone.ActiveCfg = Release|iPhone - {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|iPhone.Build.0 = Release|iPhone - {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|iPhone.Deploy.0 = Release|iPhone - {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|iPhone.ActiveCfg = Debug|iPhone - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|iPhone.Build.0 = Debug|iPhone - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|iPhone.Deploy.0 = Debug|iPhone - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|iPhone.ActiveCfg = Release|iPhone - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|iPhone.Build.0 = Release|iPhone - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|iPhone.Deploy.0 = Release|iPhone - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator + {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {C121A566-555E-42B9-9B0A-1696529A9088}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C121A566-555E-42B9-9B0A-1696529A9088}.Release|Any CPU.Build.0 = Release|Any CPU + {C121A566-555E-42B9-9B0A-1696529A9088}.Release|Any CPU.Deploy.0 = Release|Any CPU + {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Any CPU.Build.0 = Release|Any CPU + {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Any CPU.Deploy.0 = Release|Any CPU + {A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Any CPU.Build.0 = Release|Any CPU + {A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Any CPU.Deploy.0 = Release|Any CPU + {01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {01700344-CF44-482C-BEBC-60213B0F844C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01700344-CF44-482C-BEBC-60213B0F844C}.Release|Any CPU.Build.0 = Release|Any CPU + {01700344-CF44-482C-BEBC-60213B0F844C}.Release|Any CPU.Deploy.0 = Release|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Any CPU.Build.0 = Debug|Any CPU + {5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Any CPU.Deploy.0 = Debug|Any CPU + {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Any CPU.Build.0 = Release|Any CPU + {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Any CPU.Deploy.0 = Release|Any CPU + {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.Build.0 = Release|Any CPU + {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.Deploy.0 = Release|Any CPU + {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Any CPU.Build.0 = Release|Any CPU + {42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Any CPU.Deploy.0 = Release|Any CPU + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Any CPU.Build.0 = Release|Any CPU + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Any CPU.Deploy.0 = Release|Any CPU + {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Any CPU.Build.0 = Release|Any CPU + {0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Any CPU.Deploy.0 = Release|Any CPU + {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Any CPU.Build.0 = Release|Any CPU + {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Any CPU.Deploy.0 = Release|Any CPU + {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Any CPU.Build.0 = Release|Any CPU + {5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Any CPU.Deploy.0 = Release|Any CPU + {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Any CPU.Build.0 = Release|Any CPU + {1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Any CPU.Deploy.0 = Release|Any CPU + {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Any CPU.Build.0 = Release|Any CPU + {1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Any CPU.Deploy.0 = Release|Any CPU + {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Any CPU.Build.0 = Release|Any CPU + {14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Any CPU.Deploy.0 = Release|Any CPU + {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Any CPU.Build.0 = Release|Any CPU + {273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Any CPU.Deploy.0 = Release|Any CPU + {DE042125-C270-4D1D-9270-0759C167567A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DE042125-C270-4D1D-9270-0759C167567A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DE042125-C270-4D1D-9270-0759C167567A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {DE042125-C270-4D1D-9270-0759C167567A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DE042125-C270-4D1D-9270-0759C167567A}.Release|Any CPU.Build.0 = Release|Any CPU + {DE042125-C270-4D1D-9270-0759C167567A}.Release|Any CPU.Deploy.0 = Release|Any CPU + {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {72390339-B2A1-4F61-A800-31ED0975B515}.Release|Any CPU.ActiveCfg = Release|Any CPU + {72390339-B2A1-4F61-A800-31ED0975B515}.Release|Any CPU.Build.0 = Release|Any CPU + {72390339-B2A1-4F61-A800-31ED0975B515}.Release|Any CPU.Deploy.0 = Release|Any CPU + {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Any CPU.Build.0 = Release|Any CPU + {E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Any CPU.Deploy.0 = Release|Any CPU + {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Any CPU.Build.0 = Release|Any CPU + {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Any CPU.Deploy.0 = Release|Any CPU + {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Any CPU.Build.0 = Release|Any CPU + {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Any CPU.Deploy.0 = Release|Any CPU + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Any CPU.Build.0 = Release|Any CPU + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Any CPU.Deploy.0 = Release|Any CPU + {D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Any CPU.Build.0 = Release|Any CPU + {D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Any CPU.Deploy.0 = Release|Any CPU + {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {DD592516-B341-40FE-9100-1B0FA784A060}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD592516-B341-40FE-9100-1B0FA784A060}.Release|Any CPU.Build.0 = Release|Any CPU + {DD592516-B341-40FE-9100-1B0FA784A060}.Release|Any CPU.Deploy.0 = Release|Any CPU + {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Any CPU.Build.0 = Release|Any CPU + {9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Any CPU.Deploy.0 = Release|Any CPU + {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Any CPU.Build.0 = Release|Any CPU + {F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Any CPU.Deploy.0 = Release|Any CPU + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Any CPU.Build.0 = Release|Any CPU + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Any CPU.Deploy.0 = Release|Any CPU + {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Any CPU.Build.0 = Release|Any CPU + {1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Any CPU.Deploy.0 = Release|Any CPU + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Any CPU.Build.0 = Debug|Any CPU + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Any CPU.ActiveCfg = Release|Any CPU + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Any CPU.Build.0 = Release|Any CPU + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Any CPU.Deploy.0 = Release|Any CPU + {4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Any CPU.Build.0 = Release|Any CPU + {4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Any CPU.Deploy.0 = Release|Any CPU + {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Any CPU.Build.0 = Release|Any CPU + {53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Any CPU.Deploy.0 = Release|Any CPU + {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Any CPU.Build.0 = Release|Any CPU + {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Any CPU.Deploy.0 = Release|Any CPU + {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Any CPU.Build.0 = Release|Any CPU + {DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Any CPU.Deploy.0 = Release|Any CPU + {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Any CPU.Build.0 = Release|Any CPU + {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Any CPU.Deploy.0 = Release|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Any CPU.Build.0 = Release|Any CPU + {66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Any CPU.Deploy.0 = Release|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Release|Any CPU.Build.0 = Release|Any CPU + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE}.Release|Any CPU.Deploy.0 = Release|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Release|Any CPU.Build.0 = Release|Any CPU + {3E424688-EC44-4DFB-9FC0-4BB1F0683651}.Release|Any CPU.Deploy.0 = Release|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Release|Any CPU.Build.0 = Release|Any CPU + {7715D094-DF59-4D91-BC9A-9A5118039ECB}.Release|Any CPU.Deploy.0 = Release|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Release|Any CPU.Build.0 = Release|Any CPU + {7B70C783-4085-4702-B3C6-6570FD85CB8F}.Release|Any CPU.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1AC70118-C90F-4EC6-9D8B-C628BDF900F7} = {4C142567-C42B-40F5-B092-798882190209} {C121A566-555E-42B9-9B0A-1696529A9088} = {4C142567-C42B-40F5-B092-798882190209} {FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5} = {4C142567-C42B-40F5-B092-798882190209} + {A8F8D125-7A22-489F-99BC-9A02F545A17F} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} + {01700344-CF44-482C-BEBC-60213B0F844C} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} + {5AA408BA-E766-453E-B661-E3D7EC46E2A6} = {22ADD4CD-092E-4ADC-A21E-64CF42230152} {F2D52EDB-BC17-4243-B06D-33CD20F87A7F} = {10D145AF-C8AE-428F-A80F-CA1B591D0DB2} {D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {10D145AF-C8AE-428F-A80F-CA1B591D0DB2} {42780CBD-3FE7-48E3-BD5B-59945EA20137} = {4C142567-C42B-40F5-B092-798882190209} + {7AF4B563-AAD3-42FF-B91E-84B9D34D904A} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} {0E916AB7-5A6C-4820-8AB1-AA492FE66D68} = {2E93E2B5-4500-4E47-9B65-E705218AB578} {1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A} = {2E93E2B5-4500-4E47-9B65-E705218AB578} {5210FB81-B807-49BB-AF0D-31FB6A83A572} = {2E93E2B5-4500-4E47-9B65-E705218AB578} @@ -467,19 +419,35 @@ Global {E8B3553F-A79F-4E50-B75B-ACEE771C320C} = {4C142567-C42B-40F5-B092-798882190209} {84DEB606-77ED-49CD-9AED-D2B13C1F5A1E} = {4C142567-C42B-40F5-B092-798882190209} {BB9DEEEF-F18C-40D8-B016-6434CC71B8C3} = {4C142567-C42B-40F5-B092-798882190209} + {E7B1B17F-D04B-4978-B504-A6BB3EE846C9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} + {D002FEB1-00A6-4AB1-A83F-1F253465E64D} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} {DD592516-B341-40FE-9100-1B0FA784A060} = {4C142567-C42B-40F5-B092-798882190209} {9BC63BEC-F305-451D-BB31-262938EA964D} = {4C142567-C42B-40F5-B092-798882190209} {F32FDA80-B6DD-47A8-8681-437E2C0D3F31} = {4C142567-C42B-40F5-B092-798882190209} + {B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} {1DBBC150-F085-43EF-B41D-27C72D133770} = {4C142567-C42B-40F5-B092-798882190209} - {B33E576F-2279-4BFC-A438-D9B84343B56B} = {1AC70118-C90F-4EC6-9D8B-C628BDF900F7} + {33CC6216-3F30-4B5A-BB29-C5B47EFFA713} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} + {4F0E7E04-F067-4CE8-B8C8-1105F319D123} = {A7ED9F01-7D78-4381-90A6-D50E51C17250} {53782603-3096-40C2-ABD3-F8F311BAE4BE} = {4C142567-C42B-40F5-B092-798882190209} {FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088} = {4C142567-C42B-40F5-B092-798882190209} {B4EABB0D-E495-405C-B7B1-E2A7A3711AF5} = {FC791F56-C1F1-4C41-A193-868D8197F8E2} {DA355C86-866F-4843-9B4D-63A173C750FB} = {4C142567-C42B-40F5-B092-798882190209} {62E9A8E4-79AF-4081-84D5-FEC5A0B28598} = {FC791F56-C1F1-4C41-A193-868D8197F8E2} {AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4} = {4C142567-C42B-40F5-B092-798882190209} + {66BE41FC-FC52-48D0-9C04-BCE8CC393020} = {4C142567-C42B-40F5-B092-798882190209} + {BACD76E5-35D0-4389-9BB9-8743AC4D89DE} = {22ADD4CD-092E-4ADC-A21E-64CF42230152} + {DE048114-9AE4-467E-A879-188DC0D88A59} = {4C142567-C42B-40F5-B092-798882190209} + {3E424688-EC44-4DFB-9FC0-4BB1F0683651} = {DE048114-9AE4-467E-A879-188DC0D88A59} + {7715D094-DF59-4D91-BC9A-9A5118039ECB} = {DE048114-9AE4-467E-A879-188DC0D88A59} + {7B70C783-4085-4702-B3C6-6570FD85CB8F} = {DE048114-9AE4-467E-A879-188DC0D88A59} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{7af4b563-aad3-42ff-b91e-84b9d34d904a}*SharedItemsImports = 5 + ..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 5 + ..\sources\shared\Stride.Core.ShellHelper\Stride.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 5 + ..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{fb06c76a-6bb7-40be-9afa-fec13b045fb5}*SharedItemsImports = 5 + EndGlobalSection EndGlobal diff --git a/build/Stride.iOS.sln.DotSettings b/build/Stride.iOS.sln.DotSettings index 46d513746d..d4f74011d1 100644 --- a/build/Stride.iOS.sln.DotSettings +++ b/build/Stride.iOS.sln.DotSettings @@ -1,5 +1,5 @@ - ..\Stride.sln.DotSettings - True - True - 1 + ..\Stride.sln.DotSettings + True + True + 1 diff --git a/build/update_solutions.bat b/build/update_solutions.bat index d26e2e356d..9fac929da7 100644 --- a/build/update_solutions.bat +++ b/build/update_solutions.bat @@ -1,13 +1,13 @@ @echo off echo Processing Runtime (currently using Linux as template) -..\sources\tools\Stride.ProjectGenerator\bin\Debug\net472\Stride.ProjectGenerator.exe solution Stride.sln -o Stride.Runtime.sln -p Linux +..\sources\tools\Stride.ProjectGenerator\bin\Debug\net10.0-windows\Stride.ProjectGenerator.exe solution Stride.sln -o Stride.Runtime.sln -p Linux echo. echo Processing Android -..\sources\tools\Stride.ProjectGenerator\bin\Debug\net472\Stride.ProjectGenerator.exe solution Stride.sln -o Stride.Android.sln -p Android +..\sources\tools\Stride.ProjectGenerator\bin\Debug\net10.0-windows\Stride.ProjectGenerator.exe solution Stride.sln -o Stride.Android.sln -p Android echo. echo Processing iOS -..\sources\tools\Stride.ProjectGenerator\bin\Debug\net472\Stride.ProjectGenerator.exe solution Stride.sln -o Stride.iOS.sln -p iOS +..\sources\tools\Stride.ProjectGenerator\bin\Debug\net10.0-windows\Stride.ProjectGenerator.exe solution Stride.sln -o Stride.iOS.sln -p iOS echo. diff --git a/sources/Directory.Packages.props b/sources/Directory.Packages.props index d67bd5c409..91c3815857 100644 --- a/sources/Directory.Packages.props +++ b/sources/Directory.Packages.props @@ -28,9 +28,6 @@ - - - diff --git a/sources/core/Stride.Core.Tests/Stride.Core.Tests.Android.csproj b/sources/core/Stride.Core.Tests/Stride.Core.Tests.Android.csproj index a80f0d9575..7a3f3e38c3 100644 --- a/sources/core/Stride.Core.Tests/Stride.Core.Tests.Android.csproj +++ b/sources/core/Stride.Core.Tests/Stride.Core.Tests.Android.csproj @@ -1,4 +1,4 @@ - + {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -29,37 +29,15 @@ - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - {5210FB81-B807-49BB-AF0D-31FB6A83A572} - Stride.Core.Serialization - - - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68} - Stride.Core - - + + - + \ No newline at end of file diff --git a/sources/core/Stride.Core.Tests/Stride.Core.Tests.iOS.csproj b/sources/core/Stride.Core.Tests/Stride.Core.Tests.iOS.csproj index 9c96e9023e..36f9588706 100644 --- a/sources/core/Stride.Core.Tests/Stride.Core.Tests.iOS.csproj +++ b/sources/core/Stride.Core.Tests/Stride.Core.Tests.iOS.csproj @@ -38,37 +38,15 @@ NUnitLiteLauncher.iPhone.cs - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - {5210FB81-B807-49BB-AF0D-31FB6A83A572} - Stride.Core.Serialization - - - {0E916AB7-5A6C-4820-8AB1-AA492FE66D68} - Stride.Core - - + + Direct3D11 Direct3D11 - OpenGLES - OpenGLES - OpenGL + Vulkan + Vulkan + Vulkan Vulkan $(StrideDefaultGraphicsApi) diff --git a/sources/engine/Stride.Input.Tests/Stride.Input.Tests.Android.csproj b/sources/engine/Stride.Input.Tests/Stride.Input.Tests.Android.csproj index 0f4cda986b..2a14e48bf1 100644 --- a/sources/engine/Stride.Input.Tests/Stride.Input.Tests.Android.csproj +++ b/sources/engine/Stride.Input.Tests/Stride.Input.Tests.Android.csproj @@ -86,11 +86,10 @@ NUnitLiteLauncher.Android.cs + - - @@ -109,7 +108,6 @@ - diff --git a/sources/engine/Stride.Input.Tests/Stride.Input.Tests.iOS.csproj b/sources/engine/Stride.Input.Tests/Stride.Input.Tests.iOS.csproj index d621f2a949..9c34e780f5 100644 --- a/sources/engine/Stride.Input.Tests/Stride.Input.Tests.iOS.csproj +++ b/sources/engine/Stride.Input.Tests/Stride.Input.Tests.iOS.csproj @@ -105,11 +105,10 @@ NUnitLiteLauncher.iPhone.cs + - - @@ -128,7 +127,6 @@ - diff --git a/sources/engine/Stride.Particles.Tests/Stride.Particles.Tests.Android.csproj b/sources/engine/Stride.Particles.Tests/Stride.Particles.Tests.Android.csproj index 000e43d315..dd6bdf7669 100644 --- a/sources/engine/Stride.Particles.Tests/Stride.Particles.Tests.Android.csproj +++ b/sources/engine/Stride.Particles.Tests/Stride.Particles.Tests.Android.csproj @@ -96,11 +96,10 @@ NUnitLiteLauncher.Android.cs + - - @@ -139,7 +138,6 @@ - diff --git a/sources/engine/Stride.Particles.Tests/Stride.Particles.Tests.iOS.csproj b/sources/engine/Stride.Particles.Tests/Stride.Particles.Tests.iOS.csproj index db51fee7c2..e1064c32f4 100644 --- a/sources/engine/Stride.Particles.Tests/Stride.Particles.Tests.iOS.csproj +++ b/sources/engine/Stride.Particles.Tests/Stride.Particles.Tests.iOS.csproj @@ -102,11 +102,10 @@ NUnitLiteLauncher.iPhone.cs + - - @@ -145,7 +144,6 @@ - diff --git a/sources/engine/Stride.Particles/Shaders.Bytecodes/GameSettings.sdgamesettings b/sources/engine/Stride.Particles/Shaders.Bytecodes/GameSettings.sdgamesettings index 36fb5a77a1..6e14a0541a 100644 --- a/sources/engine/Stride.Particles/Shaders.Bytecodes/GameSettings.sdgamesettings +++ b/sources/engine/Stride.Particles/Shaders.Bytecodes/GameSettings.sdgamesettings @@ -9,7 +9,3 @@ TextureQuality: Fast Profiles: Windows: !WindowsGameSettingsProfile GraphicsPlatform: Direct3D11 - Windows-OpenGL: !WindowsGameSettingsProfile - GraphicsPlatform: OpenGL - Windows-OpenGLES: !WindowsGameSettingsProfile - GraphicsPlatform: OpenGLES diff --git a/sources/engine/Stride.Physics.Tests/Stride.Physics.Tests.Android.csproj b/sources/engine/Stride.Physics.Tests/Stride.Physics.Tests.Android.csproj index dc45a50758..2e2af3118d 100644 --- a/sources/engine/Stride.Physics.Tests/Stride.Physics.Tests.Android.csproj +++ b/sources/engine/Stride.Physics.Tests/Stride.Physics.Tests.Android.csproj @@ -95,18 +95,17 @@ NUnitLiteLauncher.Android.cs + - - + - diff --git a/sources/engine/Stride.Physics.Tests/Stride.Physics.Tests.iOS.csproj b/sources/engine/Stride.Physics.Tests/Stride.Physics.Tests.iOS.csproj index cd8dc77656..2927606635 100644 --- a/sources/engine/Stride.Physics.Tests/Stride.Physics.Tests.iOS.csproj +++ b/sources/engine/Stride.Physics.Tests/Stride.Physics.Tests.iOS.csproj @@ -101,18 +101,17 @@ NUnitLiteLauncher.iPhone.cs + - - + - diff --git a/sources/engine/Stride.Rendering/Rendering/Compositing/MSAAResolver.cs b/sources/engine/Stride.Rendering/Rendering/Compositing/MSAAResolver.cs index 4f0bd280ac..9db8afc172 100644 --- a/sources/engine/Stride.Rendering/Rendering/Compositing/MSAAResolver.cs +++ b/sources/engine/Stride.Rendering/Rendering/Compositing/MSAAResolver.cs @@ -162,14 +162,7 @@ protected override void DrawCore(RenderDrawContext drawContext) var svPosUnpack = new Vector4(0.5f * inputSize.Width, -0.5f * inputSize.Height, 0.5f * inputSize.Width, 0.5f * inputSize.Height); var textureSizeLess1 = new Vector2(inputSize.Width - 1.0f, inputSize.Height - 1.0f); - if (GraphicsDevice.Platform == GraphicsPlatform.OpenGL || - GraphicsDevice.Platform == GraphicsPlatform.OpenGLES || - FilterType == FilterTypes.Default) - { - // We currently only support the default hardware MSAA resolve on OpenGL and OpenGL ES. - drawContext.CommandList.CopyMultisample(input, 0, output, 0); - } - else if (input.IsDepthStencil) + if (input.IsDepthStencil) { System.Diagnostics.Debug.Assert(output.IsDepthStencil, "input and output IsDepthStencil don't match"); diff --git a/sources/engine/Stride.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentGGXLUT.sdsl b/sources/engine/Stride.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentGGXLUT.sdsl index 85b3ca5762..2b386e4535 100644 --- a/sources/engine/Stride.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentGGXLUT.sdsl +++ b/sources/engine/Stride.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentGGXLUT.sdsl @@ -15,7 +15,7 @@ namespace Stride.Rendering.Materials override float3 Compute(float3 specularColor, float alphaR, float nDotV) { float glossiness = 1.0f - sqrt(alphaR); -#if STRIDE_GRAPHICS_PROFILE >= GRAPHICS_PROFILE_LEVEL_10_0 || STRIDE_GRAPHICS_API_OPENGL +#if STRIDE_GRAPHICS_PROFILE >= GRAPHICS_PROFILE_LEVEL_10_0 // SampleLevel doesn't work on D3D feature level 9 float4 environmentLightingDFG = EnvironmentLightingDFG_LUT.SampleLevel(LinearSampler, float2(glossiness, nDotV), 0); #else diff --git a/sources/engine/Stride.Rendering/Rendering/Utils/Utilities.sdsl b/sources/engine/Stride.Rendering/Rendering/Utils/Utilities.sdsl index 85e878c077..65508818bb 100644 --- a/sources/engine/Stride.Rendering/Rendering/Utils/Utilities.sdsl +++ b/sources/engine/Stride.Rendering/Rendering/Utils/Utilities.sdsl @@ -44,13 +44,4 @@ shader Utilities { return specularColor + (max(specularColor, gloss) - specularColor) * pow(1.0f - saturate(dot(eye, h)), 5.0f) * factor; } - - // flip the texture coordinate if on an opengl device. - static float2 ConvertTexCoord(float2 texcoord) { -#ifdef STRIDE_GRAPHICS_API_OPENGL - return float2(texcoord.x, 1.0f - texcoord.y); -#else - return texcoord; -#endif - } }; diff --git a/sources/engine/Stride.Shaders.Compiler/EffectCompiler.cs b/sources/engine/Stride.Shaders.Compiler/EffectCompiler.cs index 9ac4cd435f..0dd8031a90 100644 --- a/sources/engine/Stride.Shaders.Compiler/EffectCompiler.cs +++ b/sources/engine/Stride.Shaders.Compiler/EffectCompiler.cs @@ -116,14 +116,6 @@ public override TaskOrResult Compile(ShaderMixinSo shaderMixinSource.AddMacro("STRIDE_GRAPHICS_API_DIRECT3D", 1); shaderMixinSource.AddMacro("STRIDE_GRAPHICS_API_DIRECT3D12", 1); break; - case GraphicsPlatform.OpenGL: - shaderMixinSource.AddMacro("STRIDE_GRAPHICS_API_OPENGL", 1); - shaderMixinSource.AddMacro("STRIDE_GRAPHICS_API_OPENGLCORE", 1); - break; - case GraphicsPlatform.OpenGLES: - shaderMixinSource.AddMacro("STRIDE_GRAPHICS_API_OPENGL", 1); - shaderMixinSource.AddMacro("STRIDE_GRAPHICS_API_OPENGLES", 1); - break; case GraphicsPlatform.Vulkan: shaderMixinSource.AddMacro("STRIDE_GRAPHICS_API_VULKAN", 1); break; @@ -209,8 +201,6 @@ public override TaskOrResult Compile(ShaderMixinSo compiler = new Direct3D.ShaderCompiler(); break; #endif - case GraphicsPlatform.OpenGL: - case GraphicsPlatform.OpenGLES: case GraphicsPlatform.Vulkan: compiler = new OpenGL.ShaderCompiler(); break; @@ -223,12 +213,6 @@ public override TaskOrResult Compile(ShaderMixinSo #if STRIDE_PLATFORM_DESKTOP var stageStringBuilder = new StringBuilder(); #endif - // if the shader (non-compute) does not have a pixel shader, we should add it for OpenGL and OpenGL ES. - if ((effectParameters.Platform == GraphicsPlatform.OpenGL || effectParameters.Platform == GraphicsPlatform.OpenGLES) && !parsingResult.EntryPoints.ContainsKey(ShaderStage.Pixel) && !parsingResult.EntryPoints.ContainsKey(ShaderStage.Compute)) - { - parsingResult.EntryPoints.Add(ShaderStage.Pixel, null); - } - foreach (var stageBinding in parsingResult.EntryPoints) { // Compile diff --git a/sources/engine/Stride.Shaders.Compiler/OpenGL/ShaderCompiler.cs b/sources/engine/Stride.Shaders.Compiler/OpenGL/ShaderCompiler.cs index 18ca0d8d9a..c6625e6db3 100644 --- a/sources/engine/Stride.Shaders.Compiler/OpenGL/ShaderCompiler.cs +++ b/sources/engine/Stride.Shaders.Compiler/OpenGL/ShaderCompiler.cs @@ -55,14 +55,6 @@ public ShaderBytecodeResult Compile(string shaderSource, string entryPoint, Shad switch (effectParameters.Platform) { - case GraphicsPlatform.OpenGL: - shaderPlatform = GlslShaderPlatform.OpenGL; - shaderVersion = 410; - break; - case GraphicsPlatform.OpenGLES: - shaderPlatform = GlslShaderPlatform.OpenGLES; - shaderVersion = 300; - break; case GraphicsPlatform.Vulkan: shaderPlatform = GlslShaderPlatform.Vulkan; shaderVersion = 450; @@ -76,19 +68,6 @@ public ShaderBytecodeResult Compile(string shaderSource, string entryPoint, Shad if (shader == null) return shaderBytecodeResult; - if (effectParameters.Platform == GraphicsPlatform.OpenGLES) // TODO: Add check to run on android only. The current version breaks OpenGL ES on windows. - { - //TODO: Remove this ugly hack! - if (shaderSource.Contains($"Texture2D StrideInternal_TextureExt0") && shader.Contains("uniform sampler2D")) - { - if (shaderPlatform != GlslShaderPlatform.OpenGLES || shaderVersion != 300) - throw new Exception("Invalid GLES platform or version: require OpenGLES 300"); - - shader = shader.Replace("uniform sampler2D", "uniform samplerExternalOES"); - shader = shader.Replace("#version 300 es", "#version 300 es\n#extension GL_OES_EGL_image_external_essl3 : require"); - } - } - if (effectParameters.Platform == GraphicsPlatform.Vulkan) { string inputFileExtension; diff --git a/sources/engine/Stride.Shaders.Tests/TestMixinCompiler.cs b/sources/engine/Stride.Shaders.Tests/TestMixinCompiler.cs index a28366d0fa..d118800e1a 100644 --- a/sources/engine/Stride.Shaders.Tests/TestMixinCompiler.cs +++ b/sources/engine/Stride.Shaders.Tests/TestMixinCompiler.cs @@ -48,7 +48,7 @@ public void TestMaterial() compiler.SourceDirectories.Add(Path.Combine(currentPath, @"..\..\sources\engine\Stride.Engine\Rendering\Shading")); compiler.SourceDirectories.Add(Path.Combine(currentPath, @"..\..\sources\engine\Stride.Engine\Rendering\Transformation")); compiler.SourceDirectories.Add(Path.Combine(currentPath, @"..\..\sources\engine\Stride.Engine\Rendering\Utils")); - var compilerParameters = CreateCompilerParameters(GraphicsPlatform.OpenGL); + var compilerParameters = CreateCompilerParameters(GraphicsPlatform.Direct3D11); var layers = new MaterialBlendLayers(); layers.Add(new MaterialBlendLayer @@ -232,43 +232,6 @@ private void TestNoClean(out CompilerResults left, out CompilerResults right) } } - [Fact(Skip = "This test fixture is unmaintained and currently doesn't pass")] - public void TestGlslCompiler() - { - VirtualFileSystem.RemountFileSystem("/shaders", "../../../../shaders"); - VirtualFileSystem.RemountFileSystem("/baseShaders", "../../../../engine/Stride.Graphics/Shaders"); - VirtualFileSystem.RemountFileSystem("/compiler", "Compiler"); - - - var compiler = new EffectCompiler(TestHelper.CreateDatabaseProvider().FileProvider); - - compiler.SourceDirectories.Add("shaders"); - compiler.SourceDirectories.Add("compiler"); - compiler.SourceDirectories.Add("baseShaders"); - - var compilerParameters = CreateCompilerParameters(GraphicsPlatform.OpenGL); - - var results = compiler.Compile(new ShaderMixinGeneratorSource("ToGlslEffect"), compilerParameters); - } - - [Fact(Skip = "This test fixture is unmaintained and currently doesn't pass")] - public void TestGlslESCompiler() - { - VirtualFileSystem.RemountFileSystem("/shaders", "../../../../shaders"); - VirtualFileSystem.RemountFileSystem("/baseShaders", "../../../../engine/Stride.Graphics/Shaders"); - VirtualFileSystem.RemountFileSystem("/compiler", "Compiler"); - - var compiler = new EffectCompiler(TestHelper.CreateDatabaseProvider().FileProvider); - - compiler.SourceDirectories.Add("shaders"); - compiler.SourceDirectories.Add("compiler"); - compiler.SourceDirectories.Add("baseShaders"); - - var compilerParameters = CreateCompilerParameters(GraphicsPlatform.OpenGLES); - - var results = compiler.Compile(new ShaderMixinGeneratorSource("ToGlslEffect"), compilerParameters); - } - /// /// Creates the compiler parameters for the specified graphics platform. diff --git a/sources/engine/Stride.UI.Tests/Stride.UI.Tests.Android.csproj b/sources/engine/Stride.UI.Tests/Stride.UI.Tests.Android.csproj index 04f61dc6c8..bdeb1e44ed 100644 --- a/sources/engine/Stride.UI.Tests/Stride.UI.Tests.Android.csproj +++ b/sources/engine/Stride.UI.Tests/Stride.UI.Tests.Android.csproj @@ -91,11 +91,10 @@ NUnitLiteLauncher.Android.cs + - - @@ -129,7 +128,6 @@ - @@ -199,8 +197,6 @@ - - diff --git a/sources/engine/Stride.UI.Tests/Stride.UI.Tests.iOS.csproj b/sources/engine/Stride.UI.Tests/Stride.UI.Tests.iOS.csproj index e083c3fe94..03514d49fd 100644 --- a/sources/engine/Stride.UI.Tests/Stride.UI.Tests.iOS.csproj +++ b/sources/engine/Stride.UI.Tests/Stride.UI.Tests.iOS.csproj @@ -113,11 +113,10 @@ NUnitLiteLauncher.iPhone.cs + - - @@ -151,7 +150,6 @@ - @@ -221,8 +219,6 @@ - - diff --git a/sources/engine/Stride.Video/VideoInstance.MediaCodec.cs b/sources/engine/Stride.Video/VideoInstance.MediaCodec.cs index d779646f35..256ee4f6b0 100644 --- a/sources/engine/Stride.Video/VideoInstance.MediaCodec.cs +++ b/sources/engine/Stride.Video/VideoInstance.MediaCodec.cs @@ -169,13 +169,14 @@ partial void InitializeMediaImpl(string url, long startPosition, long length, re ReceivedNotificationToUpdateVideoTextureSurface = false; + // Looks like we need to use VK_ANDROID_external_memory_android_hardware_buffer and AImageReader, ANativeWindow and AHardwareBuffer + throw new NotImplementedException("MediaCodec is not implemented with Vulkan"); //============================================================================================== //Create the Texture and Surface where the codec will directly extract the video //The texture is set as external (GlTextureExternalOes): the mediaCodec API will create it and fill it //We don't know its size and format (size / format will depend on the media and on the device implementation) - TextureExternal = Texture.NewExternalOES(GraphicsDevice); // TODO: Can we just allocate a mip mapped texture for this? - var textureId = (int)TextureExternal.TextureId; - VideoSurfaceTexture = new SurfaceTexture(textureId); + //TextureExternal = Texture.NewExternalOES(GraphicsDevice); // TODO: Can we just allocate a mip mapped texture for this? + VideoSurfaceTexture = new SurfaceTexture(0); VideoSurface = new Surface(VideoSurfaceTexture); //============================================================================================== diff --git a/sources/engine/Stride/Graphics/DDSHelper.cs b/sources/engine/Stride/Graphics/DDSHelper.cs index 462a751719..041048cc8c 100644 --- a/sources/engine/Stride/Graphics/DDSHelper.cs +++ b/sources/engine/Stride/Graphics/DDSHelper.cs @@ -988,11 +988,6 @@ public static unsafe Image LoadFromDDSMemory(IntPtr pSource, int size, bool make { var flags = makeACopy ? DDSFlags.CopyMemory : DDSFlags.None; -#if STRIDE_PLATFORM_ANDROID - // Directly load image as RGBA instead of BGRA, because OpenGL ES devices don't support it out of the box (extension). - flags |= DDSFlags.ForceRgb; -#endif - ConversionFlags convFlags; ImageDescription mdata; // If the memory pointed is not a DDS memory, return null. diff --git a/sources/engine/Stride/Graphics/GraphicsPlatform.cs b/sources/engine/Stride/Graphics/GraphicsPlatform.cs index 7fbf2ec1fc..15e4c9b592 100644 --- a/sources/engine/Stride/Graphics/GraphicsPlatform.cs +++ b/sources/engine/Stride/Graphics/GraphicsPlatform.cs @@ -25,16 +25,6 @@ public enum GraphicsPlatform /// Direct3D12, - /// - /// GLSL OpenGL Shader. - /// - OpenGL, - - /// - /// GLSL OpenGL ES Shader. - /// - OpenGLES, - /// /// GLSL/SPIR-V Shader. /// diff --git a/sources/engine/Stride/Graphics/GraphicsProfile.cs b/sources/engine/Stride/Graphics/GraphicsProfile.cs index 87415c1d68..4f399cc2a9 100644 --- a/sources/engine/Stride/Graphics/GraphicsProfile.cs +++ b/sources/engine/Stride/Graphics/GraphicsProfile.cs @@ -12,7 +12,7 @@ namespace Stride.Graphics; /// /// The graphics profile only indicates which capabilities are available on the device, not which /// graphics API is used. For example, a Graphics Device with a -/// supports Direct3D 10.0, Direct3D 10.1, and Direct3D 11.0 APIs, as well as OpenGL ES 3.0. +/// supports Direct3D 10.0, Direct3D 10.1, and Direct3D 11.0 APIs. /// /// /// Some platforms may not support all graphics profiles, or may have additional restrictions. @@ -25,58 +25,58 @@ public enum GraphicsProfile { /// /// Identifies Graphics Devices with capabilities roughly at the level of DirectX 9.0a (HLSL 3.0), - /// OpenGL ES 2.0, or Vulkan 1.0. + /// or Vulkan 1.0. /// - [Display("Level 9.1 ~ like Direct3D 9.0 / OpenGL ES 2.0 / Vulkan 1.0")] + [Display("Level 9.1 ~ like Direct3D 9.0 / Vulkan 1.0")] Level_9_1 = 0x9100, /// /// Identifies Graphics Devices with capabilities roughly at the level of DirectX 9.0b (HLSL 3.0), - /// OpenGL ES 2.0, or Vulkan 1.0. + /// or Vulkan 1.0. /// - [Display("Level 9.2 ~ like Direct3D 9.0b / OpenGL ES 2.0 / Vulkan 1.0")] + [Display("Level 9.2 ~ like Direct3D 9.0b / Vulkan 1.0")] Level_9_2 = 0x9200, /// /// Identifies Graphics Devices with capabilities roughly at the level of DirectX 9.0c (HLSL 3.0), - /// OpenGL ES 2.0, or Vulkan 1.0. + /// or Vulkan 1.0. /// - [Display("Level 9.3 ~ like Direct3D 9.0c / OpenGL ES 2.0 / Vulkan 1.0")] + [Display("Level 9.3 ~ like Direct3D 9.0c / Vulkan 1.0")] Level_9_3 = 0x9300, /// /// Identifies Graphics Devices with capabilities roughly at the level of DirectX 10 - /// (HLSL 4.0, Geometry Shaders), OpenGL ES 3.0, or Vulkan 1.0. + /// (HLSL 4.0, Geometry Shaders), or Vulkan 1.0. /// - [Display("Level 10.0 ~ like Direct3D 10.0 / OpenGL ES 3.0 / Vulkan 1.0")] + [Display("Level 10.0 ~ like Direct3D 10.0 / Vulkan 1.0")] Level_10_0 = 0xA000, /// /// Identifies Graphics Devices with capabilities roughly at the level of DirectX 10.1 - /// (HLSL 4.1, Geometry Shaders), OpenGL ES 3.0, or Vulkan 1.0. + /// (HLSL 4.1, Geometry Shaders), or Vulkan 1.0. /// - [Display("Level 10.1 ~ like Direct3D 10.1 / OpenGL ES 3.0 / Vulkan 1.0")] + [Display("Level 10.1 ~ like Direct3D 10.1 / Vulkan 1.0")] Level_10_1 = 0xA100, /// /// Identifies Graphics Devices with capabilities roughly at the level of DirectX 11 - /// (HLSL 5.0, Compute Shaders, Domain Shaders, Hull Shaders), OpenGL ES 3.1, or Vulkan 1.1. + /// (HLSL 5.0, Compute Shaders, Domain Shaders, Hull Shaders), or Vulkan 1.1. /// - [Display("Level 11.0 ~ like Direct3D 11.0 / OpenGL ES 3.1 / Vulkan 1.1")] + [Display("Level 11.0 ~ like Direct3D 11.0 / Vulkan 1.1")] Level_11_0 = 0xB000, /// /// Identifies Graphics Devices with capabilities roughly at the level of DirectX 11.1 - /// (HLSL 5.0, Compute Shaders, Domain Shaders, Hull Shaders), OpenGL ES 3.1, or Vulkan 1.1. + /// (HLSL 5.0, Compute Shaders, Domain Shaders, Hull Shaders), or Vulkan 1.1. /// - [Display("Level 11.1 ~ like Direct3D 11.1 / OpenGL ES 3.1 / Vulkan 1.1")] + [Display("Level 11.1 ~ like Direct3D 11.1 / Vulkan 1.1")] Level_11_1 = 0xB100, /// /// Identifies Graphics Devices with capabilities roughly at the level of DirectX 11.2 - /// (HLSL 5.0, Compute Shaders, Domain Shaders, Hull Shaders), OpenGL ES 3.1, or Vulkan 1.1. + /// (HLSL 5.0, Compute Shaders, Domain Shaders, Hull Shaders), or Vulkan 1.1. /// - [Display("Level 11.2 ~ like Direct3D 11.2 / OpenGL ES 3.1 / Vulkan 1.1")] + [Display("Level 11.2 ~ like Direct3D 11.2 / Vulkan 1.1")] Level_11_2 = 0xB200 // Future? diff --git a/sources/engine/Stride/Stride.csproj b/sources/engine/Stride/Stride.csproj index ec99888c23..c37e320e44 100644 --- a/sources/engine/Stride/Stride.csproj +++ b/sources/engine/Stride/Stride.csproj @@ -32,7 +32,7 @@ - + diff --git a/sources/native/Stride.Native.targets b/sources/native/Stride.Native.targets index 5a28c635f8..9416289000 100644 --- a/sources/native/Stride.Native.targets +++ b/sources/native/Stride.Native.targets @@ -220,10 +220,10 @@ <_StrideNativeAndroidNdkSourceProperties Condition="Exists('$(_AndroidNdkDirectory)\source.properties')">$([System.IO.File]::ReadAllText('$(_AndroidNdkDirectory)\source.properties')) $([System.Text.RegularExpressions.Regex]::Match($(_StrideNativeAndroidNdkSourceProperties), `Pkg\.Revision = (.*)`).Groups[1].Value) - 19.0 + 26.3 - 16 + 21 21 @@ -233,7 +233,7 @@ - + diff --git a/sources/targets/Stride.UnitTests.targets b/sources/targets/Stride.UnitTests.targets index 04f63e50d2..ebbc034e8c 100644 --- a/sources/targets/Stride.UnitTests.targets +++ b/sources/targets/Stride.UnitTests.targets @@ -10,9 +10,7 @@ $(StrideGraphicsApisTest) - OpenGL;Vulkan - OpenGL - Direct3D11;Direct3D12;OpenGL;OpenGLES;Vulkan + Direct3D11;Direct3D12;Vulkan Direct3D11 diff --git a/sources/targets/Stride.props b/sources/targets/Stride.props index 9396a818e1..9ac752a5f1 100644 --- a/sources/targets/Stride.props +++ b/sources/targets/Stride.props @@ -17,12 +17,12 @@ the active one that Visual Studio and IntelliSense takes into account --> - Direct3D11;Direct3D12;OpenGL;OpenGLES;Vulkan + Direct3D11;Direct3D12;Vulkan $(StrideGraphicsApis.Split(';', StringSplitOptions.RemoveEmptyEntries)[0]) Direct3D11 - OpenGLES - OpenGLES + Vulkan + Vulkan @@ -53,14 +53,6 @@ STRIDE_GRAPHICS_API_NULL - - STRIDE_GRAPHICS_API_OPENGL;STRIDE_GRAPHICS_API_OPENGLCORE - - - - STRIDE_GRAPHICS_API_OPENGL;STRIDE_GRAPHICS_API_OPENGLES - - STRIDE_GRAPHICS_API_VULKAN diff --git a/sources/targets/Stride.targets b/sources/targets/Stride.targets index d134619876..90b29bb075 100644 --- a/sources/targets/Stride.targets +++ b/sources/targets/Stride.targets @@ -24,14 +24,6 @@ STRIDE_GRAPHICS_API_NULL - - STRIDE_GRAPHICS_API_OPENGL;STRIDE_GRAPHICS_API_OPENGLCORE - - - - STRIDE_GRAPHICS_API_OPENGL;STRIDE_GRAPHICS_API_OPENGLES - - STRIDE_GRAPHICS_API_VULKAN diff --git a/sources/tools/Stride.ProjectGenerator/Program.cs b/sources/tools/Stride.ProjectGenerator/Program.cs index 2448f272f2..08d784cc41 100644 --- a/sources/tools/Stride.ProjectGenerator/Program.cs +++ b/sources/tools/Stride.ProjectGenerator/Program.cs @@ -564,24 +564,14 @@ private static void UpdateSolutionBuildConfigurations(string platform, Solution case PlatformType.Windows: // Nothing to do here. break; + case PlatformType.iOS: case PlatformType.Android: - configurations.Add(platform, platform); - needDeploy = true; - break; - case PlatformType.Linux: case PlatformType.macOS: case PlatformType.UWP: configurations.Add("Any CPU", "Any CPU"); needDeploy = true; break; - - case PlatformType.iOS: - configurations.Add("iPhone", "iPhone"); - configurations.Add("iPhoneSimulator", "iPhoneSimulator"); - needDeploy = true; - break; - default: throw new InvalidOperationException("Unknown platform " + requestedPlatform); }