Skip to content

Commit a4086b1

Browse files
authored
Merge pull request #710 from ButchersBoy/csharp70
test csharp 7
2 parents e652e27 + 3114b8c commit a4086b1

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

MaterialDesignThemes.Wpf/Converters/MathMultipleConverter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ public object Convert(object[] value, Type targetType, object parameter, Culture
1717
{
1818
if (value == null || value.Length < 2 || value[0] == null || value[1] == null) return Binding.DoNothing;
1919

20-
double value1, value2;
21-
if (!double.TryParse(value[0].ToString(), out value1) || !double.TryParse(value[1].ToString(), out value2))
20+
if (!double.TryParse(value[0].ToString(), out double value1) || !double.TryParse(value[1].ToString(), out double value2))
2221
return 0;
2322

2423
switch (Operation)

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ Comprehensive and easy to use Material Design theme and control library for the
3333

3434
# ![Alt text](web/images/MD4XAML28.png "In Action") See It Action
3535

36-
* Download the source and run the demo (compiling source requires VS2015+).
36+
* Download the source and run the demo (compiling source requires VS2017+).
37+
* Download a pre-compiled demo from the [releases](https://github.com/ButchersBoy/MaterialDesignInXamlToolkit/releases) page.
3738
* Checkout [doobry](http://materialdesigninxaml.net/doobry).
3839
* Checkout [F1ix](http://materialdesigninxaml.net/f1ix).
3940
* Checkout [Motion List](https://github.com/MaterialDesignInXAML/MotionList).
4041

4142
# ![Alt text](web/images/MD4XAML28.png "How Can I Use The Themes?") Source Code
42-
To load the source project you will need Visual Studio 2015. Don't worry if you have an earlier version, you can still use the compiled assemblies from NuGet (``` Install-Package MaterialDesignThemes ```). There are two demo projects in the solution, restore the NuGet packages and fire them both up. One is a "pure" Material Design project, the other illustrates how to combine with Dragablz & MahApps.
43+
To load the source project you will need Visual Studio 2017. Don't worry if you have an earlier version, you can still use the compiled assemblies from NuGet (``` Install-Package MaterialDesignThemes ```). There are two demo projects in the solution, restore the NuGet packages and fire them both up. One is a "pure" Material Design project, the other illustrates how to combine with Dragablz & MahApps.
4344

4445
# ![Alt text](web/images/MD4XAML28.png "Contributions") Contribution Guidelines
4546

appveyor.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
only:
55
- master
66

7-
os: Visual Studio 2015
7+
os: Visual Studio 2017
88
configuration: AppVeyor
99
assembly_info:
1010
patch: true
@@ -14,8 +14,6 @@
1414
assembly_informational_version: '2.3.0.{build}'
1515
environment:
1616
RestorePackages: false
17-
install:
18-
- set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
1917
before_build:
2018
- ps: .paket\paket.exe install
2119
build:
@@ -39,7 +37,7 @@
3937
only:
4038
- release
4139

42-
os: Visual Studio 2015
40+
os: Visual Studio 2017
4341
configuration: AppVeyor
4442
assembly_info:
4543
patch: true
@@ -49,8 +47,6 @@
4947
assembly_informational_version: '{version}'
5048
environment:
5149
RestorePackages: false
52-
install:
53-
- set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
5450
before_build:
5551
- ps: .paket\paket.exe install
5652
build:

0 commit comments

Comments
 (0)