Skip to content

Commit 796fce9

Browse files
Happypig375Happypig375
committed
Fix CI Nightly/Release
1 parent 26bca1f commit 796fce9

File tree

5 files changed

+25
-28
lines changed

5 files changed

+25
-28
lines changed

‎.github/workflows/Nightly.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ jobs:
7777
run: |
7878
# "dotnet nuget push" with "dotnet nuget add source" to GitHub Packages is unstable for project names with a dot: https://github.com/NuGet/Home/issues/9775#issuecomment-714509211
7979
# So we must specify api-key directly in "dotnet nuget push" instead of following the GitHub Packages documentation
80-
# We use quotes to avoid shell globbing: https://github.com/NuGet/Home/issues/4393#issuecomment-667618120
8180
# --no-symbols true to not let GitHub Releases interpret .snupkg as .nupkg
82-
dotnet nuget push '.nupkgs/*.nupkg' --source 'https://nuget.pkg.github.com/verybadcat/index.json' --api-key ${{ github.token }} --skip-duplicate --no-symbols true
81+
dotnet nuget push .nupkgs\*.nupkg --source 'https://nuget.pkg.github.com/verybadcat/index.json' --api-key ${{ github.token }} --skip-duplicate --no-symbols true
8382
shell: pwsh

‎.github/workflows/Release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
file_glob: true
3939
overwrite: true
4040
- name: Upload to NuGet
41-
run: | # We use double quotes to avoid shell globbing: https://github.com/NuGet/Home/issues/4393#issuecomment-667618120
41+
run: |
4242
# Use --skip-duplicate since we want re-runs of this workflow to succeed in case of network issues
43-
dotnet nuget push ".nupkgs/*.nupkg" -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate
43+
dotnet nuget push .nupkgs\*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate
4444
shell: pwsh

‎CSharpMath.Core.Tests/Editor/CaretTests.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ namespace CSharpMath.Core.Tests {
99
using BackEnd;
1010
// Tests in different classes run in parallel, unlike tests in the same class
1111
public class CaretBlinks {
12-
public const int MillisecondBuffer = 150;
12+
public const int MillisecondBuffer = 200;
1313
[Fact]
1414
public async Task Test() {
1515
var keyboard = new MathKeyboard<TestFont, TGlyph>(TestTypesettingContext.Instance, new TestFont()) {
1616
InsertionPositionHighlighted = true
1717
};
1818
Assert.True(keyboard.InsertionPositionHighlighted);
1919
Assert.True(keyboard.ShouldDrawCaret);
20-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + MillisecondBuffer);
20+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + MillisecondBuffer, TestContext.Current.CancellationToken);
2121
Assert.False(keyboard.InsertionPositionHighlighted);
2222
Assert.False(keyboard.ShouldDrawCaret);
23-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + MillisecondBuffer);
23+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + MillisecondBuffer, TestContext.Current.CancellationToken);
2424
Assert.True(keyboard.InsertionPositionHighlighted);
2525
Assert.True(keyboard.ShouldDrawCaret);
2626
}
@@ -33,9 +33,9 @@ public async Task Test() {
3333
};
3434
keyboard.StopBlinking();
3535
Assert.False(keyboard.ShouldDrawCaret);
36-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
36+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
3737
Assert.False(keyboard.ShouldDrawCaret);
38-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
38+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
3939
Assert.False(keyboard.ShouldDrawCaret);
4040
}
4141
}
@@ -74,7 +74,7 @@ public async Task Test(MathKeyboardInput input) {
7474
Assert.True(keyboard.ShouldDrawCaret);
7575
keyboard.KeyPress(input);
7676
Assert.False(keyboard.ShouldDrawCaret);
77-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
77+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
7878
Assert.False(keyboard.ShouldDrawCaret);
7979
}
8080
}
@@ -86,18 +86,18 @@ public async Task Test() {
8686
};
8787
Assert.True(keyboard.ShouldDrawCaret);
8888

89-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds - CaretBlinks.MillisecondBuffer);
89+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds - CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
9090
Assert.True(keyboard.ShouldDrawCaret);
9191

9292
keyboard.KeyPress(MathKeyboardInput.A);
93-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds - CaretBlinks.MillisecondBuffer);
93+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds - CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
9494
Assert.True(keyboard.ShouldDrawCaret);
9595

9696
keyboard.KeyPress(MathKeyboardInput.Left);
97-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds - CaretBlinks.MillisecondBuffer);
97+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds - CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
9898
Assert.True(keyboard.ShouldDrawCaret);
9999

