Skip to content

L
livecharts
Commit 93fa5687 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

修改 Feng.Column2Algorithm 当 YAxisCrossing 不在显示范围内， startAt=0d

parent f1b669ed
Hide whitespace changes
Inline Side-by-side
Showing with 238 additions and 48 deletions
Examples/Wpf/CartesianChart/PointState/PointStateExample.xaml
View file @ 93fa5687
...@@ -7,6 +7,11 @@ ...@@ -7,6 +7,11 @@
xmlns:pointState="clr-namespace:Wpf.CartesianChart.PointState" xmlns:pointState="clr-namespace:Wpf.CartesianChart.PointState"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{d:DesignInstance pointState:PointStateExample}"> d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{d:DesignInstance pointState:PointStateExample}">
<UserControl.Resources>
<Geometry x:Key="Geometry_close-circle">
M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z
</Geometry>
</UserControl.Resources>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition>
...@@ -17,7 +22,7 @@ ...@@ -17,7 +22,7 @@
<lvc:CartesianChart.Series> <lvc:CartesianChart.Series>
<lvc:LineSeries Values="{Binding Values}" <lvc:LineSeries Values="{Binding Values}"
PointGeometrySize="20" PointGeometrySize="20"
PointForeground="White" PointGeometry="{StaticResource Geometry_close-circle}"
Configuration="{Binding Mapper}"/> Configuration="{Binding Mapper}"/>
</lvc:CartesianChart.Series> </lvc:CartesianChart.Series>
</lvc:CartesianChart> </lvc:CartesianChart>
......
Feng/Core40/SeriesAlgorithms/Column2Algorithm.cs
View file @ 93fa5687
...@@ -79,18 +79,18 @@ namespace LiveCharts.SeriesAlgorithms ...@@ -79,18 +79,18 @@ namespace LiveCharts.SeriesAlgorithms
var startAt = 0d; var startAt = 0d;
if ((columnSeries.YAxisCrossing <= CurrentYAxis.LastSeparator && if ((columnSeries.YAxisCrossing <= CurrentYAxis.TopLimit&&
columnSeries.YAxisCrossing >= CurrentYAxis.FirstSeparator)) columnSeries.YAxisCrossing >= CurrentYAxis.BotLimit))
{ {
startAt = columnSeries.YAxisCrossing; startAt = columnSeries.YAxisCrossing;
} }
else else
{ {
startAt = CurrentYAxis.FirstSeparator >= 0 && CurrentYAxis.LastSeparator > 0 //both positive //startAt = CurrentYAxis.FirstSeparator >= 0 && CurrentYAxis.LastSeparator > 0 //both positive
? CurrentYAxis.FirstSeparator //then use axisYMin // ? CurrentYAxis.FirstSeparator //then use axisYMin
: (CurrentYAxis.FirstSeparator < 0 && CurrentYAxis.LastSeparator <= 0 //both negative // : (CurrentYAxis.FirstSeparator < 0 && CurrentYAxis.LastSeparator <= 0 //both negative
? CurrentYAxis.LastSeparator //then use axisYMax // ? CurrentYAxis.LastSeparator //then use axisYMax
: 0); //if mixed then use 0 // : 0); //if mixed then use 0
} }
var zero = ChartFunctions.ToDrawMargin(startAt, AxisOrientation.Y, Chart, View.ScalesYAt); var zero = ChartFunctions.ToDrawMargin(startAt, AxisOrientation.Y, Chart, View.ScalesYAt);
......
LiveCharts.sln
View file @ 93fa5687
...@@ -243,22 +243,22 @@ Global ...@@ -243,22 +243,22 @@ Global
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.Debug|x64.Build.0 = Debug|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.Debug|x64.Build.0 = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.Debug|x86.ActiveCfg = Debug|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.Debug|x86.ActiveCfg = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.Debug|x86.Build.0 = Debug|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.Debug|x86.Build.0 = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|Any CPU.ActiveCfg = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|Any CPU.ActiveCfg = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|Any CPU.Build.0 = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|Any CPU.Build.0 = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|ARM.ActiveCfg = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|ARM.ActiveCfg = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|ARM.Build.0 = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|ARM.Build.0 = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|x64.ActiveCfg = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|x64.ActiveCfg = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|x64.Build.0 = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|x64.Build.0 = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|x86.ActiveCfg = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|x86.ActiveCfg = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|x86.Build.0 = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net40|x86.Build.0 = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|Any CPU.ActiveCfg = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|Any CPU.ActiveCfg = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|Any CPU.Build.0 = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|Any CPU.Build.0 = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|ARM.ActiveCfg = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|ARM.ActiveCfg = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|ARM.Build.0 = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|ARM.Build.0 = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|x64.ActiveCfg = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|x64.ActiveCfg = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|x64.Build.0 = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|x64.Build.0 = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|x86.ActiveCfg = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|x86.ActiveCfg = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|x86.Build.0 = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.net45|x86.Build.0 = Debug|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.Release|Any CPU.ActiveCfg = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.Release|Any CPU.Build.0 = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.Release|Any CPU.Build.0 = Release|Any CPU
{91603977-41B4-4EE2-9ABD-14411D61CDD4}.Release|ARM.ActiveCfg = Release|Any CPU {91603977-41B4-4EE2-9ABD-14411D61CDD4}.Release|ARM.ActiveCfg = Release|Any CPU
...@@ -277,7 +277,6 @@ Global ...@@ -277,7 +277,6 @@ Global
{95B28C86-57CB-4DD4-BA3C-6E1B56B99EDC} = {01F3C0BD-11E0-41AB-BD34-A173A617B664} {95B28C86-57CB-4DD4-BA3C-6E1B56B99EDC} = {01F3C0BD-11E0-41AB-BD34-A173A617B664}
{66C1C95A-60EB-431A-B288-34CA6CC78D30} = {B27B6DF6-9FC3-4EC9-A45F-CF1A9615F0E6} {66C1C95A-60EB-431A-B288-34CA6CC78D30} = {B27B6DF6-9FC3-4EC9-A45F-CF1A9615F0E6}
{B27B6DF6-9FC3-4EC9-A45F-CF1A9615F0E6} = {01F3C0BD-11E0-41AB-BD34-A173A617B664} {B27B6DF6-9FC3-4EC9-A45F-CF1A9615F0E6} = {01F3C0BD-11E0-41AB-BD34-A173A617B664}
{91603977-41B4-4EE2-9ABD-14411D61CDD4} = {01F3C0BD-11E0-41AB-BD34-A173A617B664}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7345927A-33C3-4927-AD7A-FD7E655B0405} SolutionGuid = {7345927A-33C3-4927-AD7A-FD7E655B0405}
......
WpfApp1/App.xaml
View file @ 93fa5687
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:WpfApp1" xmlns:local="clr-namespace:WpfApp1"
StartupUri="Column2Example.xaml"> StartupUri="WdSectionsCollectionTest.xaml">
<Application.Resources> <Application.Resources>
</Application.Resources> </Application.Resources>
......
WpfApp1/FodyWeavers.xsd
View file @ 93fa5687
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild. --> <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
<xs:element name="Weavers"> <xs:element name="Weavers">
<xs:complexType> <xs:complexType>
<xs:all> <xs:all>
...@@ -11,6 +11,16 @@ ...@@ -11,6 +11,16 @@
<xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation> <xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="TriggerDependentProperties" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if the Dependent properties feature is enabled.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="EnableIsChangedProperty" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if the IsChanged property feature is enabled.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="EventInvokerNames" type="xs:string"> <xs:attribute name="EventInvokerNames" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation> <xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation>
...@@ -31,17 +41,32 @@ ...@@ -31,17 +41,32 @@
<xs:documentation>Used to control if equality checks should use the static Equals method resolved from the base class.</xs:documentation> <xs:documentation>Used to control if equality checks should use the static Equals method resolved from the base class.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="SuppressWarnings" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to turn off build warnings from this weaver.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="SuppressOnPropertyNameChangedWarning" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to turn off build warnings about mismatched On_PropertyName_Changed methods.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
</xs:all> </xs:all>
<xs:attribute name="VerifyAssembly" type="xs:boolean"> <xs:attribute name="VerifyAssembly" type="xs:boolean">
<xs:annotation> <xs:annotation>
<xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation> <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="VerifyIgnoreCodes" type="xs:string"> <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation> <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="GenerateXsd" type="xs:boolean">
<xs:annotation>
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
</xs:complexType> </xs:complexType>
......
WpfApp1/WdSectionsCollectionTest.xaml 0 → 100644
View file @ 93fa5687
<Window x:Class="WpfApp1.WdSectionsCollectionTest"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WpfApp1" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
mc:Ignorable="d"
Title="SectionsCollectionTest" Height="450" Width="800">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<Button Content="刷新 SectionsCollection" Margin="5" Command="{Binding UpdateCmd}"/>
</StackPanel>
<TabControl Grid.Row="1" Margin="5">
<TabItem Header="01">
<lvc:CartesianChart DisableAnimations="True" Margin="5" Hoverable="False" DataTooltip="{x:Null}" >
<lvc:CartesianChart.Series>
<lvc:LineSeries Values="{Binding ThicknessValues}"
Configuration="{Binding MapperTv}" />
</lvc:CartesianChart.Series>
<lvc:CartesianChart.AxisX>
<lvc:Axis x:Name="thickChart_xAxis" LabelFormatter="{Binding DateTimeFormatter}"
Foreground="DarkSlateBlue"
/>
</lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY>
<lvc:Axis LabelFormatter="{Binding YFormatter}"
Foreground="DarkSlateBlue"
/>
</lvc:CartesianChart.AxisY>
</lvc:CartesianChart>
</TabItem>
<TabItem Header="02"/>
</TabControl>
</Grid>
</Window>
WpfApp1/WdSectionsCollectionTest.xaml.cs 0 → 100644
View file @ 93fa5687
using GalaSoft.MvvmLight.Command;
using LiveCharts;
using LiveCharts.Configurations;
using LiveCharts.Wpf;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace WpfApp1
{
/// <summary>
/// SectionsCollectionTest.xaml 的交互逻辑
/// </summary>
public partial class WdSectionsCollectionTest : Window
{
WdSectionsCollectionTestVm viewModel;
public WdSectionsCollectionTest()
{
InitializeComponent();
viewModel = new WdSectionsCollectionTestVm();
this.DataContext = viewModel;
viewModel.LimitSections = thickChart_xAxis.Sections;
}
}
public class WdSectionsCollectionTestVm : INotifyPropertyChanged
{
public event PropertyChangedEventHandler PropertyChanged;
/// <summary>
/// 画在图上的 厚度曲线，限制最多100个数据
/// </summary>
public ChartValues<TimeValue> ThicknessValues { get; } = new ChartValues<TimeValue>();
public SectionsCollection LimitSections;// { get; } = new SectionsCollection();
/// <summary>
/// y轴格式
/// </summary>
public Func<double, string> YFormatter { get; set; }
/// <summary>
/// X轴格式
/// </summary>
public Func<double, string> DateTimeFormatter { get; set; }
public CartesianMapper<TimeValue> MapperTv { get; set; }
public RelayCommand UpdateCmd { get; set; }
public WdSectionsCollectionTestVm()
{
#region 界面配置
MapperTv = Mappers.Xy<TimeValue>()
.X(value => value.Time.Ticks)
.Y(value => value.Value);
DateTimeFormatter = value => new DateTime((long)value).ToString("HH:mm:ss");
YFormatter = value => value.ToString("F1");
#endregion
UpdateCmd = new RelayCommand(Update);
}
private void Update()
{
List<TimeValue> thks = new List<TimeValue>();
Random r = new Random();
DateTime dt = DateTime.Now;
for (int i = 0; i < 100; i++) {
thks.Add(new TimeValue() { Time = dt.AddSeconds(i), Value = r.Next(100) });
}
ThicknessValues.Clear();
ThicknessValues.AddRange(thks);
LimitSections.Clear();
int s_cnt = r.Next(3, 5);
double interval = thks.Count() / s_cnt;
for (int i = 0; i < s_cnt ; i++) {
int index = (int)(i * interval);
if (index < 0)
index = 0;
else if (index > thks.Count())
index = thks.Count() - 1;
var axisSection2 = new AxisSection()
{
StrokeThickness = 2,
DataLabel = true,
DisableAnimations = true,
DataLabelForeground = new SolidColorBrush(Colors.White),
Opacity = 1,
Stroke = new SolidColorBrush(Colors.Orange),
Value = thks[index].Time.Ticks
};
LimitSections.Add(axisSection2);
};
}
}
public class TimeValue : INotifyPropertyChanged
{
public DateTime Time { get; set; }
public double Value { get; set; }
public event PropertyChangedEventHandler PropertyChanged;
}
}
WpfApp1/WpfApp1.csproj
View file @ 93fa5687
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\PropertyChanged.Fody.2.6.0\build\PropertyChanged.Fody.props" Condition="Exists('..\packages\PropertyChanged.Fody.2.6.0\build\PropertyChanged.Fody.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -39,9 +38,6 @@ ...@@ -39,9 +38,6 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="PropertyChanged, Version=2.6.0.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
<HintPath>..\packages\PropertyChanged.Fody.2.6.0\lib\net452\PropertyChanged.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
...@@ -68,6 +64,9 @@ ...@@ -68,6 +64,9 @@
<Compile Include="ColumnRangeExample.xaml.cs"> <Compile Include="ColumnRangeExample.xaml.cs">
<DependentUpon>ColumnRangeExample.xaml</DependentUpon> <DependentUpon>ColumnRangeExample.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="WdSectionsCollectionTest.xaml.cs">
<DependentUpon>WdSectionsCollectionTest.xaml</DependentUpon>
</Compile>
<Page Include="Column2Example.xaml"> <Page Include="Column2Example.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
...@@ -88,6 +87,10 @@ ...@@ -88,6 +87,10 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="WdSectionsCollectionTest.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs"> <Compile Include="Properties\AssemblyInfo.cs">
...@@ -107,7 +110,6 @@ ...@@ -107,7 +110,6 @@
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>
...@@ -135,15 +137,15 @@ ...@@ -135,15 +137,15 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Resource Include="FodyWeavers.xml" /> <PackageReference Include="MvvmLight">
<Version>5.4.1.1</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>13.0.1</Version>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody">
<Version>3.4.0</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Fody.3.3.2\build\Fody.targets" Condition="Exists('..\packages\Fody.3.3.2\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Fody.3.3.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.3.2\build\Fody.targets'))" />
<Error Condition="!Exists('..\packages\PropertyChanged.Fody.2.6.0\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PropertyChanged.Fody.2.6.0\build\PropertyChanged.Fody.props'))" />
</Target>
</Project> </Project>
\ No newline at end of file
WpfApp1/packages.config deleted 100644 → 0
View file @ f1b669ed
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Fody" version="3.3.2" targetFramework="net462" developmentDependency="true" />
<package id="PropertyChanged.Fody" version="2.6.0" targetFramework="net462" />
</packages>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment