Skip to content

Commit 74ed1cb

Browse files
PathoschildPathoschild
committed
update NuGet packages
1 parent 75822c6 commit 74ed1cb

11 files changed

Lines changed: 40 additions & 31 deletions

File tree

‎docs/release-notes.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
* Fixed pickled forage not shown by `list_items` console command.
99

1010
* For mod authors:
11+
* Updated dependencies, including...
12+
* [FluentHttpClient](https://github.com/Pathoschild/FluentHttpClient#readme) 4.3.0 → 4.4.0 (see [changes](https://github.com/Pathoschild/FluentHttpClient/blob/develop/RELEASE-NOTES.md#440));
13+
* [Pintail](https://github.com/Nanoray-pl/Pintail) 2.3.0 → 2.4.2 (see [changes](https://github.com/Nanoray-pl/Pintail/blob/master/docs/release-notes.md#242)).
1114
* Fixed `content.Load` ignoring language override in recent SMAPI builds.
1215
* Fixed player sprites and building paint masks not always propagated on change.
1316

‎docs/technical/mod-package.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,9 @@ The NuGet package is generated automatically in `StardewModdingAPI.ModBuildConfi
416416
when you compile it.
417417

418418
## Release notes
419+
## Upcoming release
420+
* Updated dependencies.
421+
419422
## 4.1.1
420423
Released 24 June 2023 for SMAPI 3.13.0 or later.
421424

‎src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
6868
{
6969
string diagnosticsOutput = actualResults.Any() ? DiagnosticVerifier.FormatDiagnostics(analyzer, actualResults.ToArray()) : " NONE.";
7070

71-
Assert.IsTrue(false,
71+
Assert.Fail(
7272
string.Format("Mismatch between number of diagnostics returned, expected \"{0}\" actual \"{1}\"\r\n\r\nDiagnostics:\r\n{2}\r\n", expectedCount, actualCount, diagnosticsOutput));
7373
}
7474

@@ -81,7 +81,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
8181
{
8282
if (actual.Location != Location.None)
8383
{
84-
Assert.IsTrue(false,
84+
Assert.Fail(
8585
string.Format("Expected:\nA project diagnostic with No location\nActual:\n{0}",
8686
DiagnosticVerifier.FormatDiagnostics(analyzer, actual)));
8787
}
@@ -93,7 +93,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
9393

9494
if (additionalLocations.Length != expected.Locations.Length - 1)
9595
{
96-
Assert.IsTrue(false,
96+
Assert.Fail(
9797
string.Format("Expected {0} additional locations but got {1} for Diagnostic:\r\n {2}\r\n",
9898
expected.Locations.Length - 1, additionalLocations.Length,
9999
DiagnosticVerifier.FormatDiagnostics(analyzer, actual)));
@@ -107,21 +107,21 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
107107

108108
if (actual.Id != expected.Id)
109109
{
110-
Assert.IsTrue(false,
110+
Assert.Fail(
111111
string.Format("Expected diagnostic id to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n",
112112
expected.Id, actual.Id, DiagnosticVerifier.FormatDiagnostics(analyzer, actual)));
113113
}
114114

115115
if (actual.Severity != expected.Severity)
116116
{
117-
Assert.IsTrue(false,
117+
Assert.Fail(
118118
string.Format("Expected diagnostic severity to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n",
119119
expected.Severity, actual.Severity, DiagnosticVerifier.FormatDiagnostics(analyzer, actual)));
120120
}
121121

122122
if (actual.GetMessage() != expected.Message)
123123
{
124-
Assert.IsTrue(false,
124+
Assert.Fail(
125125
string.Format("Expected diagnostic message to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n",
126126
expected.Message, actual.GetMessage(), DiagnosticVerifier.FormatDiagnostics(analyzer, actual)));
127127
}
@@ -139,7 +139,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno
139139
{
140140
var actualSpan = actual.GetLineSpan();
141141

142-
Assert.IsTrue(actualSpan.Path == expected.Path || (actualSpan.Path != null && actualSpan.Path.Contains("Test0.") && expected.Path.Contains("Test.")),
142+
Assert.That(actualSpan.Path == expected.Path || (actualSpan.Path != null && actualSpan.Path.Contains("Test0.") && expected.Path.Contains("Test.")),
143143
string.Format("Expected diagnostic to be in file \"{0}\" was actually in file \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n",
144144
expected.Path, actualSpan.Path, DiagnosticVerifier.FormatDiagnostics(analyzer, diagnostic)));
145145

@@ -150,7 +150,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno
150150
{
151151
if (actualLinePosition.Line + 1 != expected.Line)
152152
{
153-
Assert.IsTrue(false,
153+
Assert.Fail(
154154
string.Format("Expected diagnostic to be on line \"{0}\" was actually on line \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n",
155155
expected.Line, actualLinePosition.Line + 1, DiagnosticVerifier.FormatDiagnostics(analyzer, diagnostic)));
156156
}
@@ -161,7 +161,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno
161161
{
162162
if (actualLinePosition.Character + 1 != expected.Column)
163163
{
164-
Assert.IsTrue(false,
164+
Assert.Fail(
165165
string.Format("Expected diagnostic to start at column \"{0}\" was actually at column \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n",
166166
expected.Column, actualLinePosition.Character + 1, DiagnosticVerifier.FormatDiagnostics(analyzer, diagnostic)));
167167
}
@@ -197,7 +197,7 @@ private static string FormatDiagnostics(DiagnosticAnalyzer analyzer, params Diag
197197
}
198198
else
199199
{
200-
Assert.IsTrue(location.IsInSource,
200+
Assert.That(location.IsInSource,
201201
$"Test base does not currently handle diagnostics in metadata locations. Diagnostic in metadata: {diagnostics[i]}\r\n");
202202

203203
var linePosition = diagnostics[i].Location.GetLineSpan().StartLinePosition;

‎src/SMAPI.ModBuildConfig.Analyzer.Tests/SMAPI.ModBuildConfig.Analyzer.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.10.0" />
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
10-
<PackageReference Include="NUnit" Version="3.13.3" />
8+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
10+
<PackageReference Include="NUnit" Version="4.1.0" />
1111
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
1212
</ItemGroup>
1313

‎src/SMAPI.ModBuildConfig.Analyzer/SMAPI.ModBuildConfig.Analyzer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.10.0" />
12+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.10" />
26+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.10.4" />
2727
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2828

2929
<!--

‎src/SMAPI.Tests/SMAPI.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="FluentAssertions" Version="6.12.0" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
19-
<PackageReference Include="Moq" Version="4.20.69" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
19+
<PackageReference Include="Moq" Version="4.20.70" />
2020
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
21-
<PackageReference Include="NUnit" Version="3.13.3" />
21+
<PackageReference Include="NUnit" Version="4.1.0" />
2222
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
2323
</ItemGroup>
2424

‎src/SMAPI.Toolkit/SMAPI.Toolkit.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<Import Project="..\..\build\common.targets" />
1010

1111
<ItemGroup>
12-
<PackageReference Include="HtmlAgilityPack" Version="1.11.52" />
12+
<PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
1313
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
14-
<PackageReference Include="Pathoschild.Http.FluentClient" Version="4.3.0" />
15-
<PackageReference Include="System.Management" Version="5.0.0" Condition="'$(OS)' == 'Windows_NT'" />
14+
<PackageReference Include="Pathoschild.Http.FluentClient" Version="4.4.0" />
15+
<PackageReference Include="System.Management" Version="8.0.0" Condition="'$(OS)' == 'Windows_NT'" />
1616
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" Condition="'$(OS)' == 'Windows_NT'" />
1717
<PackageReference Include="VdfConverter" Version="1.0.3" Condition="'$(OS)' == 'Windows_NT'" Private="False" />
1818
</ItemGroup>

‎src/SMAPI.Web/Controllers/ModsApiController.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ private async Task<ModEntryModel> GetModData(ModSearchEntryModel search, WikiMod
158158
ModEntryVersionModel? unofficialForBeta = null;
159159
foreach (UpdateKey updateKey in updateKeys)
160160
{
161+
if (updateKey.Site == ModSiteKey.ModDrop)
162+
continue;
163+
161164
// validate update key
162165
if (
163166
!updateKey.LooksValid

‎src/SMAPI.Web/SMAPI.Web.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Azure.Storage.Blobs" Version="12.17.0" />
19-
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.5" />
20-
<PackageReference Include="Hangfire.MemoryStorage" Version="1.8.0" />
21-
<PackageReference Include="HtmlAgilityPack" Version="1.11.52" />
18+
<PackageReference Include="Azure.Storage.Blobs" Version="12.20.0" />
19+
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.12" />
20+
<PackageReference Include="Hangfire.MemoryStorage" Version="1.8.1.1" />
21+
<PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
2222
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
23-
<PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
24-
<PackageReference Include="Markdig" Version="0.32.0" />
23+
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
24+
<PackageReference Include="Markdig" Version="0.37.0" />
2525
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.10" />
26-
<PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
26+
<PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.16" />
2727
<PackageReference Include="Pathoschild.FluentNexus" Version="1.0.5" />
28-
<PackageReference Include="Pathoschild.Http.FluentClient" Version="4.3.0" />
28+
<PackageReference Include="Pathoschild.Http.FluentClient" Version="4.4.0" />
2929
</ItemGroup>
3030
<ItemGroup>
3131
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" />

0 commit comments

Comments
 (0)