Skip to content

Commit 0c45daf

Browse files
ChrisPulmanChrisPulman
authored
Housekeeping Add SDK version 7 (#575)
1 parent 3a59d0b commit 0c45daf

File tree

8 files changed

+19
-33
lines changed

8 files changed

+19
-33
lines changed

‎src/Directory.build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</ItemGroup>
4242
<ItemGroup>
4343
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.507" PrivateAssets="all" />
44-
<PackageReference Include="Roslynator.Analyzers" Version="4.5.0" PrivateAssets="All" />
44+
<PackageReference Include="Roslynator.Analyzers" Version="4.6.1" PrivateAssets="All" />
4545
</ItemGroup>
4646
<ItemGroup>
4747
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />

‎src/ReactiveUI.Validation.AndroidSupport/ReactiveUI.Validation.AndroidSupport.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<PackageId>ReactiveUI.Validation.AndroidSupport</PackageId>
77
<NoWarn>$(NoWarn);CS1591</NoWarn>
88
<Nullable>enable</Nullable>
9-
<LangVersion>latest</LangVersion>
109
</PropertyGroup>
1110

1211
<ItemGroup>

‎src/ReactiveUI.Validation.AndroidX/ReactiveUI.Validation.AndroidX.csproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<Project Sdk="MSBuild.Sdk.Extras">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;net6.0-android;net7.0-android</TargetFrameworks>
4+
<TargetFrameworks>MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;net7.0-android</TargetFrameworks>
55
<PackageDescription>Provides ReactiveUI.Validation extensions for the AndroidX Library</PackageDescription>
66
<PackageId>ReactiveUI.Validation.AndroidX</PackageId>
77
<NoWarn>$(NoWarn);CS1591</NoWarn>
88
<Nullable>enable</Nullable>
9-
<LangVersion>latest</LangVersion>
109
</PropertyGroup>
1110

1211
<ItemGroup>

‎src/ReactiveUI.Validation.Tests/ReactiveUI.Validation.Tests.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<TargetFrameworks>net6.0</TargetFrameworks>
55
<NoWarn>$(NoWarn);1591;CA1707;SA1633</NoWarn>
6-
<LangVersion>latest</LangVersion>
76
</PropertyGroup>
87

98
<ItemGroup>

‎src/ReactiveUI.Validation/Formatters/SingleLineFormatter.cs

+6-10
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@ namespace ReactiveUI.Validation.Formatters;
1212
/// <summary>
1313
/// Helper class to generate a single formatted line for a <see cref="IValidationText" />.
1414
/// </summary>
15-
public class SingleLineFormatter : IValidationTextFormatter<string>
15+
/// <remarks>
16+
/// Initializes a new instance of the <see cref="SingleLineFormatter"/> class.
17+
/// </remarks>
18+
/// <param name="separator">Separator string.</param>
19+
public class SingleLineFormatter(string? separator = null) : IValidationTextFormatter<string>
1620
{
17-
private readonly string? _separator;
18-
19-
/// <summary>
20-
/// Initializes a new instance of the <see cref="SingleLineFormatter"/> class.
21-
/// </summary>
22-
/// <param name="separator">Separator string.</param>
23-
public SingleLineFormatter(string? separator = null) => _separator = separator;
24-
2521
/// <summary>
2622
/// Gets the default formatter.
2723
/// </summary>
@@ -35,6 +31,6 @@ public class SingleLineFormatter : IValidationTextFormatter<string>
3531
/// <returns>Returns the string formatted.</returns>
3632
public string Format(IValidationText? validationText) =>
3733
validationText is not null
38-
? validationText.ToSingleLine(_separator)
34+
? validationText.ToSingleLine(separator)
3935
: string.Empty;
4036
}

‎src/ReactiveUI.Validation/ReactiveUI.Validation.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;tizen40;netstandard2.0;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst;net7.0;net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst</TargetFrameworks>
4+
<TargetFrameworks>MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;tizen40;netstandard2.0;net6.0;net7.0;net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst</TargetFrameworks>
55
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462;net472;net6.0-windows;net6.0-windows10.0.17763;net7.0-windows;net7.0-windows10.0.17763</TargetFrameworks>
66
<NoWarn>$(NoWarn);CS1591</NoWarn>
77
<Nullable>enable</Nullable>
8-
<LangVersion>latest</LangVersion>
98
</PropertyGroup>
109

1110
<ItemGroup>

‎src/ReactiveUI.Validation/States/ValidationState.cs

+8-14
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ namespace ReactiveUI.Validation.States;
1111
/// <summary>
1212
/// Represents the validation state of a validation component.
1313
/// </summary>
14-
public class ValidationState : IValidationState
14+
/// <remarks>
15+
/// Initializes a new instance of the <see cref="ValidationState"/> class.
16+
/// </remarks>
17+
/// <param name="isValid">Determines if the property is valid or not.</param>
18+
/// <param name="text">Validation text.</param>
19+
public class ValidationState(bool isValid, IValidationText text) : IValidationState
1520
{
1621
/// <summary>
1722
/// Indicates a valid state.
@@ -28,24 +33,13 @@ public ValidationState(bool isValid, string text)
2833
{
2934
}
3035

31-
/// <summary>
32-
/// Initializes a new instance of the <see cref="ValidationState"/> class.
33-
/// </summary>
34-
/// <param name="isValid">Determines if the property is valid or not.</param>
35-
/// <param name="text">Validation text.</param>
36-
public ValidationState(bool isValid, IValidationText text)
37-
{
38-
IsValid = isValid;
39-
Text = text ?? throw new ArgumentNullException(nameof(text));
40-
}
41-
4236
/// <summary>
4337
/// Gets a value indicating whether the validation is currently valid or not.
4438
/// </summary>
45-
public bool IsValid { get; }
39+
public bool IsValid { get; } = isValid;
4640

4741
/// <summary>
4842
/// Gets the validation text.
4943
/// </summary>
50-
public IValidationText Text { get; }
44+
public IValidationText Text { get; } = text ?? throw new ArgumentNullException(nameof(text));
5145
}

‎src/global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0",
3+
"version": "7.0.400",
44
"rollForward": "latestMinor",
55
"allowPrerelease": true
66
},

0 commit comments

Comments
 (0)