Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8a208b0

Browse files
AigioLAigioL
committed
Fix & Update Packages
1 parent 586f0de commit 8a208b0

8 files changed

Lines changed: 110 additions & 76 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0')) ">
3939
<!-- Entity Framework Plus -->
4040
<!-- A FREE & Open Source library to enhance EF6 and EF Core -->
41-
<PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="6.13.20" />
41+
<PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="6.13.21" />
4242

4343
<!-- AspNetCore 6 OpenId/OAuth -->
4444
<PackageVersion Include="AspNet.Security.OpenId.Steam" Version="6.0.0" />
@@ -116,7 +116,7 @@
116116
<!-- ReactiveUI -->
117117
<PackageVersion Include="System.Reactive" Version="5.0.0" />
118118
<PackageVersion Include="Splat" Version="14.2.8" />
119-
<PackageVersion Include="DynamicData" Version="7.8.1" />
119+
<PackageVersion Include="DynamicData" Version="7.8.5" />
120120
<PackageVersion Include="ReactiveUI" Version="18.0.10" />
121121
<!--<PackageVersion Include="ReactiveUI.Fody" Version="17.1.50" /> -->
122122
<PackageVersion Include="ReactiveUI.XamForms" Version="18.0.10" />
@@ -267,18 +267,18 @@
267267
<PackageVersion Include="Xamarin.Android.ReactiveX.RxJava3.RxJava" Version="3.1.4.1" />
268268

269269
<!-- Xamarin.AndroidX -->
270-
<PackageVersion Include="Xamarin.AndroidX.Migration" Version="1.0.9" />
270+
<PackageVersion Include="Xamarin.AndroidX.Migration" Version="1.0.10" />
271271
<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.4.1.1" />
272272
<PackageVersion Include="Xamarin.AndroidX.Emoji.AppCompat" Version="1.1.0.8" />
273273
<PackageVersion Include="Xamarin.AndroidX.Fragment" Version="1.4.1.1" />
274274
<PackageVersion Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.6" />
275275
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.6.0" />
276276
<PackageVersion Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.8" />
277-
<PackageVersion Include="Xamarin.AndroidX.ConstraintLayout" Version="2.1.3.1" />
277+
<PackageVersion Include="Xamarin.AndroidX.ConstraintLayout" Version="2.1.4" />
278278
<PackageVersion Include="Xamarin.AndroidX.Navigation.UI" Version="2.4.2" />
279279
<PackageVersion Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.4.2" />
280280
<PackageVersion Include="Xamarin.AndroidX.ViewPager2" Version="1.0.0.15" />
281-
<PackageVersion Include="Xamarin.AndroidX.Activity" Version="1.4.0.2" />
281+
<PackageVersion Include="Xamarin.AndroidX.Activity" Version="1.4.0.3" />
282282
<PackageVersion Include="Xamarin.AndroidX.Biometric" Version="1.1.0.9" />
283283
<PackageVersion Include="Xamarin.AndroidX.ExifInterface" Version="1.3.3.5" />
284284
<PackageVersion Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.14" />
@@ -297,5 +297,8 @@
297297

298298
<!-- Code Style -->
299299
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
300+
301+
<!-- Quartz -->
302+
<PackageVersion Include="Quartz.AspNetCore" Version="3.4.0" />
300303
</ItemGroup>
301304
</Project>

‎src/ST.Services.CloudService.Models/Models/ApiResponse.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.IO;
77
using System.Threading;
88
using System.Threading.Tasks;
9+
using _ModelValidatorErrorDescriber = System.Application.UI.Resx.SR;
910

