diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2021-09-28 10:14:08 +0000 |
|---|---|---|
| committer | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2021-09-28 10:15:21 +0000 |
| commit | 2866fa7335eabc4371cb6909348a8db688c9f59d (patch) | |
| tree | 6b25c7214eac6cbf07c6654e1c4bf9ef052c84fd | |
| parent | c0fc101f87d4b4b55dbe7958d68e2a416e191217 (diff) | |
reset hello world, intermediateoutputpath set in Directory.Build.props was causing AppHost creation bug (wrong assembly)
| -rw-r--r-- | Documentation/DeviceEventRouting.md | 2 | ||||
| -rw-r--r-- | Samples/Directory.Build.props | 1 | ||||
| -rw-r--r-- | Samples/HelloWorld/ui/helloworld.crow | 40 | ||||
| -rw-r--r-- | Samples/PerfTests/Program.cs | 20 | ||||
| -rwxr-xr-x | clean.sh | 2 |
5 files changed, 12 insertions, 53 deletions
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 |