From bb79a4dcb3e57bdc36ab992f678bd58f689e1117 Mon Sep 17 00:00:00 2001 From: Johan Larsson Date: Tue, 14 Jun 2016 16:42:02 +0200 Subject: [PATCH] Update remaining packages. --- .../Conversions/ConversionTests.cs | 2 +- .../Descriptors/UnitPartsConverterTests.cs | 8 +-- .../Gu.Units.Generator.Tests.csproj | 19 +++++-- .../Helpers/FactorConversionComparer.cs | 2 +- .../Helpers/FieldComparer.cs | 4 +- .../Helpers/PrefixComparer.cs | 2 +- .../Helpers/PrefixConversionComparer.cs | 2 +- .../Helpers/PrefixConversionVmComparer.cs | 2 +- .../Helpers/UnitComparer.cs | 2 +- Gu.Units.Generator.Tests/MockSettings.cs | 38 ++++++------- Gu.Units.Generator.Tests/paket.references | 6 +- .../Conversions/CustomConversion.cs | 4 +- Gu.Units.Generator/Gu.Units.Generator.csproj | 23 +++++++- Gu.Units.Generator/paket.references | 6 +- .../BenchMarks/FormattingBenchmarks.cs | 2 +- Gu.Units.Tests/Sources/ParseProvider.cs | 50 ++++++++-------- paket.dependencies | 6 +- paket.lock | 57 ++++++++++--------- 18 files changed, 132 insertions(+), 103 deletions(-) diff --git a/Gu.Units.Generator.Tests/Descriptors/Conversions/ConversionTests.cs b/Gu.Units.Generator.Tests/Descriptors/Conversions/ConversionTests.cs index 3f136b5a..a68fcabe 100644 --- a/Gu.Units.Generator.Tests/Descriptors/Conversions/ConversionTests.cs +++ b/Gu.Units.Generator.Tests/Descriptors/Conversions/ConversionTests.cs @@ -113,7 +113,7 @@ public void CentimetresPerMinute() var centi = new Prefix("Centi", "c", -2); settings.Prefixes.Add(centi); var centimetresConversion = PrefixConversion.Create(settings.Metres, centi); - var minuteConversion = new Generator.FactorConversion("Minute", "min", 60); + var minuteConversion = new FactorConversion("Minute", "min", 60); settings.Seconds.FactorConversions.Add(minuteConversion); settings.Metres.PrefixConversions.Add(centimetresConversion); var centiMetresPart = PartConversion.CreatePart(1, centimetresConversion); diff --git a/Gu.Units.Generator.Tests/Descriptors/UnitPartsConverterTests.cs b/Gu.Units.Generator.Tests/Descriptors/UnitPartsConverterTests.cs index a039aa8e..cf536ffb 100644 --- a/Gu.Units.Generator.Tests/Descriptors/UnitPartsConverterTests.cs +++ b/Gu.Units.Generator.Tests/Descriptors/UnitPartsConverterTests.cs @@ -71,16 +71,16 @@ public Data(string value, string formatted, params UnitAndPower[] parts) this.Parts = parts; } - public string Value { get; private set; } + public string Value { get; } - public string Formatted { get; private set; } + public string Formatted { get; } - public IEnumerable Parts { get; private set; } + public IEnumerable Parts { get; } public override string ToString() { var units = string.Join(", ", this.Parts.Select(x => $"{x.Unit.Symbol}^{x.Power}")); - return $"{Value} Formatted: {Formatted} Units: {{{units}}}"; + return $"{this.Value} Formatted: {this.Formatted} Units: {{{units}}}"; } } } diff --git a/Gu.Units.Generator.Tests/Gu.Units.Generator.Tests.csproj b/Gu.Units.Generator.Tests/Gu.Units.Generator.Tests.csproj index 44ef9705..5928b6dd 100644 --- a/Gu.Units.Generator.Tests/Gu.Units.Generator.Tests.csproj +++ b/Gu.Units.Generator.Tests/Gu.Units.Generator.Tests.csproj @@ -153,8 +153,8 @@ - - ..\packages\Gu.ChangeTracking\lib\net45\Gu.ChangeTracking.dll + + ..\packages\Gu.Reactive\lib\net45\Gu.Reactive.dll True True @@ -164,8 +164,8 @@ - - ..\packages\Gu.Reactive\lib\net45\Gu.Reactive.dll + + ..\packages\Gu.State\lib\net45\Gu.State.dll True True @@ -817,7 +817,16 @@ - + + + + ..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll + True + True + + + + ..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll diff --git a/Gu.Units.Generator.Tests/Helpers/FactorConversionComparer.cs b/Gu.Units.Generator.Tests/Helpers/FactorConversionComparer.cs index 39c0a6bd..2ced4790 100644 --- a/Gu.Units.Generator.Tests/Helpers/FactorConversionComparer.cs +++ b/Gu.Units.Generator.Tests/Helpers/FactorConversionComparer.cs @@ -23,7 +23,7 @@ public int Compare(FactorConversion x, FactorConversion y) int IComparer.Compare(object x, object y) { - return Compare((FactorConversion) x, (FactorConversion) y); + return this.Compare((FactorConversion) x, (FactorConversion) y); } } } \ No newline at end of file diff --git a/Gu.Units.Generator.Tests/Helpers/FieldComparer.cs b/Gu.Units.Generator.Tests/Helpers/FieldComparer.cs index f1e3fd9c..459b1d87 100644 --- a/Gu.Units.Generator.Tests/Helpers/FieldComparer.cs +++ b/Gu.Units.Generator.Tests/Helpers/FieldComparer.cs @@ -15,7 +15,7 @@ private FieldComparer() public int Compare(object x, object y) { - return Compare(x, y, new List()); + return this.Compare(x, y, new List()); } private int Compare(object x, object y, List compared) @@ -55,7 +55,7 @@ private int Compare(object x, object y, List compared) } compared.Add(new ComparedPair(oX, oY)); - if (Compare(oX, oY, compared) != 0) + if (this.Compare(oX, oY, compared) != 0) { return -1; } diff --git a/Gu.Units.Generator.Tests/Helpers/PrefixComparer.cs b/Gu.Units.Generator.Tests/Helpers/PrefixComparer.cs index eb0295b0..1af0c092 100644 --- a/Gu.Units.Generator.Tests/Helpers/PrefixComparer.cs +++ b/Gu.Units.Generator.Tests/Helpers/PrefixComparer.cs @@ -33,7 +33,7 @@ public int Compare(Prefix x, Prefix y) int IComparer.Compare(object x, object y) { - return Compare((Prefix) x, (Prefix) y); + return this.Compare((Prefix) x, (Prefix) y); } } } \ No newline at end of file diff --git a/Gu.Units.Generator.Tests/Helpers/PrefixConversionComparer.cs b/Gu.Units.Generator.Tests/Helpers/PrefixConversionComparer.cs index e23493ed..49ad76a7 100644 --- a/Gu.Units.Generator.Tests/Helpers/PrefixConversionComparer.cs +++ b/Gu.Units.Generator.Tests/Helpers/PrefixConversionComparer.cs @@ -32,7 +32,7 @@ public int Compare(PrefixConversion x, PrefixConversion y) int IComparer.Compare(object x, object y) { - return Compare((PrefixConversion)x, (PrefixConversion)y); + return this.Compare((PrefixConversion)x, (PrefixConversion)y); } } } \ No newline at end of file diff --git a/Gu.Units.Generator.Tests/Helpers/PrefixConversionVmComparer.cs b/Gu.Units.Generator.Tests/Helpers/PrefixConversionVmComparer.cs index f8178594..df0f84a0 100644 --- a/Gu.Units.Generator.Tests/Helpers/PrefixConversionVmComparer.cs +++ b/Gu.Units.Generator.Tests/Helpers/PrefixConversionVmComparer.cs @@ -18,7 +18,7 @@ public int Compare(PrefixConversionVm x, PrefixConversionVm y) int IComparer.Compare(object x, object y) { - return Compare((PrefixConversionVm)x, (PrefixConversionVm)y); + return this.Compare((PrefixConversionVm)x, (PrefixConversionVm)y); } } } \ No newline at end of file diff --git a/Gu.Units.Generator.Tests/Helpers/UnitComparer.cs b/Gu.Units.Generator.Tests/Helpers/UnitComparer.cs index 2061a14e..52572242 100644 --- a/Gu.Units.Generator.Tests/Helpers/UnitComparer.cs +++ b/Gu.Units.Generator.Tests/Helpers/UnitComparer.cs @@ -39,7 +39,7 @@ public int Compare(BaseUnit x, BaseUnit y) int IComparer.Compare(object x, object y) { - return Compare((BaseUnit)x, (BaseUnit)y); + return this.Compare((BaseUnit)x, (BaseUnit)y); } } } \ No newline at end of file diff --git a/Gu.Units.Generator.Tests/MockSettings.cs b/Gu.Units.Generator.Tests/MockSettings.cs index e8525189..852856a6 100644 --- a/Gu.Units.Generator.Tests/MockSettings.cs +++ b/Gu.Units.Generator.Tests/MockSettings.cs @@ -59,29 +59,29 @@ public class MockSettings : Settings private MockSettings() : base(new ObservableCollection(), new ObservableCollection(), new ObservableCollection()) { - Prefixes.Add(this.Micro); - Prefixes.Add(this.Milli); - Prefixes.Add(this.Kilo); + this.Prefixes.Add(this.Micro); + this.Prefixes.Add(this.Milli); + this.Prefixes.Add(this.Kilo); this.Metres = new BaseUnit("Metres", "m", "Length"); - BaseUnits.Add(this.Metres); + this.BaseUnits.Add(this.Metres); this.Length = this.Metres.Quantity; this.Kelvins = new BaseUnit("Kelvin", "K", "Temperature"); - BaseUnits.Add(this.Kelvins); + this.BaseUnits.Add(this.Kelvins); this.Temperature = this.Kelvins.Quantity; this.Seconds = new BaseUnit("Seconds", "s", "Time"); - BaseUnits.Add(this.Seconds); + this.BaseUnits.Add(this.Seconds); this.Time = this.Seconds.Quantity; this.Kilograms = new BaseUnit("Kilograms", "kg", "Mass"); this.Grams = new FactorConversion("Grams", "g", 0.001); this.Kilograms.FactorConversions.Add(this.Grams); - BaseUnits.Add(this.Kilograms); + this.BaseUnits.Add(this.Kilograms); this.Mass = this.Kilograms.Quantity; this.Amperes = new BaseUnit("Amperes", "A", "ElectricalCurrent"); - BaseUnits.Add(this.Amperes); + this.BaseUnits.Add(this.Amperes); this.Current = this.Amperes.Quantity; this.MetresPerSecond = new DerivedUnit( @@ -90,7 +90,7 @@ private MockSettings() "Speed", new[]{ UnitAndPower.Create(this.Metres, 1), UnitAndPower.Create(this.Seconds, -1)}); - DerivedUnits.Add(this.MetresPerSecond); + this.DerivedUnits.Add(this.MetresPerSecond); this.Speed = this.MetresPerSecond.Quantity; this.MetresPerSecondSquared = new DerivedUnit( @@ -102,7 +102,7 @@ private MockSettings() UnitAndPower.Create(this.Metres, 1), UnitAndPower.Create(this.Seconds, -2) }); - DerivedUnits.Add(this.MetresPerSecondSquared); + this.DerivedUnits.Add(this.MetresPerSecondSquared); this.Acceleration = this.MetresPerSecondSquared.Quantity; this.Newtons = new DerivedUnit( @@ -112,7 +112,7 @@ private MockSettings() new[]{ UnitAndPower.Create(this.Kilograms, 1), UnitAndPower.Create(this.Metres, 1), UnitAndPower.Create(this.Seconds, -2)}); - DerivedUnits.Add(this.Newtons); + this.DerivedUnits.Add(this.Newtons); this.Force = this.Newtons.Quantity; this.Joules = new DerivedUnit( @@ -121,7 +121,7 @@ private MockSettings() "Energy", new[]{ UnitAndPower.Create(this.Newtons, 1), UnitAndPower.Create(this.Metres, 1)}); - DerivedUnits.Add(this.Joules); + this.DerivedUnits.Add(this.Joules); this.Energy = this.Joules.Quantity; this.Watts = new DerivedUnit( @@ -130,7 +130,7 @@ private MockSettings() "Power", new[]{ UnitAndPower.Create(this.Joules, 1), UnitAndPower.Create(this.Seconds, -1)}); - DerivedUnits.Add(this.Watts); + this.DerivedUnits.Add(this.Watts); this.Power = this.Watts.Quantity; this.Volts = new DerivedUnit( @@ -139,7 +139,7 @@ private MockSettings() "Voltage", new[]{ UnitAndPower.Create(this.Watts, 1), UnitAndPower.Create(this.Amperes, -1)}); - DerivedUnits.Add(this.Volts); + this.DerivedUnits.Add(this.Volts); this.Voltage = this.Volts.Quantity; this.Coloumbs = new DerivedUnit( @@ -148,24 +148,24 @@ private MockSettings() "ElectricCharge", new[]{ UnitAndPower.Create(this.Seconds, 1), UnitAndPower.Create(this.Amperes, 1)}); - DerivedUnits.Add(this.Coloumbs); + this.DerivedUnits.Add(this.Coloumbs); this.ElectricCharge = this.Coloumbs.Quantity; this.SquareMetres = new DerivedUnit("SquareMetres", "m^2", "Area", new[] { UnitAndPower.Create(this.Metres, 2) }); - DerivedUnits.Add(this.SquareMetres); + this.DerivedUnits.Add(this.SquareMetres); this.Area = this.SquareMetres.Quantity; this.CubicMetres = new DerivedUnit("CubicMetres", "m^3", "Volume", new[] { UnitAndPower.Create(this.Metres, 3) }); - DerivedUnits.Add(this.CubicMetres); + this.DerivedUnits.Add(this.CubicMetres); this.Volume = this.CubicMetres.Quantity; this.KilogramsPerCubicMetre = new DerivedUnit("KilogramsPerCubicMetre", "kg/m^3", "Density", new[] {UnitAndPower.Create(this.Kilograms,1), UnitAndPower.Create(this.Metres, -3) }); - DerivedUnits.Add(this.KilogramsPerCubicMetre); + this.DerivedUnits.Add(this.KilogramsPerCubicMetre); this.Density = this.CubicMetres.Quantity; this.Hertz = new DerivedUnit("Hertz", "1/s", "Frequency", new[] { UnitAndPower.Create(this.Seconds, -1) }); - DerivedUnits.Add(this.Hertz); + this.DerivedUnits.Add(this.Hertz); this.Frequency = this.Hertz.Quantity; } diff --git a/Gu.Units.Generator.Tests/paket.references b/Gu.Units.Generator.Tests/paket.references index 4878d792..9cc69d07 100644 --- a/Gu.Units.Generator.Tests/paket.references +++ b/Gu.Units.Generator.Tests/paket.references @@ -1,6 +1,6 @@ Moq NUnit -Gu.Wpf.Reactive -Gu.ChangeTracking Newtonsoft.Json -Microsoft.CodeAnalysis.CSharp.Scripting \ No newline at end of file +Microsoft.CodeAnalysis.CSharp.Scripting +Gu.Wpf.Reactive +Gu.State \ No newline at end of file diff --git a/Gu.Units.Generator/Descriptors/Conversions/CustomConversion.cs b/Gu.Units.Generator/Descriptors/Conversions/CustomConversion.cs index 4e3dd3a9..bcb5d3d4 100644 --- a/Gu.Units.Generator/Descriptors/Conversions/CustomConversion.cs +++ b/Gu.Units.Generator/Descriptors/Conversions/CustomConversion.cs @@ -76,7 +76,7 @@ public string ToSi this.OnPropertyChanged(nameof(this.CanRoundtrip)); try { - var temp = ExpressionParser.Evaluate(1, this.ParameterName, value); + ExpressionParser.Evaluate(1, this.ParameterName, value); } catch (Exception e) { @@ -102,7 +102,7 @@ public string FromSi try { - var temp = ExpressionParser.Evaluate(1, this.Unit.ParameterName, value); + ExpressionParser.Evaluate(1, this.Unit.ParameterName, value); } catch (Exception e) { diff --git a/Gu.Units.Generator/Gu.Units.Generator.csproj b/Gu.Units.Generator/Gu.Units.Generator.csproj index 8b83688d..1ba660c2 100644 --- a/Gu.Units.Generator/Gu.Units.Generator.csproj +++ b/Gu.Units.Generator/Gu.Units.Generator.csproj @@ -82,7 +82,6 @@ ..\packages\Microsoft.CodeAnalysis.Scripting.Common\lib\dotnet\Microsoft.CodeAnalysis.Scripting.dll - 4.0 @@ -498,6 +497,17 @@ + + + + + ..\packages\Gu.State\lib\net45\Gu.State.dll + True + True + + + + @@ -1148,7 +1158,16 @@ - + + + + ..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll + True + True + + + + ..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll diff --git a/Gu.Units.Generator/paket.references b/Gu.Units.Generator/paket.references index 6a8737eb..caece2c5 100644 --- a/Gu.Units.Generator/paket.references +++ b/Gu.Units.Generator/paket.references @@ -1,6 +1,6 @@ T4.TemplateFileManager -Gu.Wpf.Reactive -Gu.ChangeTracking JetBrains.Annotations Newtonsoft.Json -Microsoft.CodeAnalysis.CSharp.Scripting \ No newline at end of file +Microsoft.CodeAnalysis.CSharp.Scripting +Gu.Wpf.Reactive +Gu.State \ No newline at end of file diff --git a/Gu.Units.Tests/BenchMarks/FormattingBenchmarks.cs b/Gu.Units.Tests/BenchMarks/FormattingBenchmarks.cs index e335202c..a3702b61 100644 --- a/Gu.Units.Tests/BenchMarks/FormattingBenchmarks.cs +++ b/Gu.Units.Tests/BenchMarks/FormattingBenchmarks.cs @@ -54,7 +54,7 @@ public void ForProfiling() var toString = speed.ToString("F1 m/s"); toString = speed.ToString("F0", "s⁻¹⋅mm"); toString = speed.ToString("F2 m⋅s⁻¹"); - var string_Format = $"{speed.metresPerSecond:F1} {SpeedUnit.MetresPerSecond}"; + var stringFormat = $"{speed.metresPerSecond:F1} {SpeedUnit.MetresPerSecond}"; // end warmup var n = 1000000; diff --git a/Gu.Units.Tests/Sources/ParseProvider.cs b/Gu.Units.Tests/Sources/ParseProvider.cs index 7ae2e6a1..91e231fa 100644 --- a/Gu.Units.Tests/Sources/ParseProvider.cs +++ b/Gu.Units.Tests/Sources/ParseProvider.cs @@ -7,27 +7,27 @@ public class ParseProvider : List { public ParseProvider() { - Add(new ParseData("1.2m^2", s => Area.Parse(s), Area.FromSquareMetres(1.2))); - Add(new ParseData("1.2m²", s => Area.Parse(s), Area.FromSquareMetres(1.2))); - Add(new ParseData("1.2s", s => Time.Parse(s), Time.FromSeconds(1.2))); - Add(new ParseData("1.2h", s => Time.Parse(s), Time.FromHours(1.2))); - Add(new ParseData("1.2ms", s => Time.Parse(s), Time.FromMilliseconds(1.2))); - Add(new ParseData("1.2kg", s => Mass.Parse(s), Mass.FromKilograms(1.2))); - Add(new ParseData("1.2g", s => Mass.Parse(s), Mass.FromGrams(1.2))); - Add(new ParseData("1.2m³", s => Volume.Parse(s), Volume.FromCubicMetres(1.2))); - Add(new ParseData("1.2m^3", s => Volume.Parse(s), Volume.FromCubicMetres(1.2))); - Add(new ParseData("1.2m/s", s => Speed.Parse(s), Speed.FromMetresPerSecond(1.2))); - Add(new ParseData("1.2m⋅s⁻¹", s => Speed.Parse(s), Speed.FromMetresPerSecond(1.2))); - Add(new ParseData("1.2m*s⁻¹", s => Speed.Parse(s), Speed.FromMetresPerSecond(1.2))); - Add(new ParseData("1.2m¹⋅s⁻¹", s => Speed.Parse(s), Speed.FromMetresPerSecond(1.2))); - Add(new ParseData("1.2m^1⋅s⁻¹", s => Speed.Parse(s), Speed.FromMetresPerSecond(1.2))); - Add(new ParseData("1.2m^1⋅s^-1", s => Speed.Parse(s), Speed.FromMetresPerSecond(1.2))); - Add(new ParseData("1.2m^1/s^2", s => Acceleration.Parse(s), Acceleration.FromMetresPerSecondSquared(1.2))); - Add(new ParseData("1.2m/s^2", s => Acceleration.Parse(s), Acceleration.FromMetresPerSecondSquared(1.2))); - Add(new ParseData("1.2 m/s^2", s => Acceleration.Parse(s), Acceleration.FromMetresPerSecondSquared(1.2))); - Add(new ParseData("1.2 m / s^2", s => Acceleration.Parse(s), Acceleration.FromMetresPerSecondSquared(1.2))); - Add(new ParseData("1.2 m / s²", s => Acceleration.Parse(s), Acceleration.FromMetresPerSecondSquared(1.2))); - Add(new ParseData("1.2 mm / s²", s => Acceleration.Parse(s), Acceleration.FromMillimetresPerSecondSquared(1.2))); + this.Add(new ParseData("1.2m^2", s => Area.Parse(s), Area.FromSquareMetres(1.2))); + this.Add(new ParseData("1.2m²", s => Area.Parse(s), Area.FromSquareMetres(1.2))); + this.Add(new ParseData("1.2s", s => Time.Parse(s), Time.FromSeconds(1.2))); + this.Add(new ParseData("1.2h", s => Time.Parse(s), Time.FromHours(1.2))); + this.Add(new ParseData("1.2ms", s => Time.Parse(s), Time.FromMilliseconds(1.2))); + this.Add(new ParseData("1.2kg", s => Mass.Parse(s), Mass.FromKilograms(1.2))); + this.Add(new ParseData("1.2g", s => Mass.Parse(s), Mass.FromGrams(1.2))); + this.Add(new ParseData("1.2m³", s => Volume.Parse(s), Volume.FromCubicMetres(1.2))); + this.Add(new ParseData("1.2m^3", s => Volume.Parse(s), Volume.FromCubicMetres(1.2))); + this.Add(new ParseData("1.2m/s", s => Speed.Parse(s), Speed.FromMetresPerSecond(1.2))); + this.Add(new ParseData("1.2m⋅s⁻¹", s => Speed.Parse(s), Speed.FromMetresPerSecond(1.2))); + this.Add(new ParseData("1.2m*s⁻¹", s => Speed.Parse(s), Speed.FromMetresPerSecond(1.2))); + this.Add(new ParseData("1.2m¹⋅s⁻¹", s => Speed.Parse(s), Speed.FromMetresPerSecond(1.2))); + this.Add(new ParseData("1.2m^1⋅s⁻¹", s => Speed.Parse(s), Speed.FromMetresPerSecond(1.2))); + this.Add(new ParseData("1.2m^1⋅s^-1", s => Speed.Parse(s), Speed.FromMetresPerSecond(1.2))); + this.Add(new ParseData("1.2m^1/s^2", s => Acceleration.Parse(s), Acceleration.FromMetresPerSecondSquared(1.2))); + this.Add(new ParseData("1.2m/s^2", s => Acceleration.Parse(s), Acceleration.FromMetresPerSecondSquared(1.2))); + this.Add(new ParseData("1.2 m/s^2", s => Acceleration.Parse(s), Acceleration.FromMetresPerSecondSquared(1.2))); + this.Add(new ParseData("1.2 m / s^2", s => Acceleration.Parse(s), Acceleration.FromMetresPerSecondSquared(1.2))); + this.Add(new ParseData("1.2 m / s²", s => Acceleration.Parse(s), Acceleration.FromMetresPerSecondSquared(1.2))); + this.Add(new ParseData("1.2 mm / s²", s => Acceleration.Parse(s), Acceleration.FromMillimetresPerSecondSquared(1.2))); } public class ParseData @@ -39,15 +39,15 @@ public ParseData(string stringValue, Func parseMethod, IQuant this.Quantity = quantity; } - public string StringValue { get; private set; } + public string StringValue { get; } - public Func ParseMethod { get; private set; } + public Func ParseMethod { get; } - public IQuantity Quantity { get; private set; } + public IQuantity Quantity { get; } public override string ToString() { - return string.Format("\"{0}\" -> {1}", this.StringValue, this.Quantity); + return $"\"{this.StringValue}\" -> {this.Quantity}"; } } } diff --git a/paket.dependencies b/paket.dependencies index 619d6c4b..a856fa70 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -4,9 +4,9 @@ nuget Moq nuget Newtonsoft.Json nuget NUnit ~> 2 nuget T4.TemplateFileManager -nuget Gu.Wpf.Reactive -nuget Gu.ChangeTracking nuget JetBrains.Annotations nuget Microsoft.CodeAnalysis.CSharp.Scripting nuget TestStack.White -nuget Gu.Wpf.NumericInput \ No newline at end of file +nuget Gu.Wpf.NumericInput +nuget Gu.Wpf.Reactive +nuget Gu.State \ No newline at end of file diff --git a/paket.lock b/paket.lock index 89666a65..8b814fb9 100644 --- a/paket.lock +++ b/paket.lock @@ -2,9 +2,9 @@ NUGET remote: http://www.nuget.org/api/v2 specs: Castle.Core (3.3.3) - Gu.ChangeTracking (1.0.2) Gu.Reactive (1.11) Rx-Main (>= 2.2.5) + Gu.State (0.2) Gu.Wpf.NumericInput (0.4.7) Gu.Wpf.Reactive (1.11) Gu.Reactive (>= 1.11) @@ -14,17 +14,17 @@ NUGET JetBrains.Annotations (10.1.4) System.Runtime (>= 4.0) - framework: dnxcore50 Microsoft.CodeAnalysis.Analyzers (1.1) - Microsoft.CodeAnalysis.Common (1.1.1) + Microsoft.CodeAnalysis.Common (1.2.2) Microsoft.CodeAnalysis.Analyzers (>= 1.1) System.Collections.Immutable (>= 1.1.37) - System.Reflection.Metadata (>= 1.1) - Microsoft.CodeAnalysis.CSharp (1.1.1) - Microsoft.CodeAnalysis.Common (1.1.1) - Microsoft.CodeAnalysis.CSharp.Scripting (1.1.1) - Microsoft.CodeAnalysis.CSharp (1.1.1) - Microsoft.CodeAnalysis.Scripting.Common (1.1.1) - Microsoft.CodeAnalysis.Scripting.Common (1.1.1) - Microsoft.CodeAnalysis.Common (1.1.1) + System.Reflection.Metadata (>= 1.2) + Microsoft.CodeAnalysis.CSharp (1.2.2) + Microsoft.CodeAnalysis.Common (1.2.2) + Microsoft.CodeAnalysis.CSharp.Scripting (1.2.2) + Microsoft.CodeAnalysis.CSharp (1.2.2) + Microsoft.CodeAnalysis.Scripting.Common (1.2.2) + Microsoft.CodeAnalysis.Scripting.Common (1.2.2) + Microsoft.CodeAnalysis.Common (1.2.2) System.AppContext (>= 4.0) System.Collections (>= 4.0.10) System.Collections.Immutable (>= 1.1.37) @@ -184,22 +184,23 @@ NUGET System.Runtime (>= 4.0) - framework: dnxcore50 System.Runtime (>= 4.0.20) - framework: dnxcore50 System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50 - System.Reflection.Metadata (1.1) - System.Collections (>= 4.0) - framework: dnxcore50 - System.Collections.Immutable (>= 1.1.37) - framework: >= net45, dnxcore50, portable-net45+win80 - System.Diagnostics.Debug (>= 4.0) - framework: dnxcore50 - System.IO (>= 4.0) - framework: dnxcore50 - System.Reflection (>= 4.0) - framework: dnxcore50 - System.Reflection.Extensions (>= 4.0) - framework: dnxcore50 - System.Reflection.Primitives (>= 4.0) - framework: dnxcore50 - System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50 - System.Runtime (>= 4.0) - framework: dnxcore50 - System.Runtime.Extensions (>= 4.0) - framework: dnxcore50 - System.Runtime.InteropServices (>= 4.0) - framework: dnxcore50 - System.Text.Encoding (>= 4.0) - framework: dnxcore50 - System.Text.Encoding.Extensions (>= 4.0) - framework: dnxcore50 - System.Threading (>= 4.0) - framework: dnxcore50 - System.Reflection.Primitives (4.0) - framework: dnxcore50 + System.Reflection.Metadata (1.2) + System.Collections (>= 4.0) - framework: >= netstandard11 + System.Collections.Immutable (>= 1.1.37) + System.Diagnostics.Debug (>= 4.0) - framework: >= netstandard11 + System.IO (>= 4.0) - framework: >= netstandard11 + System.Linq (>= 4.0) - framework: >= netstandard11 + System.Reflection (>= 4.0) - framework: >= netstandard11 + System.Reflection.Extensions (>= 4.0) - framework: >= netstandard11 + System.Reflection.Primitives (>= 4.0) - framework: >= netstandard11 + System.Resources.ResourceManager (>= 4.0) - framework: >= netstandard11 + System.Runtime (>= 4.0) - framework: >= netstandard11 + System.Runtime.Extensions (>= 4.0) - framework: >= netstandard11 + System.Runtime.InteropServices (>= 4.0) - framework: >= netstandard11 + System.Text.Encoding (>= 4.0) - framework: >= netstandard11 + System.Text.Encoding.Extensions (>= 4.0) - framework: >= netstandard11 + System.Threading (>= 4.0) - framework: >= netstandard11 + System.Reflection.Primitives (4.0) - framework: dnxcore50, >= netstandard11 System.Runtime (>= 4.0) - framework: dnxcore50 System.Threading (>= 4.0) - framework: dnxcore50 System.Reflection.TypeExtensions (4.0) - framework: dnxcore50 @@ -244,9 +245,9 @@ NUGET System.Threading (>= 4.0.10) - framework: dnxcore50 System.Threading.Tasks (>= 4.0) - framework: dnxcore50 System.Threading.Tasks (>= 4.0.10) - framework: dnxcore50 - System.Text.Encoding (4.0.10) - framework: dnxcore50 + System.Text.Encoding (4.0.10) - framework: dnxcore50, >= netstandard11 System.Runtime (>= 4.0) - framework: dnxcore50 - System.Text.Encoding.Extensions (4.0.10) - framework: dnxcore50 + System.Text.Encoding.Extensions (4.0.10) - framework: dnxcore50, >= netstandard11 System.Runtime (>= 4.0) - framework: dnxcore50 System.Text.Encoding (>= 4.0.10) - framework: dnxcore50 System.Threading (4.0.10)