From 2866fa7335eabc4371cb6909348a8db688c9f59d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= <jp_bruyere@hotmail.com>
Date: Tue, 28 Sep 2021 10:14:08 +0000
Subject: [PATCH] reset hello world, intermediateoutputpath set in
 Directory.Build.props was causing AppHost creation bug (wrong assembly)

---
 Documentation/DeviceEventRouting.md   |  2 +-
 Samples/Directory.Build.props         |  1 -
 Samples/HelloWorld/ui/helloworld.crow | 40 +--------------------------
 Samples/PerfTests/Program.cs          | 20 +++++++-------
 clean.sh                              |  2 --
 5 files changed, 12 insertions(+), 53 deletions(-)
 delete mode 100755 clean.sh

diff --git a/Documentation/DeviceEventRouting.md b/Documentation/DeviceEventRouting.md
index ae3bc317..4e11ee42 100644
--- a/Documentation/DeviceEventRouting.md
+++ b/Documentation/DeviceEventRouting.md
@@ -1,4 +1,4 @@
 
-Bubbling or not Bubbling, that the question.
+Bubbling or not Bubbling, that's the question.
 
 
diff --git a/Samples/Directory.Build.props b/Samples/Directory.Build.props
index 8e2a39cd..34459547 100644
--- a/Samples/Directory.Build.props
+++ b/Samples/Directory.Build.props
@@ -6,7 +6,6 @@
 
 		<SolutionDir>$(MSBuildThisFileDirectory)..\</SolutionDir>
 		<OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
-		<IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)\</IntermediateOutputPath>
 
 		<!--<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>-->
 
diff --git a/Samples/HelloWorld/ui/helloworld.crow b/Samples/HelloWorld/ui/helloworld.crow
index a9dad40c..d1c30b0f 100644
--- a/Samples/HelloWorld/ui/helloworld.crow
+++ b/Samples/HelloWorld/ui/helloworld.crow
@@ -1,40 +1,2 @@
 <?xml version="1.0"?>
-<VerticalStack Margin="50" Spacing="20">
-	<HorizontalStack Height="Fit">
-		<Label Text="Hover:" Width="50" Foreground="Grey"/>
-		<Label Text="{HoverWidget}" Font="mono, 8"/>
-	</HorizontalStack>
-	<HorizontalStack Height="Fit">
-		<Label Text="Focus:" Width="50" Foreground="Grey"/>
-		<Label Text="{FocusedWidget}" Font="mono, 8"/>
-	</HorizontalStack>
-	<HorizontalStack Height="Fit">
-		<Label Text="Active:" Width="50" Foreground="Grey"/>
-		<Label Text="{ActiveWidget}" Font="mono, 8"/>
-	</HorizontalStack>
-	<Border Height="Fit" Margin="2" Background="Blue" ContextCommands="{CMDTest}" Focusable="true"
-			MouseEnter="{Background=Red}"
-			MouseLeave="{Background=Blue}">
-		<Label Margin="5" Text="Hello World" />
-	</Border>
-	<Border Height="Fit" Margin="2" Background="Blue" ContextCommands="{CMDTest}" Focusable="true"
-			MouseEnter="{Background=Red}"
-			MouseLeave="{Background=Blue}">
-		<Label Margin="5" Text="Hello World" />
-	</Border>
-	<Border Height="Fit" Margin="2" Background="Blue" ContextCommands="{CMDTest}" Focusable="true"
-			MouseEnter="{Background=Red}"
-			MouseLeave="{Background=Blue}">
-		<Label Margin="5" Text="Hello World" />
-	</Border>
-	<Border Height="Fit" Margin="2" Background="Blue" ContextCommands="{CMDTest}" Focusable="true"
-			MouseEnter="{Background=Red}"
-			MouseLeave="{Background=Blue}">
-		<Label Margin="5" Text="Hello World" />
-	</Border>
-	<Border Height="Fit" Margin="2" Background="Blue" ContextCommands="{CMDTest}" Focusable="true"
-			MouseEnter="{Background=Red}"
-			MouseLeave="{Background=Blue}">
-		<Label Margin="5" Text="Hello World" />
-	</Border>
-</VerticalStack>
+<Label Text="Hello World"/>
diff --git a/Samples/PerfTests/Program.cs b/Samples/PerfTests/Program.cs
index 17af6282..8ec252dd 100644
--- a/Samples/PerfTests/Program.cs
+++ b/Samples/PerfTests/Program.cs
@@ -130,17 +130,15 @@ namespace PerfTests
 						break;
 					case "--help":
 					default:
-						throw new Exception ();
+						throw new Exception ("none");
 					}
 				}
-				if (EndStage < StartStage) {
-					Console.WriteLine ($"Ending stage (){EndStage} is before Starting stage ({StartStage})");
-					throw new Exception ();
-				}
+				if (EndStage < StartStage)
+					throw new Exception ($"Ending stage (){EndStage} is before Starting stage ({StartStage})");
 
-			} catch (Exception) {
+			} catch (Exception e) {
 				printHelp ();
-				throw;
+				throw e;
 			}
 
 			if (string.IsNullOrEmpty (outDir)) {
@@ -525,9 +523,11 @@ namespace PerfTests
 						iface.PerformTests ();
 				}
 			} catch (Exception e) {
-				Console.ForegroundColor = ConsoleColor.DarkRed;
-				Console.WriteLine (e);
-				Console.ResetColor ();
+				if (e.Message != "none") {
+					Console.ForegroundColor = ConsoleColor.DarkRed;
+					Console.WriteLine (e);
+					Console.ResetColor ();
+				}
             }
 		}
 	}
diff --git a/clean.sh b/clean.sh
deleted file mode 100755
index 08b3c61b..00000000
--- a/clean.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-rm -fr build && find . -iname bin -o -iname obj -o -iname packages -o -iname build | xargs rm -rf
-- 
2.47.3