chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: support for .net 7.0.

Browse Source
This commit is contained in:
NaBian committed 2022-11-12 13:41:06 +08:00
1 parent c07ad3f801
commit 8df42f1477
19 files changed
+83 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<OutputType>WinExe</OutputType>
<AssemblyName>HandyControlDemo</AssemblyName>
<RootNamespace>HandyControlDemo</RootNamespace>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows</TargetFrameworks>
<ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
<NoWarn>0108;MSB3026;MSB3061</NoWarn>
<MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<AssemblyName>HandyControl</AssemblyName>
<RootNamespace>HandyControl</RootNamespace>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows</TargetFrameworks>
<Description>Contains some simple and commonly used WPF controls</Description>
<PackageId>HandyControl</PackageId>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<UseWPF>true</UseWPF>
<AssemblyName>HandyControlDemoCode</AssemblyName>
<RootNamespace>HandyControlDemoCode</RootNamespace>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows</TargetFrameworks>
<NoWarn>MSB3026;MSB3061</NoWarn>
<MSBuildWarningsAsMessages>NETSDK1138</MSBuildWarningsAsMessages>
</PropertyGroup>
src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
+16 -14
View File
@@ -11,35 +11,37 @@ internal class VersionHelper
#if NET40
var netVersion = "NET 40";
#elif NET45
var netVersion = "NET 45";
var netVersion = "NET 45";
#elif NET451
var netVersion = "NET 451";
var netVersion = "NET 451";
#elif NET452
var netVersion = "NET 452";
var netVersion = "NET 452";
#elif NET46
var netVersion = "NET 46";
var netVersion = "NET 46";
#elif NET461
var netVersion = "NET 461";
var netVersion = "NET 461";
#elif NET462
var netVersion = "NET 462";
var netVersion = "NET 462";
#elif NET47
var netVersion = "NET 47";
var netVersion = "NET 47";
#elif NET471
var netVersion = "NET 471";
var netVersion = "NET 471";
#elif NET472
var netVersion = "NET 472";
var netVersion = "NET 472";
#elif NET48
var netVersion = "NET 48";
var netVersion = "NET 48";
#elif NET481
var netVersion = "NET 481";
var netVersion = "NET 481";
#elif NET5_0
var netVersion = "NET 50";
var netVersion = "NET 50";
#elif NET6_0
var netVersion = "NET 60";
var netVersion = "NET 60";
#elif NET7_0
var netVersion = "NET 70";
#elif NETCOREAPP3_0
var netVersion = "CORE 30";
#elif NETCOREAPP3_1
var netVersion = "CORE 31";
var netVersion = "CORE 31";
#endif
return $"v {versionInfo.FileVersion} {netVersion}";
}
src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml
+2 -2
View File
@@ -15,9 +15,9 @@
<hc:SimplePanel>
<hc:Watermark Mark="{Binding ContentTitle}" MarkMargin="3,0" FontSize="20" FontWeight="Bold" MarkBrush="#0F000000"/>
<TextBlock Style="{StaticResource TextBlockDefault}" Foreground="White" Text="{Binding ContentTitle}"/>
<ToggleButton Margin="0,0,6,0" IsChecked="{Binding IsCodeOpening}" Padding="5" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ToggleButtonIconTransparent}" HorizontalAlignment="Right" hc:IconElement.Geometry="{StaticResource CodeGeometry}"/>
<ToggleButton Margin="0,0,6,0" IsChecked="{Binding IsCodeOpened}" Padding="5" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ToggleButtonIconTransparent}" HorizontalAlignment="Right" hc:IconElement.Geometry="{StaticResource CodeGeometry}"/>
<Button Command="{Binding OpenDocCmd}" Height="26" Width="30" Margin="6,0,0,0" Padding="5" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" HorizontalAlignment="Left" hc:IconElement.Geometry="{StaticResource DocumentGeometry}"/>
<hc:Drawer Name="DrawerCode" Opened="DrawerCode_OnOpened" IsOpen="{Binding IsCodeOpening}">
<hc:Drawer Name="DrawerCode" Opened="DrawerCode_OnOpened" IsOpen="{Binding IsCodeOpened}">
<Border Style="{StaticResource BorderClip}" Margin="32,32,0,32" CornerRadius="10,0,0,10" Background="{DynamicResource RegionBrush}" Width="800" Name="BorderCode"/>
</hc:Drawer>
</hc:SimplePanel>