Skip to content

Commit 93f8b1c

Browse files
KebooKeboo
authored
Removing un-used itemshost (#3371)
* Remove ItemsHost from TreeListView * Better test logging Fixing vulnerable NuGet packages. * Bumping XAMLTest This also fixes the console window getting on top * Net8 bump for UI tests * Slight delay and wait for visible
1 parent 73c546f commit 93f8b1c

File tree

9 files changed

+32
-95
lines changed

9 files changed

+32
-95
lines changed

‎.github/workflows/build_artifacts.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
dotnet-version: |
3636
6.x
3737
7.x
38+
8.x
3839
3940
- name: Restore dependencies
4041
run: dotnet restore ${{ env.solution }}
@@ -48,7 +49,7 @@ jobs:
4849

4950
- name: Test
5051
timeout-minutes: 20
51-
run: dotnet test ${{ env.solution }} --configuration ${{ inputs.build-configuration }} --no-build --verbosity normal --blame-crash
52+
run: dotnet test ${{ env.solution }} --configuration ${{ inputs.build-configuration }} --no-build --blame-crash --logger GitHubActions
5253

5354
- name: Upload Screenshots
5455
if: ${{ always() }}

‎Directory.packages.props

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PackageVersion Include="BluwolfIcons" Version="1.0.1" />
44
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
55
<PackageVersion Include="Dragablz" Version="0.0.3.234" />
6+
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
67
<PackageVersion Include="Humanizer" Version="2.14.1" />
78
<PackageVersion Include="MahApps.Metro" Version="2.4.10" />
89
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
@@ -22,10 +23,12 @@
2223
<PackageVersion Include="ShowMeTheXAML.AvalonEdit" Version="2.0.0" />
2324
<PackageVersion Include="ShowMeTheXAML.MSBuild" Version="2.0.0" />
2425
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
25-
<PackageVersion Include="VirtualizingWrapPanel" Version="1.5.7" />
26-
<PackageVersion Include="XAMLTest" Version="1.1.0" />
27-
<PackageVersion Include="xunit" Version="2.6.1" />
28-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
26+
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
27+
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
28+
<PackageVersion Include="VirtualizingWrapPanel" Version="1.5.8" />
29+
<PackageVersion Include="XAMLTest" Version="1.2.0" />
30+
<PackageVersion Include="xunit" Version="2.6.2" />
31+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />
2932
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
3033
</ItemGroup>
3134
</Project>

‎MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
2222
</ItemGroup>
2323
<ItemGroup>
24+
<PackageReference Include="GitHubActionsTestLogger">
25+
<PrivateAssets>all</PrivateAssets>
26+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27+
</PackageReference>
2428
<PackageReference Include="xunit" />
2529
<PackageReference Include="xunit.runner.visualstudio" />
2630
<PackageReference Include="Shouldly" />

‎MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0-windows</TargetFramework>
3+
<TargetFramework>net8.0-windows7</TargetFramework>
44
<IsPackable>false</IsPackable>
55
<SignAssembly>false</SignAssembly>
66
<UseWPF>true</UseWPF>
@@ -10,7 +10,13 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="CommunityToolkit.Mvvm" />
13+
<PackageReference Include="GitHubActionsTestLogger">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
1317
<PackageReference Include="Microsoft.NET.Test.Sdk" />
18+
<PackageReference Include="System.Net.Http" />
19+
<PackageReference Include="System.Text.RegularExpressions" />
1420
<PackageReference Include="XAMLTest" />
1521
<PackageReference Include="xunit" />
1622
<PackageReference Include="xunit.runner.visualstudio">

‎MaterialDesignThemes.UITests/TestBase.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Diagnostics;
12
using System.Diagnostics.CodeAnalysis;
23
using System.Windows.Media;
34

@@ -49,6 +50,7 @@ protected async Task<IVisualElement> LoadUserControl(Type userControlType)
4950
public async Task InitializeAsync() =>
5051
App = await XamlTest.App.StartRemote(new AppOptions
5152
{
53+
MinimizeOtherWindows = !Debugger.IsAttached,
5254
AllowVisualStudioDebuggerAttach = AttachedDebuggerToRemoteProcess,
5355
LogMessage = Output.WriteLine
5456
});

‎MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ public async Task CanChoiceItem_FromTheSuggestions_AssertTheTextUpdated()
6161
Assert.True(await popup.GetIsOpen());
6262

6363
//Choose Item from the list
64+
await Task.Delay(200);
6465
var bananas = await suggestionListBox.GetElement<ListBoxItem>("/ListBoxItem[0]");
65-
await Task.Delay(100);
66+
await Wait.For(async () => await bananas.GetIsVisible());
6667
await bananas.LeftClick();
6768
var suggestBoxText = await suggestBox.GetText();
6869
//Validate that the current text is the same as the selected item

‎MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,17 @@
2222
<ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
2323
</ItemGroup>
2424
<ItemGroup>
25+
<PackageReference Include="GitHubActionsTestLogger">
26+
<PrivateAssets>all</PrivateAssets>
27+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28+
</PackageReference>
2529
<PackageReference Include="xunit" />
2630
<PackageReference Include="xunit.runner.visualstudio" />
2731
<PackageReference Include="Xunit.StaFact" />
2832
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2933
</ItemGroup>
3034

3135
<ItemGroup>
32-
<Using Include="Xunit"/>
36+
<Using Include="Xunit" />
3337
</ItemGroup>
3438
</Project>

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml

Lines changed: 2 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -166,77 +166,10 @@
166166
<VisualState Name="Unselected" />
167167
</VisualStateGroup>
168168
<VisualStateGroup x:Name="ExpansionStates">
169-
<VisualStateGroup.Transitions>
170-
<VisualTransition GeneratedDuration="0" To="Expanded">
171-
<VisualTransition.GeneratedEasingFunction>
172-
<CubicEase EasingMode="EaseOut" />
173-
</VisualTransition.GeneratedEasingFunction>
174-
<Storyboard>
175-
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
176-
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
177-
</ObjectAnimationUsingKeyFrames>
178-
<DoubleAnimation Storyboard.TargetName="ItemsHost"
179-
Storyboard.TargetProperty="Opacity"
180-
To="1"
181-
Duration="0:0:0.3" />
182-
<DoubleAnimation Storyboard.TargetName="ScaleHost"
183-
Storyboard.TargetProperty="Scale"
184-
To="1"
185-
Duration="0:0:0.3" />
186-
</Storyboard>
187-
</VisualTransition>
188-
<VisualTransition GeneratedDuration="0" To="Collapsed">
189-
<VisualTransition.GeneratedEasingFunction>
190-
<CubicEase EasingMode="EaseOut" />
191-
</VisualTransition.GeneratedEasingFunction>
192-
<Storyboard>
193-
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
194-
<DiscreteObjectKeyFrame KeyTime="0:0:0.3" Value="{x:Static Visibility.Collapsed}" />
195-
</ObjectAnimationUsingKeyFrames>
196-
<DoubleAnimation Storyboard.TargetName="ItemsHost"
197-
Storyboard.TargetProperty="Opacity"
198-
To="0"
199-
Duration="0:0:0.3" />
200-
<DoubleAnimation Storyboard.TargetName="ScaleHost"
201-
Storyboard.TargetProperty="Scale"
202-
To="0"
203-
Duration="0:0:0.3" />
204-
</Storyboard>
205-
</VisualTransition>
206-
</VisualStateGroup.Transitions>
207-
<VisualState x:Name="Expanded">
208-
<Storyboard>
209-
<DoubleAnimation Storyboard.TargetName="ItemsHost"
210-
Storyboard.TargetProperty="Opacity"
211-
To="1"
212-
Duration="0" />
213-
<DoubleAnimation Storyboard.TargetName="ScaleHost"
214-
Storyboard.TargetProperty="Scale"
215-
To="1"
216-
Duration="0:0:0.3" />
217-
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
218-
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
219-
</ObjectAnimationUsingKeyFrames>
220-
</Storyboard>
221-
</VisualState>
222-
<VisualState x:Name="Collapsed">
223-
<Storyboard>
224-
<DoubleAnimation Storyboard.TargetName="ItemsHost"
225-
Storyboard.TargetProperty="Opacity"
226-
To="0"
227-
Duration="0" />
228-
<DoubleAnimation Storyboard.TargetName="ScaleHost"
229-
Storyboard.TargetProperty="Scale"
230-
To="0"
231-
Duration="0:0:0.3" />
232-
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
233-
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
234-
</ObjectAnimationUsingKeyFrames>
235-
</Storyboard>
236-
</VisualState>
169+
<VisualState x:Name="Expanded" />
170+
<VisualState x:Name="Collapsed" />
237171
</VisualStateGroup>
238172
</VisualStateManager.VisualStateGroups>
239-
<wpf:ScaleHost x:Name="ScaleHost" />
240173
<ToggleButton x:Name="Expander"
241174
Width="{TemplateBinding wpf:TreeViewAssist.ExpanderSize}"
242175
Height="{TemplateBinding wpf:TreeViewAssist.ExpanderSize}"
@@ -284,23 +217,6 @@
284217
ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.AdditionalTemplate)}"
285218
ContentTemplateSelector="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.AdditionalTemplateSelector)}"
286219
Visibility="Collapsed" />
287-
288-
<StackPanel x:Name="ItemsPanel"
289-
Grid.Row="2"
290-
Grid.Column="1"
291-
Grid.ColumnSpan="2"
292-
Margin="-16,0,0,0">
293-
<StackPanel.Height>
294-
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
295-
<Binding ElementName="ItemsHost" Path="ActualHeight" />
296-
<Binding ElementName="ScaleHost" Path="Scale" />
297-
</MultiBinding>
298-
</StackPanel.Height>
299-
<ItemsPresenter x:Name="ItemsHost"
300-
VerticalAlignment="Top"
301-
Opacity="0"
302-
Visibility="Collapsed" />
303-
</StackPanel>
304220
</Grid>
305221
<ControlTemplate.Triggers>
306222
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.AdditionalTemplate), Converter={StaticResource NullableToVisibilityConverter}, Mode=OneWay}" Value="Visible">

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "7.0.100",
3+
"version": "8.0.100",
44
"rollForward": "latestMinor"
55
}
66
}

0 commit comments

Comments
 (0)