Skip to content

Commit bf3ba76

Browse files
mkromismkromis
authored
Merge pull request #98 from mkromis/refresh
Refresh nugets
2 parents b743b04 + 40d39c9 commit bf3ba76

File tree

56 files changed

+378
-431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+378
-431
lines changed

‎Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="MvvmCross" Version="9.3.1" />
16-
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="9.3.1" />
17-
<PackageReference Include="System.Drawing.Common" Version="9.0.3" />
15+
<PackageReference Include="MvvmCross" Version="10.1.2" />
16+
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="10.1.2" />
17+
<PackageReference Include="System.Drawing.Common" Version="10.0.2" />
1818
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
1919
</ItemGroup>
2020

‎Demos/MinoriDemo/MinoriDemo.Core/Modules/VirtualCanvas/Extensions/QuadTreeExtension.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ public static class QuadTreeExtension
77
{
88
public static void Dump<T>(this IMesQuadTree<T> source, LogWriter w) where T : class
99
{
10-
if (source.Root != null)
11-
{
12-
source.Root.Dump(w);
13-
}
10+
source.Root?.Dump(w);
1411
}
1512
}
1613
}

‎Demos/MinoriDemo/MinoriDemo.Core/Modules/VirtualCanvas/Models/HlsColor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public HlsColor(Color color)
3535
min = Math.Min(Math.Min(r, g), b);
3636
sum = max + min;
3737

38-
Luminosity = (((sum * HLSMax) + RGBMax) / (2 * RGBMax));
38+
Luminosity = ((sum * HLSMax) + RGBMax) / (2 * RGBMax);
3939

4040
dif = max - min;
4141
if (dif == 0)
@@ -62,7 +62,7 @@ public HlsColor(Color color)
6262
{
6363
Hue = g == max
6464
? (HLSMax / 3) + Rdelta - Bdelta
65-
: ((2 * HLSMax) / 3) + Gdelta - Rdelta;
65+
: (2 * HLSMax / 3) + Gdelta - Rdelta;
6666
}
6767

6868
if (Hue < 0)

‎Demos/MinoriDemo/MinoriDemo.Core/Modules/VirtualCanvas/Models/LogWriter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class LogWriter : IDisposable
1111

