Skip to content

Support dotnet4.0~6.0 multi-version examples #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 2, 2023
Merged

Support dotnet4.0~6.0 multi-version examples #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
<FileVersion>1.1.0.1</FileVersion>
<Version>1.1.0.1</Version>
<RepositoryUrl>https://github.com/WPFDevelopersOrg/WPFDevelopers</RepositoryUrl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
<OutputPath></OutputPath>
<Configurations>Debug;Release;Debug-.NET40;Release-.NET40</Configurations>
</PropertyGroup>
<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />
Expand Down
28 changes: 14 additions & 14 deletions src/WPFDevelopers.Net45x/Themes/Theme.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2289,11 +2289,11 @@
</Border>
</Grid>
<ControlTemplate.Triggers>
<DataTrigger Binding="{Binding DisplayMode, &#xD;&#xA; RelativeSource={RelativeSource FindAncestor, &#xD;&#xA; AncestorType={x:Type Calendar}}}" Value="Year">
<DataTrigger Binding="{Binding DisplayMode, &#xA; RelativeSource={RelativeSource FindAncestor, &#xA; AncestorType={x:Type Calendar}}}" Value="Year">
<Setter Property="Visibility" TargetName="PART_MonthView" Value="Collapsed" />
<Setter Property="Visibility" TargetName="PART_YearView" Value="Visible" />
</DataTrigger>
<DataTrigger Binding="{Binding DisplayMode, &#xD;&#xA; RelativeSource={RelativeSource FindAncestor, &#xD;&#xA; AncestorType={x:Type Calendar}}}" Value="Decade">
<DataTrigger Binding="{Binding DisplayMode, &#xA; RelativeSource={RelativeSource FindAncestor, &#xA; AncestorType={x:Type Calendar}}}" Value="Decade">
<Setter Property="Visibility" TargetName="PART_MonthView" Value="Collapsed" />
<Setter Property="Visibility" TargetName="PART_YearView" Value="Visible" />
</DataTrigger>
Expand Down Expand Up @@ -2458,16 +2458,16 @@
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Button Focusable="False" Command="{x:Static DataGrid.SelectAllCommand}" Style="{StaticResource DefaultDataGridSelectAllButtonStyle}" Visibility="{Binding HeadersVisibility, &#xD;&#xA; ConverterParameter={x:Static DataGridHeadersVisibility.All}, &#xD;&#xA; Converter={x:Static DataGrid.HeadersVisibilityConverter}, &#xD;&#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" />
<DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.Column="1" Visibility="{Binding HeadersVisibility, &#xD;&#xA; ConverterParameter={x:Static DataGridHeadersVisibility.Column}, &#xD;&#xA; Converter={x:Static DataGrid.HeadersVisibilityConverter}, &#xD;&#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
<Button Focusable="False" Command="{x:Static DataGrid.SelectAllCommand}" Style="{StaticResource DefaultDataGridSelectAllButtonStyle}" Visibility="{Binding HeadersVisibility, &#xA; ConverterParameter={x:Static DataGridHeadersVisibility.All}, &#xA; Converter={x:Static DataGrid.HeadersVisibilityConverter}, &#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" />
<DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.Column="1" Visibility="{Binding HeadersVisibility, &#xA; ConverterParameter={x:Static DataGridHeadersVisibility.Column}, &#xA; Converter={x:Static DataGrid.HeadersVisibilityConverter}, &#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.ColumnSpan="2" Grid.Row="1" CanContentScroll="{TemplateBinding CanContentScroll}" />
<ScrollBar x:Name="PART_VerticalScrollBar" Grid.Column="1" HorizontalAlignment="Right" Grid.Row="1" Orientation="Vertical" ViewportSize="{TemplateBinding ViewportHeight}" Maximum="{TemplateBinding ScrollableHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, &#xD;&#xA; RelativeSource={RelativeSource TemplatedParent}}" />
<ScrollBar x:Name="PART_VerticalScrollBar" Grid.Column="1" HorizontalAlignment="Right" Grid.Row="1" Orientation="Vertical" ViewportSize="{TemplateBinding ViewportHeight}" Maximum="{TemplateBinding ScrollableHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, &#xA; RelativeSource={RelativeSource TemplatedParent}}" />
<Grid Grid.Column="1" Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, &#xD;&#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
<ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, &#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Column="1" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Maximum="{TemplateBinding ScrollableWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, &#xD;&#xA; RelativeSource={RelativeSource TemplatedParent}}" />
<ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Column="1" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Maximum="{TemplateBinding ScrollableWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, &#xA; RelativeSource={RelativeSource TemplatedParent}}" />
</Grid>
</Grid>
</ControlTemplate>
Expand Down Expand Up @@ -2575,8 +2575,8 @@
<RowDefinition Height="Auto" />
</SelectiveScrollingGrid.RowDefinitions>
<DataGridCellsPresenter Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<DataGridDetailsPresenter Grid.Column="1" Grid.Row="1" Visibility="{TemplateBinding DetailsVisibility}" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, &#xD;&#xA; ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical},&#xD;&#xA; Converter={x:Static DataGrid.RowDetailsScrollingConverter}, &#xD;&#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
<DataGridRowHeader Grid.RowSpan="2" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, &#xD;&#xA; ConverterParameter={x:Static DataGridHeadersVisibility.Row}, &#xD;&#xA; Converter={x:Static DataGrid.HeadersVisibilityConverter}, &#xD;&#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
<DataGridDetailsPresenter Grid.Column="1" Grid.Row="1" Visibility="{TemplateBinding DetailsVisibility}" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, &#xA; ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical},&#xA; Converter={x:Static DataGrid.RowDetailsScrollingConverter}, &#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
<DataGridRowHeader Grid.RowSpan="2" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, &#xA; ConverterParameter={x:Static DataGridHeadersVisibility.Row}, &#xA; Converter={x:Static DataGrid.HeadersVisibilityConverter}, &#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
</SelectiveScrollingGrid>
</Border>
</ControlTemplate>
Expand Down Expand Up @@ -2628,7 +2628,7 @@
<Border x:Name="rowHeaderBorder" Background="{TemplateBinding Background}">
<StackPanel Orientation="Horizontal">
<ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.FontWeight="{TemplateBinding FontWeight}" />
<Control SnapsToDevicePixels="false" Template="{Binding ValidationErrorTemplate, &#xD;&#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" Visibility="{Binding (Validation.HasError), &#xD;&#xA; Converter={StaticResource bool2VisibilityConverter}, &#xD;&#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" />
<Control SnapsToDevicePixels="false" Template="{Binding ValidationErrorTemplate, &#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" Visibility="{Binding (Validation.HasError), &#xA; Converter={StaticResource bool2VisibilityConverter}, &#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" />
</StackPanel>
</Border>
<Thumb x:Name="PART_TopHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Top" />
Expand Down Expand Up @@ -3308,7 +3308,7 @@
</Grid.RowDefinitions>
<DockPanel Margin="{TemplateBinding Padding}">
<ScrollViewer DockPanel.Dock="Top" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" Focusable="False">
<GridViewHeaderRowPresenter Columns="{Binding Path=TemplatedParent.View.Columns,&#xD;&#xA; RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContainerStyle="{Binding&#xD;&#xA; Path=TemplatedParent.View.ColumnHeaderContainerStyle,&#xD;&#xA; RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplate="{Binding&#xD;&#xA; Path=TemplatedParent.View.ColumnHeaderTemplate,&#xD;&#xA; RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplateSelector="{Binding &#xD;&#xA; Path=TemplatedParent.View.ColumnHeaderTemplateSelector,&#xD;&#xA; RelativeSource={RelativeSource TemplatedParent}}" AllowsColumnReorder="{Binding&#xD;&#xA; Path=TemplatedParent.View.AllowsColumnReorder,&#xD;&#xA; RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContextMenu="{Binding&#xD;&#xA; Path=TemplatedParent.View.ColumnHeaderContextMenu,&#xD;&#xA; RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderToolTip="{Binding&#xD;&#xA; Path=TemplatedParent.View.ColumnHeaderToolTip,&#xD;&#xA; RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="{TemplateBinding&#xD;&#xA; SnapsToDevicePixels}" />
<GridViewHeaderRowPresenter Columns="{Binding Path=TemplatedParent.View.Columns,&#xA; RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContainerStyle="{Binding&#xA; Path=TemplatedParent.View.ColumnHeaderContainerStyle,&#xA; RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplate="{Binding&#xA; Path=TemplatedParent.View.ColumnHeaderTemplate,&#xA; RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplateSelector="{Binding &#xA; Path=TemplatedParent.View.ColumnHeaderTemplateSelector,&#xA; RelativeSource={RelativeSource TemplatedParent}}" AllowsColumnReorder="{Binding&#xA; Path=TemplatedParent.View.AllowsColumnReorder,&#xA; RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContextMenu="{Binding&#xA; Path=TemplatedParent.View.ColumnHeaderContextMenu,&#xA; RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderToolTip="{Binding&#xA; Path=TemplatedParent.View.ColumnHeaderToolTip,&#xA; RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="{TemplateBinding&#xA; SnapsToDevicePixels}" />
</ScrollViewer>
<ScrollContentPresenter Name="PART_ScrollContentPresenter" KeyboardNavigation.DirectionalNavigation="Local" CanContentScroll="True" CanHorizontallyScroll="False" CanVerticallyScroll="False" />
</DockPanel>
Expand Down Expand Up @@ -3376,7 +3376,7 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListView}">
<Border Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{DynamicResource BaseSolidColorBrush}">
<ScrollViewer Style="{DynamicResource&#xD;&#xA; {x:Static GridView.GridViewScrollViewerStyleKey}}">
<ScrollViewer Style="{DynamicResource&#xA; {x:Static GridView.GridViewScrollViewerStyleKey}}">
<ItemsPresenter />
</ScrollViewer>
</Border>
Expand Down Expand Up @@ -4442,7 +4442,7 @@
</Path.Data>
</Path>
</Canvas>
<TextBlock Foreground="{TemplateBinding Foreground}" Text="{Binding Path=Value, StringFormat={}{0}%, &#xD;&#xA; RelativeSource={RelativeSource TemplatedParent}}" FontSize="{TemplateBinding FontSize}" VerticalAlignment="Center" HorizontalAlignment="Center" x:Name="PART_TextBlock" />
<TextBlock Foreground="{TemplateBinding Foreground}" Text="{Binding Path=Value, StringFormat={}{0}%, &#xA; RelativeSource={RelativeSource TemplatedParent}}" FontSize="{TemplateBinding FontSize}" VerticalAlignment="Center" HorizontalAlignment="Center" x:Name="PART_TextBlock" />
</controls:SmallPanel>
</ControlTemplate>
</Setter.Value>
Expand Down Expand Up @@ -4545,7 +4545,7 @@
<RotateTransform Angle="90" />
</TransformGroup>
</Border.RenderTransform>
<TextBlock Foreground="{StaticResource NormalBrush}" FontSize="40" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Path=Value, StringFormat={}{0}%, &#xD;&#xA; RelativeSource={RelativeSource TemplatedParent}}" FontWeight="Bold" FontFamily="Agency FB" />
<TextBlock Foreground="{StaticResource NormalBrush}" FontSize="40" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Path=Value, StringFormat={}{0}%, &#xA; RelativeSource={RelativeSource TemplatedParent}}" FontWeight="Bold" FontFamily="Agency FB" />
</Border>
</controls:SmallPanel>
</Viewbox>
Expand Down
6 changes: 2 additions & 4 deletions src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<RootNamespace>WPFDevelopers</RootNamespace>
<TargetFrameworks>net45;net46;net47;net48;net5.0-windows;net6.0-windows;netcoreapp3.0</TargetFrameworks>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<PackageId>WPFDevelopers</PackageId>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
Expand All @@ -13,9 +12,8 @@
<FileVersion>1.1.0.1</FileVersion>
<Version>1.1.0.1</Version>
<RepositoryUrl>https://github.com/WPFDevelopersOrg/WPFDevelopers</RepositoryUrl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
<OutputPath></OutputPath>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Configurations>Debug;Release;Debug-.NET40;Release-.NET40</Configurations>
</PropertyGroup>
<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
Expand Down
0 src/WPFDevelopers.Samples/App.config → src/WPFDevelopers.Samples.Shared/App.config
View file
Open in desktop
File renamed without changes.
0 src/WPFDevelopers.Samples/App.xaml → src/WPFDevelopers.Samples.Shared/App.xaml
View file
Open in desktop
File renamed without changes.
0 src/WPFDevelopers.Samples/App.xaml.cs → src/WPFDevelopers.Samples.Shared/App.xaml.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Samples/Controls/CodeViewer/CodeViewer.cs → ....Shared/Controls/CodeViewer/CodeViewer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.IO;
using System.Windows;
using System.Windows.Controls;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox;
using WPFDevelopers.Helpers;

namespace WPFDevelopers.Samples.Controls
{
Expand Down
0 ...mples/Controls/CodeViewer/CodeViewer.xaml → ...hared/Controls/CodeViewer/CodeViewer.xaml
View file
Open in desktop
File renamed without changes.
0 ...es/Controls/CodeViewer/SourceCodeModel.cs → ...ed/Controls/CodeViewer/SourceCodeModel.cs
View file
Open in desktop
File renamed without changes.
0 ...velopers.Samples/Converts/StateConvert.cs → ...s.Samples.Shared/Converts/StateConvert.cs
View file
Open in desktop
File renamed without changes.
12 changes: 1 addition & 11 deletions ...ers.Samples/ExampleViews/AboutWindow.xaml → ...ples.Shared/ExampleViews/AboutWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@
Height="400" Width="300"
Background="{DynamicResource BackgroundSolidColorBrush}"
Title="关于" >
<ws:WindowChrome.WindowChrome>
<ws:WindowChrome GlassFrameThickness="1" CaptionHeight="160" />
</ws:WindowChrome.WindowChrome>
<!--<Window.Resources>
<Style TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextSolidColorBrush}" />
<Setter Property="FontSize" Value="{StaticResource NormalFontSize}"/>
</Style>
</Window.Resources>-->
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="4*"/>
Expand All @@ -31,15 +22,14 @@

<Rectangle Width="120">
<Rectangle.Fill>
<ImageBrush ImageSource="/WPFDevelopers.ico" Stretch="Uniform"/>
<ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/WPFDevelopers.ico" Stretch="Uniform"/>
</Rectangle.Fill>
</Rectangle>
<Button x:Name="CloseButton" Width="30" Height="30"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Style="{StaticResource WindowButtonStyle}"
ToolTip="关闭"
ws:WindowChrome.IsHitTestVisibleInChrome="True"
Click="CloseButton_Click">
<Path Data="{StaticResource PathMetroWindowClose}"
Fill="{DynamicResource WindowForegroundColorBrush}"
Expand Down
24 changes: 23 additions & 1 deletion ....Samples/ExampleViews/AboutWindow.xaml.cs → ...s.Shared/ExampleViews/AboutWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
using System;
#if NET40
using Microsoft.Windows.Shell;
#else
using System.Windows.Shell;
# endif
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Navigation;

namespace WPFDevelopers.Samples.ExampleViews
Expand All @@ -13,6 +19,22 @@ public partial class AboutWindow : Window
public AboutWindow()
{
InitializeComponent();
#if NET40
var windowChrome = new WindowChrome
{
CaptionHeight = 160,
GlassFrameThickness = new Thickness(1)
};
WindowChrome.SetIsHitTestVisibleInChrome(CloseButton, true);
#else
var windowChrome = new WindowChrome
{
CaptionHeight = 160,
GlassFrameThickness = new Thickness(1),
UseAeroCaptionButtons = false
};
WindowChrome.SetIsHitTestVisibleInChrome(CloseButton, true);
#endif
}

private void GithubHyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
Expand Down
0 ...ples/ExampleViews/AcrylicBlurExample.xaml → ...ared/ExampleViews/AcrylicBlurExample.xaml
View file
Open in desktop
File renamed without changes.
0 ...s/ExampleViews/AcrylicBlurExample.xaml.cs → ...d/ExampleViews/AcrylicBlurExample.xaml.cs
View file
Open in desktop
File renamed without changes.
Loading