fixes Live-Charts#212, added a bat file to improve build process, mad…

…e .nuspec files public, everything is already included here to make public builds, just running livecharts.pack.bat file
jrxcf · Jun 20, 2016 · a3c8e91 · a3c8e91
1 parent f9ee692
commit a3c8e91
Show file tree

Hide file tree

Showing 26 changed files with 254 additions and 88 deletions.
diff --git a/.gitignore b/.gitignore
@@ -210,12 +210,12 @@ FakesAssemblies/
 GeneratedArtifacts/
 _Pvt_Extensions/
 ModelManifest.xml
-/LiveChartsCore/LiveChartsCore.nuspec
 /LiveChartsCore/nuget.exe
-/Core/Core.nuspec
-/Core/nuget.exe
-/WpfView/nuget.exe
-/WpfView/WpfView.nuspec
-/Core/nugetPack.bat
-/WinFormsView/nugetPack.bat
-/WpfView/nugetPack.bat
+/Core/Test/LiveCharts.dll
+/WpfView/lib/net403/LiveCharts.dll
+/WpfView/lib/net403/LiveCharts.Wpf.dll
+/WpfView/lib/net45/LiveCharts.dll
+/WpfView/lib/net45/LiveCharts.Wpf.dll
+/WpfView/Test/LiveCharts.dll
+/WpfView/Test/LiveCharts.Wpf.dll
+/Core/Everything seems fine 
diff --git a/Core/Core.nuspec b/Core/Core.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>LiveCharts</id>
+    <version>$version$</version>
+    <title>LiveCharts</title>
+    <authors>Beto Rodriguez</authors>
+    <owners>Beto Rodriguez</owners>
+    <licenseUrl>https://github.com/beto-rodriguez/Live-Charts/blob/master/LICENSE.TXT</licenseUrl>
+    <projectUrl>http://lvcharts.net/</projectUrl>
+    <iconUrl>http://lvcharts.net/Content/Images/Logos/lcred.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>LiveCharts is a modern chartig library: Responsive, animated and MVVM orientated charts, this package is only the core of the library, you must also download the specific version for your platform.</description>
+    <releaseNotes>See https://github.com/beto-rodriguez/Live-Charts/releases</releaseNotes>
+    <copyright>Copyright 2016</copyright>
+    <tags>Chart Charting Plot Plotting</tags>     
+  </metadata>
+  <files>
+    <file src="readme.txt" target="" />
+    <file src="bin\Release\LiveCharts.dll" target="lib\portable40-net40+sl5+win8+wp8+wpa81" />
+  </files>
+</package>
diff --git a/Core/Properties/AssemblyInfo.cs b/Core/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.3")]
-[assembly: AssemblyFileVersion("0.7.3")]
+[assembly: AssemblyVersion("0.7.3.1")]
+[assembly: AssemblyFileVersion("0.7.3.1")]
diff --git a/Examples/WinForms/App.config b/Examples/WinForms/App.config
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0.3"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="LiveCharts" publicKeyToken="c5935629d38af058" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.7.2.2" newVersion="0.7.2.2" />
+        <assemblyIdentity name="LiveCharts" publicKeyToken="c5935629d38af058" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-0.7.2.2" newVersion="0.7.2.2"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="LiveCharts.Wpf" publicKeyToken="3b585c2a5f1a92c1" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.7.2.2" newVersion="0.7.2.2" />
+        <assemblyIdentity name="LiveCharts.Wpf" publicKeyToken="3b585c2a5f1a92c1" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-0.7.2.2" newVersion="0.7.2.2"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
diff --git a/Examples/WinForms/Cartesian/Labels/Labels.cs b/Examples/WinForms/Cartesian/Labels/Labels.cs
@@ -43,12 +43,12 @@ private void Labels_Load(object sender, EventArgs e)
                     "Anibal Brothers",
                     "Anderson Dillman"
                 },
-                Separator = new Separator // force the separator step to 1, so it alwasy display all labels
+                Separator = new Separator // force the separator step to 1, so it always display all labels
                 {
                     Step = 1,
                     IsEnabled = false //disable it to make it invisible.
                 },
