Skip to content

Commit 1eceff8

Browse files
yanjinhuagoodyanjinhuagood
authored
Merge pull request #30 from WPFDevelopersOrg/dev
Support dotnet4.0~6.0 multi-version examples
2 parents b12c609 + dc819a1 commit 1eceff8

File tree

281 files changed

+2849
-2003
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+2849
-2003
lines changed

‎src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
<FileVersion>1.1.0.1</FileVersion>
1313
<Version>1.1.0.1</Version>
1414
<RepositoryUrl>https://github.com/WPFDevelopersOrg/WPFDevelopers</RepositoryUrl>
15-
</PropertyGroup>
16-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
17-
<OutputPath></OutputPath>
15+
<Configurations>Debug;Release;Debug-.NET40;Release-.NET40</Configurations>
1816
</PropertyGroup>
1917
<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
2018
<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />

‎src/WPFDevelopers.Net45x/Themes/Theme.xaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2289,11 +2289,11 @@
22892289
</Border>
22902290
</Grid>
22912291
<ControlTemplate.Triggers>
2292-
<DataTrigger Binding="{Binding DisplayMode, &#xD;&#xA; RelativeSource={RelativeSource FindAncestor, &#xD;&#xA; AncestorType={x:Type Calendar}}}" Value="Year">
2292+
<DataTrigger Binding="{Binding DisplayMode, &#xA; RelativeSource={RelativeSource FindAncestor, &#xA; AncestorType={x:Type Calendar}}}" Value="Year">
22932293
<Setter Property="Visibility" TargetName="PART_MonthView" Value="Collapsed" />
22942294
<Setter Property="Visibility" TargetName="PART_YearView" Value="Visible" />
22952295
</DataTrigger>
2296-
<DataTrigger Binding="{Binding DisplayMode, &#xD;&#xA; RelativeSource={RelativeSource FindAncestor, &#xD;&#xA; AncestorType={x:Type Calendar}}}" Value="Decade">
2296+
<DataTrigger Binding="{Binding DisplayMode, &#xA; RelativeSource={RelativeSource FindAncestor, &#xA; AncestorType={x:Type Calendar}}}" Value="Decade">
22972297
<Setter Property="Visibility" TargetName="PART_MonthView" Value="Collapsed" />
22982298
<Setter Property="Visibility" TargetName="PART_YearView" Value="Visible" />
22992299
</DataTrigger>
@@ -2458,16 +2458,16 @@
24582458
<RowDefinition Height="*" />
24592459
<RowDefinition Height="Auto" />
24602460
</Grid.RowDefinitions>
2461-
<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}}" />
2462-
<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}}}" />
2461+
<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}}" />
2462+
<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}}}" />
24632463
<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.ColumnSpan="2" Grid.Row="1" CanContentScroll="{TemplateBinding CanContentScroll}" />
2464-
<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}}" />
2464+
<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}}" />
24652465
<Grid Grid.Column="1" Grid.Row="2">
24662466
<Grid.ColumnDefinitions>
2467-
<ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, &#xD;&#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
2467+
<ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, &#xA; RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
24682468
<ColumnDefinition Width="*" />
24692469
</Grid.ColumnDefinitions>
2470-
<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}}" />
2470+
<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}}" />
24712471
</Grid>
24722472
</Grid>
24732473
</ControlTemplate>
@@ -2575,8 +2575,8 @@
25752575
<RowDefinition Height="Auto" />
25762576
</SelectiveScrollingGrid.RowDefinitions>
25772577
<DataGridCellsPresenter Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
2578-
<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}}}" />
2579-
<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}}}" />
2578+
<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}}}" />
2579+
<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}}}" />
25802580
</SelectiveScrollingGrid>
25812581
</Border>
25822582
</ControlTemplate>
@@ -2628,7 +2628,7 @@
26282628
<Border x:Name="rowHeaderBorder" Background="{TemplateBinding Background}">
26292629
<StackPanel Orientation="Horizontal">
26302630
<ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.FontWeight="{TemplateBinding FontWeight}" />
2631-
<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}}}" />
2631+
<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}}}" />
26322632
</StackPanel>
26332633
</Border>
26342634
<Thumb x:Name="PART_TopHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Top" />
@@ -3308,7 +3308,7 @@
33083308
</Grid.RowDefinitions>
33093309
<DockPanel Margin="{TemplateBinding Padding}">
33103310
<ScrollViewer DockPanel.Dock="Top" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" Focusable="False">
3311-
<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}" />
3311+
<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}" />
33123312
</ScrollViewer>
33133313
<ScrollContentPresenter Name="PART_ScrollContentPresenter" KeyboardNavigation.DirectionalNavigation="Local" CanContentScroll="True" CanHorizontallyScroll="False" CanVerticallyScroll="False" />
33143314
</DockPanel>
@@ -3376,7 +3376,7 @@
33763376
<Setter.Value>
33773377
<ControlTemplate TargetType="{x:Type ListView}">
33783378
<Border Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{DynamicResource BaseSolidColorBrush}">
3379-
<ScrollViewer Style="{DynamicResource&#xD;&#xA; {x:Static GridView.GridViewScrollViewerStyleKey}}">
3379+
<ScrollViewer Style="{DynamicResource&#xA; {x:Static GridView.GridViewScrollViewerStyleKey}}">
33803380
<ItemsPresenter />
33813381
</ScrollViewer>
33823382
</Border>
@@ -4442,7 +4442,7 @@
44424442
</Path.Data>
44434443
</Path>
44444444
</Canvas>
4445-
<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" />
4445+
<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" />
44464446
</controls:SmallPanel>
44474447
</ControlTemplate>
44484448
</Setter.Value>
@@ -4545,7 +4545,7 @@
45454545
<RotateTransform Angle="90" />
45464546
</TransformGroup>
45474547
</Border.RenderTransform>
4548-
<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" />
4548+
<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" />
45494549
</Border>
45504550
</controls:SmallPanel>
45514551
</Viewbox>

‎src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<RootNamespace>WPFDevelopers</RootNamespace>
55
<TargetFrameworks>net45;net46;net47;net48;net5.0-windows;net6.0-windows;netcoreapp3.0</TargetFrameworks>
66
<UseWPF>true</UseWPF>
7-
<UseWindowsForms>true</UseWindowsForms>
87
<PackageId>WPFDevelopers</PackageId>
98
<IncludeSymbols>true</IncludeSymbols>
109
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -13,9 +12,8 @@
1312
<FileVersion>1.1.0.1</FileVersion>
1413
<Version>1.1.0.1</Version>
1514
<RepositoryUrl>https://github.com/WPFDevelopersOrg/WPFDevelopers</RepositoryUrl>
16-
</PropertyGroup>
17-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
18-
<OutputPath></OutputPath>
15+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
16+
<Configurations>Debug;Release;Debug-.NET40;Release-.NET40</Configurations>
1917
</PropertyGroup>
2018
<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
2119
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">

‎src/WPFDevelopers.Samples/App.config‎ renamed to ‎src/WPFDevelopers.Samples.Shared/App.config‎

File renamed without changes.

‎src/WPFDevelopers.Samples/App.xaml‎ renamed to ‎src/WPFDevelopers.Samples.Shared/App.xaml‎

File renamed without changes.

‎src/WPFDevelopers.Samples/App.xaml.cs‎ renamed to ‎src/WPFDevelopers.Samples.Shared/App.xaml.cs‎

File renamed without changes.

‎src/WPFDevelopers.Samples/Controls/CodeViewer/CodeViewer.cs‎ renamed to ‎src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/CodeViewer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.IO;
77
using System.Windows;
88
using System.Windows.Controls;
9-
using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox;
9+
using WPFDevelopers.Helpers;
1010

1111
namespace WPFDevelopers.Samples.Controls
1212
{

‎src/WPFDevelopers.Samples/Controls/CodeViewer/CodeViewer.xaml‎ renamed to ‎src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/CodeViewer.xaml‎

File renamed without changes.

‎src/WPFDevelopers.Samples/Controls/CodeViewer/SourceCodeModel.cs‎ renamed to ‎src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/SourceCodeModel.cs‎

File renamed without changes.

‎src/WPFDevelopers.Samples/Converts/StateConvert.cs‎ renamed to ‎src/WPFDevelopers.Samples.Shared/Converts/StateConvert.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)