100-
await Task.Delay(4 * CaretBlinks.MillisecondBuffer);
100+
await Task.Delay(4 * CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
101101
Assert.False(keyboard.ShouldDrawCaret);
102102
}
103103
}
@@ -111,19 +111,19 @@ public async Task Test() {
111111
Assert.True(keyboard.ShouldDrawCaret);
112112

113113
keyboard.StopBlinking();
114-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
114+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
115115
Assert.True(keyboard.ShouldDrawCaret);
116116

117117
keyboard.StartBlinking();
118-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
118+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
119119
Assert.False(keyboard.ShouldDrawCaret);
120120

121121
keyboard.StopBlinking();
122-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
122+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
123123
Assert.False(keyboard.ShouldDrawCaret);
124124

125125
keyboard.StartBlinking();
126-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
126+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
127127
Assert.True(keyboard.ShouldDrawCaret);
128128
}
129129
}
@@ -188,15 +188,15 @@ public async Task CustomizedPlaceholderBlinks() {
188188
Assert.Equal("😀", inner.Nucleus);
189189
Assert.Equal(System.Drawing.Color.Green, inner.Color);
190190

191-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
191+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
192192
Assert.False(keyboard.InsertionPositionHighlighted);
193193
Assert.False(keyboard.ShouldDrawCaret);
194194
Assert.Equal("😐", outer.Nucleus);
195195
Assert.Equal(System.Drawing.Color.Blue, outer.Color);
196196
Assert.Equal("😐", inner.Nucleus);
197197
Assert.Equal(System.Drawing.Color.Blue, inner.Color);
198198

199-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
199+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
200200
Assert.True(keyboard.InsertionPositionHighlighted);
201201
Assert.False(keyboard.ShouldDrawCaret);
202202
Assert.Equal("😐", outer.Nucleus);
@@ -251,9 +251,9 @@ void Check() {
251251
ExpectedAppearance(DefaultPlaceholderSettings.RestingNucleus, DefaultPlaceholderSettings.ActiveNucleus);
252252
}
253253
Check();
254-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
254+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
255255
Check();
256-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
256+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
257257
Check();
258258
}
259259
[Fact]
@@ -285,19 +285,19 @@ public void NonBlinkingActivePlaceholderMoves() {
285285
public async Task IfNonBlinkingPlaceholderIsNotHighLightedThenCaretBlinks() {
286286
Assert.True(keyboard.ShouldDrawCaret);
287287

288-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
288+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
289289
Assert.False(keyboard.ShouldDrawCaret);
290290

291291
keyboard.KeyPress(MathKeyboardInput.Subscript);
292292
keyboard.KeyPress(MathKeyboardInput.Right);
293293
ExpectedAppearance(DefaultPlaceholderSettings.RestingNucleus, DefaultPlaceholderSettings.RestingNucleus);
294294
Assert.True(keyboard.ShouldDrawCaret);
295295

296-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
296+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
297297
ExpectedAppearance(DefaultPlaceholderSettings.RestingNucleus, DefaultPlaceholderSettings.RestingNucleus);
298298
Assert.False(keyboard.ShouldDrawCaret);
299299

300-
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer);
300+
await Task.Delay((int)MathKeyboard<TestFont, TGlyph>.DefaultBlinkMilliseconds + CaretBlinks.MillisecondBuffer, TestContext.Current.CancellationToken);
301301
ExpectedAppearance(DefaultPlaceholderSettings.RestingNucleus, DefaultPlaceholderSettings.RestingNucleus);
302302
Assert.True(keyboard.ShouldDrawCaret);
303303
}

‎CSharpMath.VectSharp.Example/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using CSharpMath.VectSharp;
66

77
var painter = new TextPainter {
8-
LaTeX = @"Let's render some math to a PDF and an SVG file!$$x = -b \pm \sqrt{b^2-4ac} \over 2a$$"
8+
LaTeX = @"Let's render some math to a PDF and an SVG file!$$x = {-b \pm \color{red}\sqrt{b^2-4ac} \over 2a}$$"
99
};
1010
var page = painter.DrawToPage(400f); // adjust width here
1111
var doc = new Document { Pages = { page } };

‎CSharpMath.VectSharp/VectSharpPath.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// Adapted after https://github.com/verybadcat/CSharpMath/blob/master/CSharpMath.SkiaSharp/SkiaPath.cs
2-
31
using System.Drawing;
42
using VectSharp;
53

0 commit comments

Comments
 (0)