-                LabelsRotateTransform = new System.Windows.Media.RotateTransform(13)
+                LabelsRotation = 15
             });
 
             cartesianChart1.AxisY.Add(new Axis

diff --git a/Examples/WinForms/Cartesian/Sections/SectionsExample.cs b/Examples/WinForms/Cartesian/Sections/SectionsExample.cs
@@ -49,7 +49,7 @@ public SectionsExample()
 
             cartesianChart1.AxisY.Add(new Axis
             {
-                Sections = new List<IAxisSectionView>
+                Sections = new SectionsCollection
                 {
                     new AxisSection
                     {

diff --git a/Examples/WinForms/Properties/Settings.Designer.cs b/Examples/WinForms/Properties/Settings.Designer.cs
diff --git a/Examples/WinForms/Winforms.csproj b/Examples/WinForms/Winforms.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Winforms</RootNamespace>
     <AssemblyName>Winforms</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,16 +34,16 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LiveCharts, Version=0.7.2.2, Culture=neutral, PublicKeyToken=c5935629d38af058, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\LiveCharts.0.7.2.2\lib\portable40-net40+sl5+win8+wp8+wpa81\LiveCharts.dll</HintPath>
+    <Reference Include="LiveCharts, Version=0.7.3.1, Culture=neutral, PublicKeyToken=c5935629d38af058, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\LiveCharts.0.7.3.1\lib\portable40-net40+sl5+win8+wp8+wpa81\LiveCharts.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="LiveCharts.WinForms, Version=0.7.2.2, Culture=neutral, PublicKeyToken=1f1e67602fe23622, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\LiveCharts.WinForms.0.7.2.2\lib\net452\LiveCharts.WinForms.dll</HintPath>
+    <Reference Include="LiveCharts.WinForms, Version=0.7.3.1, Culture=neutral, PublicKeyToken=1f1e67602fe23622, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\LiveCharts.WinForms.0.7.3.1\lib\net403\LiveCharts.WinForms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="LiveCharts.Wpf, Version=0.7.2.2, Culture=neutral, PublicKeyToken=3b585c2a5f1a92c1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\LiveCharts.Wpf.0.7.2.2\lib\net452\LiveCharts.Wpf.dll</HintPath>
+    <Reference Include="LiveCharts.Wpf, Version=0.7.3.1, Culture=neutral, PublicKeyToken=3b585c2a5f1a92c1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\LiveCharts.Wpf.0.7.3.1\lib\net403\LiveCharts.Wpf.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />

diff --git a/Examples/WinForms/packages.config b/Examples/WinForms/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LiveCharts" version="0.7.2.2" targetFramework="net452" />
-  <package id="LiveCharts.WinForms" version="0.7.2.2" targetFramework="net452" />
-  <package id="LiveCharts.Wpf" version="0.7.2.2" targetFramework="net452" />
+  <package id="LiveCharts" version="0.7.3.1" targetFramework="net403" />
+  <package id="LiveCharts.WinForms" version="0.7.3.1" targetFramework="net403" />
+  <package id="LiveCharts.Wpf" version="0.7.3.1" targetFramework="net403" />
 </packages>
diff --git a/Examples/Wpf/CartesianChart/Financial/FinancialExample.xaml.cs b/Examples/Wpf/CartesianChart/Financial/FinancialExample.xaml.cs
@@ -84,7 +84,7 @@ private void UpdateAllOnClick(object sender, RoutedEventArgs e)
         public event PropertyChangedEventHandler PropertyChanged;
 
         [NotifyPropertyChangedInvocator]
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged(string propertyName = null)
         {
             if (PropertyChanged != null) PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }

diff --git a/Examples/Wpf/CartesianChart/StackedArea/StackedAreaExample.xaml.cs b/Examples/Wpf/CartesianChart/StackedArea/StackedAreaExample.xaml.cs
@@ -133,7 +133,7 @@ private void ChangeStackModeOnClick(object sender, RoutedEventArgs e)
         public event PropertyChangedEventHandler PropertyChanged;
 
         [NotifyPropertyChangedInvocator]
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged(string propertyName = null)
         {
             if (PropertyChanged != null) PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }

diff --git a/Examples/Wpf/CartesianChart/ZoomingAndPanning/ZoomingAndPanning.xaml.cs b/Examples/Wpf/CartesianChart/ZoomingAndPanning/ZoomingAndPanning.xaml.cs
@@ -101,7 +101,7 @@ private ChartValues<DateTimePoint> GetData()
         public event PropertyChangedEventHandler PropertyChanged;
 
         [NotifyPropertyChangedInvocator]
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged(string propertyName = null)
         {
             if (PropertyChanged != null) PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }

diff --git a/Examples/Wpf/Gauges/Gauge180.xaml.cs b/Examples/Wpf/Gauges/Gauge180.xaml.cs
@@ -40,7 +40,7 @@ private void MoveOnClick(object sender, RoutedEventArgs e)
         public event PropertyChangedEventHandler PropertyChanged;
 
         [NotifyPropertyChangedInvocator]
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged(string propertyName = null)
         {
             if (PropertyChanged != null) PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
         }

diff --git a/Examples/Wpf/Gauges/Gauge360.xaml.cs b/Examples/Wpf/Gauges/Gauge360.xaml.cs
@@ -43,7 +43,7 @@ private void MoveOnClick(object sender, RoutedEventArgs e)
         public event PropertyChangedEventHandler PropertyChanged;
 
         [NotifyPropertyChangedInvocator]
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged(string propertyName = null)
         {
             if (PropertyChanged != null) PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
         }

diff --git a/Examples/Wpf/MainWindow.xaml.cs b/Examples/Wpf/MainWindow.xaml.cs
@@ -117,7 +117,7 @@ public UserControl CartesianView
             set
             {
                 _cartesianView = value;
-                OnPropertyChanged();
+                OnPropertyChanged("CartesianView");
             }
         }
         public UserControl PieView
@@ -126,7 +126,7 @@ public UserControl PieView
             set
             {
                 _pieView = value;
-                OnPropertyChanged();
+                OnPropertyChanged("PieView");
             }
         }
         public UserControl GaugeView
@@ -135,7 +135,7 @@ public UserControl GaugeView
             set
             {
                 _gaugeView = value;
-                OnPropertyChanged();
+                OnPropertyChanged("GaugeView");
             }
         }
 
@@ -193,7 +193,7 @@ private void PreviousGaugeOnClick(object sender, MouseButtonEventArgs e)
 
 
         [NotifyPropertyChangedInvocator]
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged(string propertyName = null)
         {
             if (PropertyChanged != null) PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }

diff --git a/LiveCharts.pack.bat b/LiveCharts.pack.bat
@@ -0,0 +1,113 @@
+echo loading vcvarsall from VsS2015 installation path
+
+echo if you want to pack the code for VS2013 you must change the path to if VS2013, plase use: "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
+
+call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" 
+echo.
+
+echo ----------------------------------- CORE -----------------------------------------
+
+echo.
+echo -- Core DEBUG --
+MsBuild Core/core.csproj /property:Configuration=Debug /property:Platform=AnyCPU /t:Clean,Build /verbosity:minimal
+echo.
+echo -- Core RELEASE --
+MsBuild Core/core.csproj /property:Configuration=Release /property:Platform=AnyCPU /t:Clean,Build /verbosity:minimal
+
+nuget pack Core/core.csproj
+move Core/*.nupkg /
+echo --Core packed--
+
+
+echo ----------------------------------- WPF -----------------------------------------
+
+if not exist "WpfView/bin" mkdir WpfView/bin
+
+echo.
+echo -- WPF DEBUG --
+if not exist "WpfView/bin/Debug" mkdir WpfView/bin/net403
+MsBuild WpfView/wpfview.csproj /property:Configuration=Debug;Platform=AnyCPU;OutputPath=bin/Debug /t:Clean,Build /verbosity:minimal
+
+echo.
+echo -- WPF 403 --
+if not exist "WpfView/bin/net403" mkdir WpfView/bin/net403
+MsBuild WpfView/wpfview.csproj /property:Configuration=net40;Platform=AnyCPU;OutputPath=bin/net403 /t:Clean,Build /verbosity:minimal
+
+echo.
+echo -- WPF 45 --
+if not exist "WpfView/bin/net45" mkdir WpfView/bin/net45
+MsBuild WpfView/wpfview.csproj /property:Configuration=net45;Platform=AnyCPU;OutputPath=bin/net45 /t:Clean,Build /verbosity:minimal
+
+echo.
+echo -- WPF 451 --
+if not exist "WpfView/bin/net451" mkdir WpfView/bin/net451
+MsBuild WpfView/wpfview.csproj /property:Configuration=net451;Platform=AnyCPU;OutputPath=bin/net451 /t:Clean,Build /verbosity:minimal
+
+echo.
+echo -- WPF 452 --
+if not exist "WpfView/bin/net452" mkdir WpfView/bin/net452
+MsBuild WpfView/wpfview.csproj /property:Configuration=net452;Platform=AnyCPU;OutputPath=bin/net452 /t:Clean,Build /verbosity:minimal
+
+echo.
+echo -- WPF 46 --
+if not exist "WpfView/bin/net46" mkdir WpfView/bin/net46
+MsBuild WpfView/wpfview.csproj /property:Configuration=net46;Platform=AnyCPU;OutputPath=bin/net46 /t:Clean,Build /verbosity:minimal
+
+echo.
+echo -- WPF 461 --
+if not exist "WpfView/bin/net461" mkdir WpfView/bin/net461
+MsBuild WpfView/wpfview.csproj /property:Configuration=net461;Platform=AnyCPU;OutputPath=bin/net461 /t:Clean,Build /verbosity:minimal
+
+nuget pack WpfView/WpfView.csproj -IncludeReferencedProjects
+move WpfView/*.nupkg /
+echo --WPF packed--
+
+
+echo ----------------------------------- WinForms -----------------------------------------
+
+if not exist "WinFormsView/bin" mkdir WinFormsView/bin
+
+echo.
+echo -- WinForms DEBUG --
+if not exist "WinFormsView/bin/Debug" mkdir WinFormsView/bin/net403
+MsBuild WinFormsView/winformsview.csproj /property:Configuration=Debug;Platform=AnyCPU;OutputPath=bin/Debug /t:Clean,Build /verbosity:minimal
+
+echo.
+echo -- WinForms 403 --
+if not exist "WinFormsView/bin/net403" mkdir WinFormsView/bin/net403
+MsBuild WinFormsView/winformsview.csproj /property:Configuration=net40;Platform=AnyCPU;OutputPath=bin/net403 /t:Clean,Build /verbosity:minimal
+
+echo.
+echo -- WinForms 45 --
+if not exist "WinFormsView/bin/net45" mkdir WinFormsView/bin/net45
+MsBuild WinFormsView/winformsview.csproj /property:Configuration=net45;Platform=AnyCPU;OutputPath=bin/net45 /t:Clean,Build /verbosity:minimal
+
+echo.
+echo -- WinForms 451 --
+if not exist "WinFormsView/bin/net451" mkdir WinFormsView/bin/net451
+MsBuild WinFormsView/winformsview.csproj /property:Configuration=net451;Platform=AnyCPU;OutputPath=bin/net451 /t:Clean,Build /verbosity:minimal
+
+echo.
+echo -- WinForms 452 --
+if not exist "WinFormsView/bin/net452" mkdir WinFormsView/bin/net452
+MsBuild WinFormsView/winformsview.csproj /property:Configuration=net452;Platform=AnyCPU;OutputPath=bin/net452 /t:Clean,Build /verbosity:minimal
+
+echo.
+echo -- WinForms 46 --
+if not exist "WinFormsView/bin/net46" mkdir WinFormsView/bin/net46
+MsBuild WinFormsView/winformsview.csproj /property:Configuration=net46;Platform=AnyCPU;OutputPath=bin/net46 /t:Clean,Build /verbosity:minimal
+
+echo.
+echo -- WinForms 461 --
+if not exist "WinFormsView/bin/net461" mkdir WinFormsView/bin/net461
+MsBuild WinFormsView/winformsview.csproj /property:Configuration=net461;Platform=AnyCPU;OutputPath=bin/net461 /t:Clean,Build /verbosity:minimal
+
+nuget pack WinFormsView/winformsview.csproj -IncludeReferencedProjects
+move WinForms/*.nupkg /
+echo --WPF packed--
+
+echo.
+echo -- LiveCharts is packed!--
+echo.
+
+pause
diff --git a/WinFormsView/Properties/AssemblyInfo.cs b/WinFormsView/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.3")]
-[assembly: AssemblyFileVersion("0.7.3")]
+[assembly: AssemblyVersion("0.7.3.1")]
+[assembly: AssemblyFileVersion("0.7.3.1")]