Skip to content
This repository has been archived by the owner on Jul 17, 2023. It is now read-only.

Commit

Permalink
Merge pull request #453 from beto-rodriguez/develop
Browse files Browse the repository at this point in the history 
091 release
  • Loading branch information
@beto-rodriguez
beto-rodriguez authored Feb 4, 2017
2 parents 3fdf738 1ad4bcb commit 9e76c02
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 275 deletions.
15 changes: 9 additions & 6 deletions Core/Core.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 17,14 @@
</metadata>
<files>
<file src="readme.txt" target="" />
<file src="bin\Release\LiveCharts.dll" target="lib\portable-net40 sl5 win8 wp8 wpa81" />
<file src="bin\Release\LiveCharts.pdb" target="lib\portable-net40 sl5 win8 wp8 wpa81" />
<file src="bin\Release\LiveCharts.xml" target="lib\portable-net40 sl5 win8 wp8 wpa81" />
<file src="..\Core40\bin\Release\LiveCharts.dll" target="lib\net40" />
<file src="..\Core40\bin\Release\LiveCharts.pdb" target="lib\net40" />
<file src="..\Core40\bin\Release\LiveCharts.xml" target="lib\net40" />
<file src="bin\Release\LiveCharts.dll" target="lib\portable-net45 win8 wp8" />
<file src="bin\Release\LiveCharts.pdb" target="lib\portable-net45 win8 wp8" />
<file src="bin\Release\LiveCharts.xml" target="lib\portable-net45 win8 wp8" />
<file src="..\Core40\bin\Net40\LiveCharts.dll" target="lib\net40" />
<file src="..\Core40\bin\Net40\LiveCharts.pdb" target="lib\net40" />
<file src="..\Core40\bin\Net40\LiveCharts.xml" target="lib\net40" />
<file src="..\Core40\bin\Net45\LiveCharts.dll" target="lib\net45" />
<file src="..\Core40\bin\Net45\LiveCharts.pdb" target="lib\net45" />
<file src="..\Core40\bin\Net45\LiveCharts.xml" target="lib\net45" />
</files>
</package>
4 changes: 2 additions & 2 deletions Core/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 25,8 @@
// 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.9")]
[assembly: AssemblyFileVersion("0.9")]
[assembly: AssemblyVersion("0.9.1")]
[assembly: AssemblyFileVersion("0.9.1")]

[assembly: InternalsVisibleTo("LiveCharts.Wpf")]
[assembly: InternalsVisibleTo("LiveCharts.Uwp")]
Expand Down
4 changes: 2 additions & 2 deletions Core40/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 34,8 @@
// 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.9")]
[assembly: AssemblyFileVersion("0.9")]
[assembly: AssemblyVersion("0.9.1")]
[assembly: AssemblyFileVersion("0.9.1")]

[assembly: InternalsVisibleTo("LiveCharts.Wpf")]
[assembly: InternalsVisibleTo("LiveCharts.Uwp")]
Expand Down
192 changes: 0 additions & 192 deletions LiveCharts.sln
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions UwpView/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 24,6 @@
// 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.9")]
[assembly: AssemblyFileVersion("0.9")]
[assembly: AssemblyVersion("0.9.1")]
[assembly: AssemblyFileVersion("0.9.1")]
[assembly: ComVisible(false)]
4 changes: 2 additions & 2 deletions WinFormsView/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.9")]
[assembly: AssemblyFileVersion("0.9")]
[assembly: AssemblyVersion("0.9.1")]
[assembly: AssemblyFileVersion("0.9.1")]
34 changes: 7 additions & 27 deletions WinFormsView/WinFormsView.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 19,8 @@
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">NET40</DefineConstants>
<DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.5' ">NET45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
Expand All @@ -30,36 32,14 @@
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">NET40</DefineConstants>
<DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.5' ">NET45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<DocumentationFile>bin\Debug\LiveCharts.WinForms.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net40|AnyCPU'">
<OutputPath>bin\net403\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<DocumentationFile>bin\Debug\LiveCharts.WinForms.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net45|AnyCPU'">
<OutputPath>bin\net45\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<DocumentationFile>bin\Debug\LiveCharts.WinForms.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
Expand Down Expand Up @@ -100,9 80,9 @@
<None Include="sign.pfx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Core\Core.csproj">
<Project>{d447642c-a85f-4ab0-96d9-c66cff91aada}</Project>
<Name>Core</Name>
<ProjectReference Include="..\Core40\Core40.csproj">
<Project>{f261c3d7-6194-4625-9516-044081b06028}</Project>
<Name>Core40</Name>
</ProjectReference>
<ProjectReference Include="..\WpfView\WpfView.csproj">
<Project>{4d253423-ae05-47f6-a59d-9162ec0bb1f2}</Project>
Expand Down
4 changes: 2 additions & 2 deletions WpfView/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 51,8 @@
// 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.9")]
[assembly: AssemblyFileVersion("0.9")]
[assembly: AssemblyVersion("0.9.1")]
[assembly: AssemblyFileVersion("0.9.1")]