1011
namespace System.Application.Models
1112
{
@@ -79,7 +80,7 @@ public static string GetMessage(this ApiResponseCode code, string? errorAppendTe
7980
}
8081
else if (code == ApiResponseCode.UserIsBan)
8182
{
82-
return ModelValidatorErrorDescriber.UserIsBanErrorMessage;
83+
return _ModelValidatorErrorDescriber.UserIsBanErrorMessage;
8384
}
8485
else if (code == ApiResponseCode.CertificateNotYetValid)
8586
{

‎src/ST/ModelValidatorProvider.cs‎

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
using System.Application.Columns;
2727
using System.Application.Models;
28-
using System.Application.Properties;
28+
using System.Application.UI.Resx;
2929
using static System.Application.Services.Implementation.ModelValidator;
3030

3131
namespace System.Application
@@ -148,59 +148,64 @@ static bool IsSmsCodeCorrect(string value)
148148
#endregion
149149
}
150150

151-
/// <summary>
152-
/// 模型验证错误语句
153-
/// </summary>
154-
public static class ModelValidatorErrorDescriber
155-
{
156-
public static string 内容值不能为空或不正确 => SR.内容值不能为空或不正确;
151+
///// <summary>
152+
///// 模型验证错误语句
153+
///// </summary>
154+
//[Obsolete("use System.Application.UI.Resx.SR", true)]
155+
//public static class ModelValidatorErrorDescriber
156+
//{
157+
// public static string 内容值不能为空或不正确 => SR.内容值不能为空或不正确;
157158

158-
public static string 请输入手机号码哦 => SR.请输入手机号码哦;
159+
// public static string 请输入手机号码哦 => SR.请输入手机号码哦;
159160

160-
public static string 请输入正确的手机号码哦 => SR.请输入正确的手机号码哦;
161+
// public static string 请输入正确的手机号码哦 => SR.请输入正确的手机号码哦;
161162

162-
public static string 请输入短信验证码哦 => SR.请输入短信验证码哦;
163+
// public static string 请输入短信验证码哦 => SR.请输入短信验证码哦;
163164

164-
public static string 短信验证码不正确 => SR.短信验证码不正确;
165+
// public static string 短信验证码不正确 => SR.短信验证码不正确;
165166

166-
public static string 请选择头像 => SR.请选择头像;
167+
// public static string 请选择头像 => SR.请选择头像;
167168

168-
public static string 请输入昵称 => SR.请输入昵称;
169+
// public static string 请输入昵称 => SR.请输入昵称;
169170

170-
public static string 昵称最大长度不能超过_ => SR.昵称最大长度不能超过_;
171+
// public static string 昵称最大长度不能超过_ => SR.昵称最大长度不能超过_;
171172

172-
public static string 请输入邀请码哦 => SR.请输入邀请码哦;
173+
// public static string 请输入邀请码哦 => SR.请输入邀请码哦;
173174

174-
public static string 请输入正确的邀请码哦 => SR.请输入正确的邀请码哦;
175+
// public static string 请输入正确的邀请码哦 => SR.请输入正确的邀请码哦;
175176

176-
public static string 手机号码已存在_注册 => SR.手机号码已存在_注册;
177+
// public static string 手机号码已存在_注册 => SR.手机号码已存在_注册;
177178

178-
public static string 手机号码已存在_换绑手机 => SR.手机号码已存在_换绑手机;
179+
// public static string 手机号码已存在_换绑手机 => SR.手机号码已存在_换绑手机;
179180

180-
public static string 手机号码已存在 => SR.手机号码已存在;
181+
// public static string 手机号码已存在 => SR.手机号码已存在;
181182

182-
public static string 用户不存在 => SR.用户不存在;
183+
// public static string 用户不存在 => SR.用户不存在;
183184

184-
public static string 当前手机号发送短信过于频繁 => SR.当前手机号发送短信过于频繁;
185+
// public static string 当前手机号发送短信过于频繁 => SR.当前手机号发送短信过于频繁;
185186

186-
public static string 当前手机号今日发送短信数量超过最大上限 => SR.当前手机号今日发送短信数量超过最大上限;
187+
// public static string 当前手机号今日发送短信数量超过最大上限 => SR.当前手机号今日发送短信数量超过最大上限;
187188

188-
public static string 短信服务故障 => SR.短信服务故障;
189+
// public static string 短信服务故障 => SR.短信服务故障;
189190

190-
public static string 验证码已过期或不存在 => SR.验证码已过期或不存在;
191+
// public static string 短信服务已停用 => SR.短信服务已停用;
191192

192-
public static string 验证码不正确 => SR.验证码不正确;
193+
// public static string 短信服务已停用_登录或注册 => SR.短信服务已停用_登录或注册;
193194

194-
public static string 新手机号不能与旧手机号一样 => SR.新手机号不能与旧手机号一样;
195+
// public static string 验证码已过期或不存在 => SR.验证码已过期或不存在;
195196

196-
public static string 当前手机号码不存在 => SR.当前手机号码不存在;
197+
// public static string 验证码不正确 => SR.验证码不正确;
197198

198-
public static string AuthorizationFailErrorMessage_ => SR.AuthorizationFailErrorMessage_;
199+
// public static string 新手机号不能与旧手机号一样 => SR.新手机号不能与旧手机号一样;
199200

200-
public static string UserIsBanErrorMessage => SR.UserIsBanErrorMessage;
201+
// public static string 当前手机号码不存在 => SR.当前手机号码不存在;
201202

202-
public static string BindFail_UserIsNotNull => SR.BindFail_UserIsNotNull;
203-
}
203+
// public static string AuthorizationFailErrorMessage_ => SR.AuthorizationFailErrorMessage_;
204+
205+
// public static string UserIsBanErrorMessage => SR.UserIsBanErrorMessage;
206+
207+
// public static string BindFail_UserIsNotNull => SR.BindFail_UserIsNotNull;
208+
//}
204209

205210
/// <summary>
206211
/// 模型验证长度限定值

0 commit comments

Comments
 (0)