1212
public LogWriter(TextWriter w)
1313
{
14-
XmlWriterSettings s = new XmlWriterSettings
14+
XmlWriterSettings s = new()
1515
{
1616
Indent = true
1717
};

‎Demos/MinoriDemo/MinoriDemo.Core/ViewModels/VirtualCanvasViewModel.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private void AllocateNodes()
140140

141141
// Fill a sparse grid of rectangular color palette nodes with each tile being 50x30.
142142
// with hue across x-axis and saturation on y-axis, brightness is fixed at 100;
143-
Random r = new Random(Environment.TickCount);
143+
Random r = new(Environment.TickCount);
144144
Graph.VirtualChildren.Clear();
145145
Double w = _tileWidth + _tileMargin;
146146
Double h = _tileHeight + _tileMargin;
@@ -152,8 +152,8 @@ private void AllocateNodes()
152152
Double x = r.NextDouble() * width;
153153
Double y = r.NextDouble() * height;
154154

155-
PointF pos = new PointF((Single)(_tileMargin + x), (Single)(_tileMargin + y));
156-
SizeF size = new SizeF(r.Next((Int32)_tileWidth, (Int32)_tileWidth * 5),
155+
PointF pos = new((Single)(_tileMargin + x), (Single)(_tileMargin + y));
156+
SizeF size = new(r.Next((Int32)_tileWidth, (Int32)_tileWidth * 5),
157157
r.Next((Int32)_tileHeight, (Int32)_tileHeight * 5));
158158
TestShapeType type = (TestShapeType)r.Next(0, (Int32)TestShapeType.Last);
159159

‎Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Dirkster.ColorPickerLib" Version="1.6.2" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
17-
<PackageReference Include="System.Text.Json" Version="9.0.3" />
16+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.2" />
17+
<PackageReference Include="System.Text.Json" Version="10.0.2" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Dirkster.ColorPickerLib" Version="1.6.2" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
17-
<PackageReference Include="System.Text.Json" Version="9.0.3" />
16+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.2" />
17+
<PackageReference Include="System.Text.Json" Version="10.0.2" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎Demos/MinoriDemo/MinoriDemo.RibbonWpf/Modules/Themes/ThemeHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class ThemeHelper
1818
/// <returns></returns>
1919
public IDictionary<String, SolidColorBrush> GetBrushes()
2020
{
21-
SortedDictionary<String, SolidColorBrush> results = new SortedDictionary<String, SolidColorBrush>();
21+
SortedDictionary<String, SolidColorBrush> results = [];
2222

2323
// Get theme dict
2424
ResourceDictionary theme = CurrentThemeDictionary;
@@ -71,7 +71,7 @@ public String ExportString()
7171
throw new InvalidOperationException("CurrentThemeDictionary");
7272
}
7373

74-
StringBuilder export = new StringBuilder();
74+
StringBuilder export = new();
7575
export.AppendLine("<ResourceDictionary");
7676
export.AppendLine(" xmlns=\"http://schemas.microsoft.com/winfx/2006/xaml/presentation\"");
7777
export.AppendLine(" xmlns:x=\"http://schemas.microsoft.com/winfx/2006/xaml\"");

‎Demos/MinoriDemo/MinoriDemo.RibbonWpf/Modules/VirtualCanvas/Models/TestShape.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public System.Drawing.Color BaseColor
3434
baseColor = value;
3535

3636
// use hls color for shading
37-
HlsColor hls = new HlsColor(baseColor);
37+
HlsColor hls = new(baseColor);
3838
System.Drawing.Color c1 = hls.Darker(0.25f);
3939
System.Drawing.Color c2 = hls.Lighter(0.25f);
4040

@@ -125,18 +125,18 @@ public Object CreateVisual(IMesVirtualCanvasControl parent)
125125
{
126126
case TestShapeType.Curve:
127127
{
128-
PathGeometry g = new PathGeometry();
129-
PathFigure f = new PathFigure
128+
PathGeometry g = new();
129+
PathFigure f = new()
130130
{
131131
StartPoint = _points[0]
132132
};
133133
g.Figures.Add(f);
134134
for (Int32 i = 0, n = _points.Length; i < n; i += 3)
135135
{
136-
BezierSegment s = new BezierSegment(_points[i], _points[i + 1], _points[i + 2], true);
136+
BezierSegment s = new(_points[i], _points[i + 1], _points[i + 2], true);
137137
f.Segments.Add(s);
138138
}
139-
Path p = new Path
139+
Path p = new()
140140
{
141141
Data = g,
142142

@@ -154,9 +154,9 @@ public Object CreateVisual(IMesVirtualCanvasControl parent)
154154
}
155155
case TestShapeType.Ellipse:
156156
{
157-
Canvas c = new Canvas();
157+
Canvas c = new();
158158

159-
Ellipse e = new Ellipse();
159+
Ellipse e = new();
160160
c.Width = e.Width = _bounds.Width;
161161
c.Height = e.Height = _bounds.Height;
162162
c.Children.Add(e);
@@ -165,7 +165,7 @@ public Object CreateVisual(IMesVirtualCanvasControl parent)
165165
Double x = (_bounds.Width - s.Width) / 2;
166166
Double y = (_bounds.Height - s.Height) / 2;
167167

168-
TextBlock text = new TextBlock
168+
TextBlock text = new()
169169
{
170170
Text = Label
171171
};
@@ -187,13 +187,13 @@ public Object CreateVisual(IMesVirtualCanvasControl parent)
187187
}
188188
case TestShapeType.Rectangle:
189189
{
190-
Border b = new Border
190+
Border b = new()
191191
{
192192
CornerRadius = new CornerRadius(3),
193193
Width = _bounds.Width,
194194
Height = _bounds.Height
195195
};
196-
TextBlock text = new TextBlock
196+
TextBlock text = new()
197197
{
198198
Text = Label,
199199
VerticalAlignment = VerticalAlignment.Center,
@@ -241,7 +241,7 @@ public Size MeasureText(IMesVirtualCanvasControl parent, String label)
241241
_typeface = new Typeface(fontFamily, fontStyle, fontWeight, fontStretch);
242242
_parent = parent;
243243
}
244-
FormattedText ft = new FormattedText(label, CultureInfo.CurrentUICulture,
244+
FormattedText ft = new(label, CultureInfo.CurrentUICulture,
245245
FlowDirection.LeftToRight, _typeface, _fontSize, Brushes.Black);
246246
return new Size(ft.Width, ft.Height);
247247
}

‎Demos/MinoriDemo/MinoriDemo.RibbonWpf/Views/ThemeEditorView.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private void Export_Click(Object sender, RoutedEventArgs e)
5959
MessageBox.Show("Select a theme to export");
6060
return;
6161
}
62-
SaveFileDialog saveFile = new SaveFileDialog
62+
SaveFileDialog saveFile = new()
6363
{
6464
InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
6565
Filter = "Resource Dictionary (*.xaml)|*.xaml",
@@ -132,7 +132,7 @@ private void Search_Click(Object sender, RoutedEventArgs e)
132132
IEnumerable<KeyValuePair<String, SolidColorBrush>> select = brushes
133133
.Where(x => x.Key.ToLower().Contains(search.Text.ToLower()));
134134

135-
SortedDictionary<String, SolidColorBrush> result = new SortedDictionary<String, SolidColorBrush>();
135+
SortedDictionary<String, SolidColorBrush> result = [];
136136
foreach (KeyValuePair<String, SolidColorBrush> item in select) { result[item.Key] = item.Value; }
137137

138138
UpdateList(result);

0 commit comments

Comments
 (0)