Commit 2c6f1a6b authored by Rabbit's avatar Rabbit
Browse files

更新.NET9

parent deac0540

CountDownList/App.xaml

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

             xmlns:local="clr-namespace:CountDownList"

             StartupUri="MainWindow.xaml">

             StartupUri="MainWindow.xaml"

             xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:local1="clr-namespace:CountDownList.Class">

    <Application.Resources>

        <ResourceDictionary>

            <ResourceDictionary.MergedDictionaries>

CountDownList/Class/ScrollViewer.cs

+7 −2
Original line number Diff line number Diff line
@@ -29,14 +29,19 @@ namespace CountDownList 
        {

            double WheelChange = e.Delta;

            //可以更改一次滚动的距离倍数 (WheelChange可能为正负数!)

            double newOffset = LastLocation - (WheelChange);

            double newOffset = LastLocation - (WheelChange * 0.75);

            //Animation并不会改变真正的VerticalOffset(只是它的依赖属性) 所以将VOffset设置到上一次的滚动位置 (相当于衔接上一个动画)

            ScrollToVerticalOffset(LastLocation * 0.75);

            ScrollToVerticalOffset(LastLocation);

            //碰到底部和顶部时的处理

            if (newOffset < 0)

            {

                newOffset = 0;

            }



            if (newOffset > ScrollableHeight)

            {

                newOffset = ScrollableHeight;

            }



            AnimateScroll(newOffset);

            LastLocation = newOffset;

CountDownList/CountDownList.csproj

+5 −18
Original line number Diff line number Diff line 
<Project Sdk="Microsoft.NET.Sdk">



  <Import Condition=" '$(EAZFUSCATOR_NET_HOME)' != '' and Exists('$(EAZFUSCATOR_NET_HOME)\Integration\MSBuild\Eazfuscator.NET.targets') " Project="$(EAZFUSCATOR_NET_HOME)\Integration\MSBuild\Eazfuscator.NET.targets" />



  <PropertyGroup>

    <OutputType>WinExe</OutputType>

    <TargetFramework>net8.0-windows7.0</TargetFramework>

    <TargetFramework>net9.0-windows</TargetFramework>

    <Nullable>enable</Nullable>

    <ImplicitUsings>enable</ImplicitUsings>

    <UseWPF>true</UseWPF>
@@ -12,7 +10,6 @@ 
    <ApplicationIcon>CountDownList.ico</ApplicationIcon>

    <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>

  </PropertyGroup>



  <PropertyGroup>

    <!-- Eazfuscator.NET is integrated with this project at MSBuild level: https://help.gapotchenko.com/eazfuscator.net/kb/100036 -->

    <EazfuscatorIntegration>MSBuild</EazfuscatorIntegration>
@@ -21,17 +18,14 @@ 
    <SignAssembly>True</SignAssembly>

    <AssemblyOriginatorKeyFile>C:\Users\haora\source\repos\CountDownList\CountDownList.snk</AssemblyOriginatorKeyFile>

  </PropertyGroup>



  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

    <Deterministic>False</Deterministic>

    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>

  </PropertyGroup>



  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

    <Deterministic>False</Deterministic>

    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>

  </PropertyGroup>



  <ItemGroup>

    <None Remove="Data\CountDownList.xml" />

    <None Remove="Data\Image\1.jpg" />
@@ -60,7 +54,6 @@ 
    <None Remove="UI\shRabbitLight%404x.png" />

    <None Remove="UI\test.png" />

  </ItemGroup>



  <ItemGroup>

    <Content Include="CountDownList.ico" />

    <Content Include="Data\CountDownList.xml">
@@ -124,16 +117,13 @@ 
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

    </Content>

  </ItemGroup>



  <ItemGroup>

    <PackageReference Include="HandyControl" Version="3.5.1" />

    <PackageReference Include="NAudio" Version="2.2.1" />

  </ItemGroup>



  <ItemGroup>

    <Folder Include="Data\Sounds\UI\" />

  </ItemGroup>



  <ItemGroup>

    <Resource Include="UI\CountDownListLogo.png" />

    <Resource Include="UI\Logos\HandyControl.png" />
@@ -145,7 +135,6 @@ 
    </Content>

    <Resource Include="UI\[email protected]" />

  </ItemGroup>



  <ItemGroup>

    <Compile Update="MiscSetting.Designer.cs">

      <DesignTimeSharedInput>True</DesignTimeSharedInput>
@@ -153,12 +142,10 @@ 
      <DependentUpon>MiscSetting.settings</DependentUpon>

    </Compile>

  </ItemGroup>



  <ItemGroup>

    <None Update="MiscSetting.settings">

      <Generator>PublicSettingsSingleFileGenerator</Generator>

      <LastGenOutput>MiscSetting.Designer.cs</LastGenOutput>

    </None>

  </ItemGroup>



</Project>
 
 No newline at end of file

CountDownList/CountDownList.sln

0 → 100644
+25 −0
Original line number Diff line number Diff line 


Microsoft Visual Studio Solution File, Format Version 12.00

# Visual Studio Version 17

VisualStudioVersion = 17.5.002.0

MinimumVisualStudioVersion = 10.0.40219.1

Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CountDownList", "CountDownList.csproj", "{AECD886E-C63E-4D0D-9C6D-C9AAE74F9FC3}"

EndProject

Global

	GlobalSection(SolutionConfigurationPlatforms) = preSolution

		Debug|Any CPU = Debug|Any CPU

		Release|Any CPU = Release|Any CPU

	EndGlobalSection

	GlobalSection(ProjectConfigurationPlatforms) = postSolution

		{AECD886E-C63E-4D0D-9C6D-C9AAE74F9FC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

		{AECD886E-C63E-4D0D-9C6D-C9AAE74F9FC3}.Debug|Any CPU.Build.0 = Debug|Any CPU

		{AECD886E-C63E-4D0D-9C6D-C9AAE74F9FC3}.Release|Any CPU.ActiveCfg = Release|Any CPU

		{AECD886E-C63E-4D0D-9C6D-C9AAE74F9FC3}.Release|Any CPU.Build.0 = Release|Any CPU

	EndGlobalSection

	GlobalSection(SolutionProperties) = preSolution

		HideSolutionNode = FALSE

	EndGlobalSection

	GlobalSection(ExtensibilityGlobals) = postSolution

		SolutionGuid = {372E01CB-06A0-4F13-8291-0BD0F023025B}

	EndGlobalSection

EndGlobal

CountDownList/UI/WindowFrame/TextViewer.xaml

+4 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
            <RowDefinition Height="48"/>

        </Grid.RowDefinitions>



        <local:MyScrollViewer Style="{DynamicResource ScrollViewerBaseStyle}" HorizontalScrollBarVisibility="Visible">

        <local:MyScrollViewer x:Name="scroll" Style="{DynamicResource ScrollViewerBaseStyle}" HorizontalScrollBarVisibility="Visible" SizeChanged="scroll_SizeChanged">

            <TextBox x:Name="textBox" Background="Transparent" Padding="0,0,0,0" BorderThickness="0,0,0,0" Margin="4,28,4,4" VerticalContentAlignment="Top" FontSize="{Binding Value, ElementName=numericUpDown}" IsReadOnly="True"></TextBox>

        </local:MyScrollViewer>

        <Button HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0" Grid.Row="1" Click="Button_Click">退出</Button>
@@ -39,6 +39,9 @@ 
                <MenuItem Header="复制" Click="MenuItem_Click"></MenuItem>

                <MenuItem x:Name="menuItem" Header="只读模式" IsCheckable="True" IsChecked="True" Click="menuItem_Click_5"></MenuItem>

            </MenuItem>

            <MenuItem Header="查看">

                <MenuItem x:Name="menuItem1" Header="自动换行" IsCheckable="True" Checked="menuItem1_Checked"/>

            </MenuItem>

        </Menu>

    </Grid>

</Window>