From 99e2e172de57f39f7b56d18aa3cfd98a623f8d49 Mon Sep 17 00:00:00 2001 From: Victor Chelaru Date: Sun, 25 Feb 2024 08:06:21 -0700 Subject: [PATCH] Removed anycpu and x64 from FRB test project. Fixed forms screen not advancing. --- .../GlueTestProjectDesktopGl.sln | 85 ------------------- .../GlueTestProjectDesktopGl.csproj | 2 - .../Screens/FormsScreen.cs | 4 +- 3 files changed, 2 insertions(+), 89 deletions(-) diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.sln b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.sln index 71e198f01..e8fe073c1 100644 --- a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.sln +++ b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.sln @@ -22,135 +22,50 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "FlatRedBall.Forms.Shared", EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Debug2|Any CPU = Debug2|Any CPU - Debug2|x64 = Debug2|x64 Debug2|x86 = Debug2|x86 - DebugWindows|Any CPU = DebugWindows|Any CPU - DebugWindows|x64 = DebugWindows|x64 DebugWindows|x86 = DebugWindows|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {16B8562C-0A9E-4F71-A2CA-052340B95625}.Debug|Any CPU.ActiveCfg = Debug|x86 - {16B8562C-0A9E-4F71-A2CA-052340B95625}.Debug|x64.ActiveCfg = Debug|x64 - {16B8562C-0A9E-4F71-A2CA-052340B95625}.Debug|x64.Build.0 = Debug|x64 {16B8562C-0A9E-4F71-A2CA-052340B95625}.Debug|x86.ActiveCfg = Debug|x86 {16B8562C-0A9E-4F71-A2CA-052340B95625}.Debug|x86.Build.0 = Debug|x86 - {16B8562C-0A9E-4F71-A2CA-052340B95625}.Debug2|Any CPU.ActiveCfg = Release|x64 - {16B8562C-0A9E-4F71-A2CA-052340B95625}.Debug2|Any CPU.Build.0 = Release|x64 - {16B8562C-0A9E-4F71-A2CA-052340B95625}.Debug2|x64.ActiveCfg = DebugWindows|x64 - {16B8562C-0A9E-4F71-A2CA-052340B95625}.Debug2|x64.Build.0 = DebugWindows|x64 {16B8562C-0A9E-4F71-A2CA-052340B95625}.Debug2|x86.ActiveCfg = DebugWindows|x86 {16B8562C-0A9E-4F71-A2CA-052340B95625}.Debug2|x86.Build.0 = DebugWindows|x86 - {16B8562C-0A9E-4F71-A2CA-052340B95625}.DebugWindows|Any CPU.ActiveCfg = DebugWindows|x86 - {16B8562C-0A9E-4F71-A2CA-052340B95625}.DebugWindows|x64.ActiveCfg = DebugWindows|x86 - {16B8562C-0A9E-4F71-A2CA-052340B95625}.DebugWindows|x64.Build.0 = DebugWindows|x86 {16B8562C-0A9E-4F71-A2CA-052340B95625}.DebugWindows|x86.ActiveCfg = DebugWindows|x86 {16B8562C-0A9E-4F71-A2CA-052340B95625}.DebugWindows|x86.Build.0 = DebugWindows|x86 - {16B8562C-0A9E-4F71-A2CA-052340B95625}.Release|Any CPU.ActiveCfg = Release|x86 - {16B8562C-0A9E-4F71-A2CA-052340B95625}.Release|x64.ActiveCfg = Release|x86 - {16B8562C-0A9E-4F71-A2CA-052340B95625}.Release|x64.Build.0 = Release|x86 {16B8562C-0A9E-4F71-A2CA-052340B95625}.Release|x86.ActiveCfg = Release|x86 {16B8562C-0A9E-4F71-A2CA-052340B95625}.Release|x86.Build.0 = Release|x86 - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Debug|x64.ActiveCfg = Debug|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Debug|x64.Build.0 = Debug|Any CPU {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Debug|x86.ActiveCfg = Debug|Any CPU {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Debug|x86.Build.0 = Debug|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Debug2|Any CPU.ActiveCfg = Debug|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Debug2|Any CPU.Build.0 = Debug|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Debug2|x64.ActiveCfg = Debug|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Debug2|x64.Build.0 = Debug|Any CPU {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Debug2|x86.ActiveCfg = Debug|Any CPU {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Debug2|x86.Build.0 = Debug|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.DebugWindows|Any CPU.ActiveCfg = Debug|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.DebugWindows|Any CPU.Build.0 = Debug|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.DebugWindows|x64.ActiveCfg = Debug|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.DebugWindows|x64.Build.0 = Debug|Any CPU {10BDA06C-7269-4CCE-AE2A-D445F414520A}.DebugWindows|x86.ActiveCfg = Debug|Any CPU {10BDA06C-7269-4CCE-AE2A-D445F414520A}.DebugWindows|x86.Build.0 = Debug|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Release|Any CPU.Build.0 = Release|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Release|x64.ActiveCfg = Release|Any CPU - {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Release|x64.Build.0 = Release|Any CPU {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Release|x86.ActiveCfg = Release|Any CPU {10BDA06C-7269-4CCE-AE2A-D445F414520A}.Release|x86.Build.0 = Release|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.Debug|x64.ActiveCfg = Debug|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.Debug|x64.Build.0 = Debug|Any CPU {FC2030B0-E60B-434D-A513-400270B8D7C6}.Debug|x86.ActiveCfg = Debug|Any CPU {FC2030B0-E60B-434D-A513-400270B8D7C6}.Debug|x86.Build.0 = Debug|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.Debug2|Any CPU.ActiveCfg = Debug2|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.Debug2|Any CPU.Build.0 = Debug2|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.Debug2|x64.ActiveCfg = Debug2|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.Debug2|x64.Build.0 = Debug2|Any CPU {FC2030B0-E60B-434D-A513-400270B8D7C6}.Debug2|x86.ActiveCfg = Debug2|Any CPU {FC2030B0-E60B-434D-A513-400270B8D7C6}.Debug2|x86.Build.0 = Debug2|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.DebugWindows|Any CPU.ActiveCfg = Debug|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.DebugWindows|Any CPU.Build.0 = Debug|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.DebugWindows|x64.ActiveCfg = Debug|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.DebugWindows|x64.Build.0 = Debug|Any CPU {FC2030B0-E60B-434D-A513-400270B8D7C6}.DebugWindows|x86.ActiveCfg = Debug|Any CPU {FC2030B0-E60B-434D-A513-400270B8D7C6}.DebugWindows|x86.Build.0 = Debug|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.Release|Any CPU.Build.0 = Release|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.Release|x64.ActiveCfg = Release|Any CPU - {FC2030B0-E60B-434D-A513-400270B8D7C6}.Release|x64.Build.0 = Release|Any CPU {FC2030B0-E60B-434D-A513-400270B8D7C6}.Release|x86.ActiveCfg = Release|Any CPU {FC2030B0-E60B-434D-A513-400270B8D7C6}.Release|x86.Build.0 = Release|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Debug|x64.ActiveCfg = Debug|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Debug|x64.Build.0 = Debug|Any CPU {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Debug|x86.ActiveCfg = Debug|Any CPU {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Debug|x86.Build.0 = Debug|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Debug2|Any CPU.ActiveCfg = Debug|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Debug2|Any CPU.Build.0 = Debug|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Debug2|x64.ActiveCfg = Debug|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Debug2|x64.Build.0 = Debug|Any CPU {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Debug2|x86.ActiveCfg = Debug|Any CPU {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Debug2|x86.Build.0 = Debug|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.DebugWindows|Any CPU.ActiveCfg = Debug|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.DebugWindows|Any CPU.Build.0 = Debug|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.DebugWindows|x64.ActiveCfg = Debug|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.DebugWindows|x64.Build.0 = Debug|Any CPU {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.DebugWindows|x86.ActiveCfg = Debug|Any CPU {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.DebugWindows|x86.Build.0 = Debug|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Release|Any CPU.Build.0 = Release|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Release|x64.ActiveCfg = Release|Any CPU - {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Release|x64.Build.0 = Release|Any CPU {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Release|x86.ActiveCfg = Release|Any CPU {F0BDEE46-0374-4278-B1C3-F91A76FE3A8D}.Release|x86.Build.0 = Release|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.Debug|x64.ActiveCfg = Debug|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.Debug|x64.Build.0 = Debug|Any CPU {AA2297A1-6BB4-4165-89A6-C099F687085F}.Debug|x86.ActiveCfg = Debug|Any CPU {AA2297A1-6BB4-4165-89A6-C099F687085F}.Debug|x86.Build.0 = Debug|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.Debug2|Any CPU.ActiveCfg = Debug|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.Debug2|Any CPU.Build.0 = Debug|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.Debug2|x64.ActiveCfg = Debug|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.Debug2|x64.Build.0 = Debug|Any CPU {AA2297A1-6BB4-4165-89A6-C099F687085F}.Debug2|x86.ActiveCfg = Debug|Any CPU {AA2297A1-6BB4-4165-89A6-C099F687085F}.Debug2|x86.Build.0 = Debug|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.DebugWindows|Any CPU.ActiveCfg = Debug|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.DebugWindows|Any CPU.Build.0 = Debug|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.DebugWindows|x64.ActiveCfg = Debug|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.DebugWindows|x64.Build.0 = Debug|Any CPU {AA2297A1-6BB4-4165-89A6-C099F687085F}.DebugWindows|x86.ActiveCfg = Debug|Any CPU {AA2297A1-6BB4-4165-89A6-C099F687085F}.DebugWindows|x86.Build.0 = Debug|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.Release|Any CPU.Build.0 = Release|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.Release|x64.ActiveCfg = Release|Any CPU - {AA2297A1-6BB4-4165-89A6-C099F687085F}.Release|x64.Build.0 = Release|Any CPU {AA2297A1-6BB4-4165-89A6-C099F687085F}.Release|x86.ActiveCfg = Release|Any CPU {AA2297A1-6BB4-4165-89A6-C099F687085F}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.csproj b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.csproj index 49543853d..8aaa7b7dd 100644 --- a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.csproj +++ b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl.csproj @@ -1391,8 +1391,6 @@ - - diff --git a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Screens/FormsScreen.cs b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Screens/FormsScreen.cs index caae5ac04..fa8264e4b 100644 --- a/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Screens/FormsScreen.cs +++ b/Tests/GlueTestProjectDesktopGl/GlueTestProjectDesktopGl/Screens/FormsScreen.cs @@ -199,9 +199,9 @@ private void TestRadioButtonSelected() void CustomActivity(bool firstTimeCalled) { - //IsActivityFinished = true; + IsActivityFinished = true; - } + } void CustomDestroy() {