Skip to content

Commit 45068e9

Browse files
ChrisPulmanChrisPulman
authored
Housekeeping Retire Net 7, clean up (#1145)
1 parent 8977918 commit 45068e9

File tree

37 files changed

+178
-275
lines changed

37 files changed

+178
-275
lines changed

‎.editorconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ dotnet_diagnostic.SA1006.severity = error
255255
dotnet_diagnostic.SA1007.severity = error
256256
dotnet_diagnostic.SA1008.severity = error
257257
dotnet_diagnostic.SA1009.severity = error
258-
dotnet_diagnostic.SA1010.severity = suggestion
258+
dotnet_diagnostic.SA1010.severity = none
259259
dotnet_diagnostic.SA1011.severity = error
260260
dotnet_diagnostic.SA1012.severity = error
261261
dotnet_diagnostic.SA1013.severity = error
@@ -418,6 +418,8 @@ dotnet_diagnostic.SX1101.severity = error
418418
dotnet_diagnostic.SX1309.severity = error
419419
dotnet_diagnostic.SX1623.severity = none
420420

421+
dotnet_diagnostic.VSSpell001.severity = none
422+
421423
# C++ Files
422424
[*.{cpp,h,in}]
423425
curly_bracket_next_line = true

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Splat currently supports:
7373

7474
[Always Be NuGetting](https://nuget.org/packages/Splat/). Package contains binaries for:
7575

76-
* .NET Framework 4.6.2, .NET Framework 4.7.2, .NET Standard 2.0, .NET 6.0, .NET 7.0, and .NET 8.0
76+
* .NET Framework 4.6.2, .NET Framework 4.7.2, .NET Standard 2.0, .NET 6.0, and .NET 8.0
7777
- Works with:
7878
* WPF
7979
* Windows Forms

‎src/Directory.build.props

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageIconUrl>https://github.com/reactiveui/styleguide/blob/master/logo_splat/logo.png?raw=true</PackageIconUrl>
1313
<PackageDescription>A library to make things cross-platform that should be.</PackageDescription>
1414
<PublishRepositoryUrl>true</PublishRepositoryUrl>
15-
<Owners>xanaisbettsx;ghuntley</Owners>
15+
<Owners>anaisbetts;ghuntley</Owners>
1616
<PackageTags>drawing;colours;geometry;logging;unit test detection;service location;image handling;portable;xamarin;xamarin ios;xamarin mac;android;monodroid;uwp;net45</PackageTags>
1717
<PackageReleaseNotes>https://github.com/reactiveui/splat/releases</PackageReleaseNotes>
1818
<RepositoryUrl>https://github.com/reactiveui/splat</RepositoryUrl>
@@ -27,7 +27,6 @@
2727
<ImplicitUsings>true</ImplicitUsings>
2828
<LangVersion>preview</LangVersion>
2929
<Nullable>enable</Nullable>
30-
<NoWarn>$(NoWarn);VSSpell001;SA1010</NoWarn>
3130
<!-- disable sourcelink on mono, to workaround https://github.com/dotnet/sourcelink/issues/155 -->
3231
<EnableSourceLink Condition=" '$(OS)' != 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">false</EnableSourceLink>
3332
<EnableSourceControlManagerQueries>$(EnableSourceLink)</EnableSourceControlManagerQueries>
@@ -37,16 +36,12 @@
3736
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3837
<!-- Include PDB in the built .nupkg -->
3938
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
40-
<SplatTargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</SplatTargetFrameworks>
41-
<SplatWindowsTargetFrameworks>net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</SplatWindowsTargetFrameworks>
39+
<SplatTargetFrameworks>netstandard2.0;net6.0;net8.0</SplatTargetFrameworks>
40+
<SplatWindowsTargetFrameworks>net6.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</SplatWindowsTargetFrameworks>
4241
</PropertyGroup>
4342
<PropertyGroup Condition="$(IsTestProject) != 'true'">
4443
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
4544
</PropertyGroup>
46-
<!-- MonoAndroid doesn't seem to want to allow debugging for maintainers -->
47-
<PropertyGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
48-
<DebugType>Full</DebugType>
49-
</PropertyGroup>
5045
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
5146
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
5247
</PropertyGroup>

‎src/Directory.build.targets

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,6 @@
77
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
88
<DefineConstants>$(DefineConstants);NET_45;XAML</DefineConstants>
99
</PropertyGroup>
10-
<PropertyGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
11-
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
12-
</PropertyGroup>
13-
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS'))">
14-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
15-
</PropertyGroup>
16-
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac'))">
17-
<DefineConstants>$(DefineConstants);MONO;COCOA</DefineConstants>
18-
</PropertyGroup>
19-
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.TVOS'))">
20-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
21-
</PropertyGroup>
22-
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.WatchOS'))">
23-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA</DefineConstants>
24-
</PropertyGroup>
2510
<PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
2611
<DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
2712
</PropertyGroup>
@@ -40,7 +25,7 @@
4025
<PropertyGroup Condition="$(TargetFramework.EndsWith('0-android'))">
4126
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
4227
</PropertyGroup>
43-
<PropertyGroup Condition="$(TargetFramework.Equals('net6.0')) or $(TargetFramework.Equals('net7.0')) or $(TargetFramework.Equals('net8.0')) or $(TargetFramework.Equals('netstandard2.1')) or $(TargetFramework.Equals('netstandard2.0'))">
28+
<PropertyGroup Condition="$(TargetFramework.Equals('net6.0')) or $(TargetFramework.Equals('net8.0')) or $(TargetFramework.Equals('netstandard2.1')) or $(TargetFramework.Equals('netstandard2.0'))">
4429
<DefineConstants>$(DefineConstants);IS_SHARED_NET</DefineConstants>
4530
</PropertyGroup>
4631
</Project>

‎src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0;</TargetFrameworks>
3+
<TargetFrameworks>net472;net8.0;</TargetFrameworks>
44
<NoWarn>$(NoWarn);1591;CA1707;SA1633;CA2000</NoWarn>
55
<IsPackable>false</IsPackable>
66
<Nullable>enable</Nullable>
@@ -14,7 +14,7 @@
1414
<ProjectReference Include="..\Splat.Autofac\Splat.Autofac.csproj" />
1515
</ItemGroup>
1616
</When>
17-
<When Condition="$(TargetFramework.StartsWith('net6.0'))">
17+
<When Condition="$(TargetFramework.StartsWith('net8.0'))">
1818
<ItemGroup>
1919
<Compile Remove="AutoFacReactiveUIDependencyTests.cs" />
2020
<Compile Remove="NinjectReactiveUIDependencyTests.cs" />

‎src/Splat.ApplicationInsights/ApplicationInsightsViewTracking.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,5 @@ public void OnViewNavigation(PageViewTelemetry telemetry)
3636
_telemetryClient.TrackPageView(telemetry);
3737
}
3838

39-
internal static PageViewTelemetry GetPageViewTelemetry()
40-
{
41-
var result = new PageViewTelemetry();
42-
return result;
43-
}
39+
internal static PageViewTelemetry GetPageViewTelemetry() => new();
4440
}

‎src/Splat.Autofac.Tests/Splat.Autofac.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0-windows10.0.17763.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0-windows10.0.17763.0</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77
<NoWarn>$(NoWarn);1591;CA1707;SA1633;CA2000;CA1851</NoWarn>

‎src/Splat.Autofac/AutofacDependencyResolver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public virtual IEnumerable<object> GetServices(Type? serviceType, string? contra
109109
// no op
110110
}
111111

112-
return Array.Empty<object>();
112+
return [];
113113
}
114114
}
115115

‎src/Splat.Avalonia.DryIoc2.Tests/Splat.Avalonia.DryIoc2.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<NoWarn>$(NoWarn);1591;CA1707;SA1600;SA1601;SA1633;CA2000</NoWarn>

‎src/Splat.Avalonia.Microsoft2.Tests/Splat.Avalonia.Microsoft2.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<NoWarn>$(NoWarn);1591;CA1707;SA1600;SA1601;SA1633;CA2000</NoWarn>

0 commit comments

Comments
 (0)