[assembly: InternalsVisibleTo("LiveCharts.Geared")]
[assembly: InternalsVisibleTo("LiveCharts.WinForms")]
Expand Down
28 changes: 4 additions & 24 deletions WpfView/WpfView.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 21,8 @@
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">NET40</DefineConstants>
<DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.5' ">NET45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
Expand All @@ -32,36 34,14 @@
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">NET40</DefineConstants>
<DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.5' ">NET45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
<DocumentationFile>bin\Debug\LiveCharts.Wpf.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net40|AnyCPU'">
<OutputPath>bin\net403\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<DocumentationFile>bin\Debug\LiveCharts.Wpf.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net45|AnyCPU'">
<OutputPath>bin\net45\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<DocumentationFile>bin\Debug\LiveCharts.Wpf.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
Expand Down
40 changes: 24 additions & 16 deletions build.cake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 18,15 @@ Task("OutputArguments")
Task("Core")
.Does(() =>
{
var ouputDirectory = "./bin/Release";
Information("Building Core.PCL...");
BuildProject("./Core/Core.csproj", ouputDirectory, buildType, configuration);
BuildProject("./Core/Core.csproj", "./bin/Release", buildType, configuration, "v4.5");
Information("Building Core.Net40...");
BuildProject("./Core40/Core40.csproj", ouputDirectory, buildType, configuration);
BuildProject("./Core40/Core40.csproj", "./bin/Net40", buildType, configuration, "v4.0");
Information("Building Core.Net45...");
BuildProject("./Core40/Core40.csproj", "./bin/Net45", buildType, configuration, "v4.5");
Information("Packing Core...");
NugetPack("./Core/Core.nuspec", "./Core/bin/Release/LiveCharts.dll");
Expand All @@ -38,13 39,13 @@ Task("WPF")
var wpfPath = "./WpfView/wpfview.csproj";
Information("Building Wpf.Debug...");
BuildProject(wpfPath, "./bin/Debug", "Debug", configuration);
BuildProject(wpfPath, "./bin/Debug", "Debug", configuration, "v4.0");
Information("Building Wpf.Net40...");
BuildProject(wpfPath, "./bin/net403", "net40", configuration);
BuildProject(wpfPath, "./bin/net403", "Release", configuration, "v4.0");
Information("Building Wpf.Debug...");
BuildProject(wpfPath, "./bin/net45", "net45", configuration);
BuildProject(wpfPath, "./bin/net45", "Release", configuration, "v4.5");
Information("Packing Wpf...");
NugetPack("./WpfView/WpfView.nuspec", "./WpfView/bin/net403/LiveCharts.Wpf.dll");
Expand All @@ -58,13 59,13 @@ Task("WinForms")
var formsPath = "./WinFormsView/WinFormsView.csproj";
Information("Building WinForms.Debug...");
BuildProject(formsPath, "./bin/Debug", "Debug", configuration);
BuildProject(formsPath, "./bin/Debug", "Debug", configuration, "v4.0");
Information("Building WinForms.Net40...");
BuildProject(formsPath, "./bin/net403", "net40", configuration);
BuildProject(formsPath, "./bin/net403", "Release", configuration, "v4.0");
Information("Building WinForms.Debug...");
BuildProject(formsPath, "./bin/net45", "net45", configuration);
BuildProject(formsPath, "./bin/net45", "Release", configuration, "v4.5");
Information("Packing WinForms...");
NugetPack("./WinFormsView/WinFormsView.nuspec", "./WinFormsView/bin/net403/LiveCharts.WinForms.dll");
Expand Down Expand Up @@ -97,16 98,23 @@ RunTarget (target);
//Helper Methods

//Build a project
public void BuildProject(string path, string outputPath, string configuration, string platform)
public void BuildProject(string path, string outputPath, string configuration,
string platform, string targetVersion = null)
{
Information("Building " path);
try
{
DotNetBuild(path, settings => settings.SetConfiguration(configuration)
.WithProperty("Platform", platform)
.WithTarget("Clean,Build")
.WithProperty("OutputPath", outputPath)
.SetVerbosity(Cake.Core.Diagnostics.Verbosity.Minimal));
DotNetBuild(path, settings =>
{
settings.SetConfiguration(configuration)
.WithProperty("Platform", platform)
.WithTarget("Clean,Build")
.WithProperty("OutputPath", outputPath)
.SetVerbosity(Cake.Core.Diagnostics.Verbosity.Minimal);
if (targetVersion != null)
settings.WithProperty("TargetFrameworkVersion", targetVersion);
});
}
catch(Exception ex)
{
Expand Down

0 comments on commit 9e76c02

Please sign in to comment.