Skip to content
This repository was archived by the owner on Jul 5, 2024. It is now read-only.

Commit 5adbd3c

Browse files
jamesmontemagnojamesmontemagno
committed
update to .net 6
1 parent 729ff0a commit 5adbd3c

File tree

2 files changed

+119
-82
lines changed

2 files changed

+119
-82
lines changed

‎src/Plugin.Settings/CrossSettings.shared.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static ISettings Current
4949

5050
static ISettings CreateSettings()
5151
{
52-
#if NETSTANDARD1_0 || NETSTANDARD2_0
52+
#if NETSTANDARD
5353
return null;
5454
#else
5555
#pragma warning disable IDE0022 // Use expression body for methods

‎src/Plugin.Settings/Plugin.Settings.csproj

Lines changed: 118 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,67 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/1.6.61">
2-
<PropertyGroup>
3-
<TargetFrameworks>netstandard1.0;netstandard2.0;MonoAndroid44;Xamarin.iOS10;uap10.0.15063;Xamarin.TVOS10;Xamarin.WatchOS10;Xamarin.Mac20;netcoreapp2.0;net45;Tizen40</TargetFrameworks>
4-
<AssemblyName>Plugin.Settings</AssemblyName>
5-
<RootNamespace>Plugin.Settings</RootNamespace>
6-
<Product>$(AssemblyName) ($(TargetFramework))</Product>
7-
<AssemblyVersion>1.0.0.0</AssemblyVersion>
8-
<AssemblyFileVersion>1.0.0.0</AssemblyFileVersion>
9-
<Version>1.0.0.0</Version>
10-
<Authors>James Montemagno</Authors>
11-
<PackageId>Xam.Plugins.Settings</PackageId>
12-
<PackOnBuild>true</PackOnBuild>
13-
<PackageIconUrl>https://raw.githubusercontent.com/jamesmontemagno/SettingsPlugin/master/art/icon.png</PackageIconUrl>
14-
<PackageLicenseUrl>https://github.com/jamesmontemagno/SettingsPlugin/blob/master/LICENSE</PackageLicenseUrl>
15-
<Owners>JamesMontemagno</Owners>
16-
<PackageProjectUrl>https://github.com/jamesmontemagno/SettingsPlugin</PackageProjectUrl>
17-
<Summary>Cross-platform settings for Xamarin.iOS, Xamarin.Android, Xamarin.Mac, Xamarin.Forms, and Windows.</Summary>
18-
<PackageTags>xamarin, xamarin.forms, plugin, plugin for xamarin, settings, preferences, settings plugin, ios, android, uwp, tizen</PackageTags>
19-
<Title>Settings Plugin for Xamarin and Windows</Title>
20-
<Description>
21-
Settings Plugin for Xamarin and Windows provides a consistent, cross platform settings/preferences plugin.
22-
23-
This makes it easier to create cross-platform .NET apps and have cross platform settings.
24-
Manage and use all settings from one PCL/NetStandard library and save natively on each platform.
25-
26-
**This plugin stores settings natively on each platform and does NOT save them to Json.
27-
This allows you to use native functionality such as PreferenceActivity on Android.
28-
29-
Support for: Int, Int64, Double, String, DateTime, Bool, Float, Decimal, Guid
30-
31-
You can always serialize and deserialize a string out if needed.**
32-
</Description>
33-
<Copyright>Copyright 2018</Copyright>
34-
<RepositoryUrl>https://github.com/jamesmontemagno/SettingsPlugin</RepositoryUrl>
35-
<PackageReleaseNotes>See: https://github.com/jamesmontemagno/SettingsPlugin </PackageReleaseNotes>
36-
37-
<NeutralLanguage>en</NeutralLanguage>
38-
<LangVersion>default</LangVersion>
39-
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
40-
41-
42-
<GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
43-
44-
<DefineConstants>$(DefineConstants);</DefineConstants>
45-
46-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
47-
</PropertyGroup>
1+
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0;MonoAndroid10.0;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.Mac20;net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-tvos;net6.0-macos;net6.0;net45;Tizen40</TargetFrameworks>
4+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.19041;net6.0-windows10.0.19041;</TargetFrameworks>
5+
<AssemblyName>Plugin.Settings</AssemblyName>
6+
<RootNamespace>Plugin.Settings</RootNamespace>
7+
<Product>$(AssemblyName) ($(TargetFramework))</Product>
8+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
9+
<AssemblyFileVersion>1.0.0.0</AssemblyFileVersion>
10+
<Version>1.0.0.0</Version>
11+
<Authors>James Montemagno</Authors>
12+
<PackageId>Xam.Plugins.Settings</PackageId>
13+
<PackOnBuild>true</PackOnBuild>
14+
<PackageIconUrl>https://raw.githubusercontent.com/jamesmontemagno/SettingsPlugin/master/art/icon.png</PackageIconUrl>
15+
<PackageLicenseUrl>https://github.com/jamesmontemagno/SettingsPlugin/blob/master/LICENSE</PackageLicenseUrl>
16+
<Owners>JamesMontemagno</Owners>
17+
<PackageProjectUrl>https://github.com/jamesmontemagno/SettingsPlugin</PackageProjectUrl>
18+
<Summary>Cross-platform settings for .NET 6, .NET MAUI, Xamarin.iOS, Xamarin.Android, Xamarin.Mac, Xamarin.Forms, and Windows.</Summary>
19+
<PackageTags>xamarin, xamarin.forms, plugin, plugin for xamarin, settings, preferences, settings plugin, ios, android, uwp, tizen</PackageTags>
20+
<Title>Settings Plugin for .NET 6, .NET MAUI, Xamarin, and Windows</Title>
21+
<Description>
22+
Settings Plugin .NET 6, .NET MAUI, Xamarin and Windows provides a consistent, cross platform settings/preferences plugin.
23+
24+
This makes it easier to create cross-platform .NET apps and have cross platform settings.
25+
Manage and use all settings from one PCL/NetStandard library and save natively on each platform.
26+
27+
**This plugin stores settings natively on each platform and does NOT save them to Json.
28+
This allows you to use native functionality such as PreferenceActivity on Android.
29+
30+
Support for: Int, Int64, Double, String, DateTime, Bool, Float, Decimal, Guid
31+
32+
You can always serialize and deserialize a string out if needed.**
33+
</Description>
34+
<Copyright>Copyright 2018</Copyright>
35+
<RepositoryUrl>https://github.com/jamesmontemagno/SettingsPlugin</RepositoryUrl>
36+
<PackageReleaseNotes>See: https://github.com/jamesmontemagno/SettingsPlugin </PackageReleaseNotes>
37+
38+
<NeutralLanguage>en</NeutralLanguage>
39+
<LangVersion>default</LangVersion>
40+
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
41+
42+
43+
<GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
44+
45+
<DefineConstants>$(DefineConstants);</DefineConstants>
46+
47+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
48+
</PropertyGroup>
49+
50+
<!-- platform version number information -->
51+
<PropertyGroup>
52+
<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-ios'))">10.0</SupportedOSPlatformVersion>
53+
<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-tvos'))">10.0</SupportedOSPlatformVersion>
54+
<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-maccatalyst'))">13.1</SupportedOSPlatformVersion>
55+
<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-macos'))">10.14</SupportedOSPlatformVersion>
56+
<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-android'))">21.0</SupportedOSPlatformVersion>
57+
<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows10'))">10.0.17763.0</SupportedOSPlatformVersion>
58+
<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows10'))">10.0.17763.0</TargetPlatformMinVersion>
59+
</PropertyGroup>
60+
61+
<PropertyGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
62+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
63+
</PropertyGroup>
64+
4865
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
4966
<DebugType>full</DebugType>
5067
<DebugSymbols>true</DebugSymbols>
@@ -59,51 +76,71 @@
5976
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
6077
</PropertyGroup>
6178
<ItemGroup Condition=" '$(Configuration)'=='Release' And '$(OS)' == 'Windows_NT' ">
62-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
79+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
6380
</ItemGroup>
6481

6582
<ItemGroup>
66-
<None Include="..\..\nuget\readme.txt" PackagePath="readme.txt" Pack="true" />
67-
<Compile Include="**\*.shared.cs" />
68-
</ItemGroup>
83+
<None Include="..\..\nuget\readme.txt" PackagePath="readme.txt" Pack="true" />
84+
<Compile Include="**\*.shared.cs" />
85+
</ItemGroup>
6986

70-
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
71-
</ItemGroup>
87+
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
88+
</ItemGroup>
7289

73-
<ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
74-
<Compile Include="**\*.uwp.cs" />
75-
</ItemGroup>
90+
<ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
91+
<Compile Include="**\*.uwp.cs" />
92+
</ItemGroup>
7693

77-
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
78-
<Compile Include="**\*.android.cs" />
79-
</ItemGroup>
94+
<ItemGroup Condition=" $(TargetFramework.Contains('-windows')) ">
95+
<Compile Include="**\*.uwp.cs" />
96+
</ItemGroup>
8097

81-
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
82-
<Compile Include="**\*.apple.cs" />
83-
</ItemGroup>
98+
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
99+
<Compile Include="**\*.android.cs" />
100+
</ItemGroup>
84101

102+
<ItemGroup Condition=" $(TargetFramework.Contains('-android')) ">
103+
<Compile Include="**\*.android.cs" />
104+
</ItemGroup>
85105

86-
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.TVOS')) ">
87-
<Compile Include="**\*.apple.cs" />
88-
</ItemGroup>
106+
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
107+
<Compile Include="**\*.apple.cs" />
108+
</ItemGroup>
89109

90-
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.WatchOS')) ">
91-
<Compile Include="**\*.apple.cs" />
92-
</ItemGroup>
110+
<ItemGroup Condition=" $(TargetFramework.Contains('-ios')) ">
111+
<Compile Include="**\*.apple.cs" />
112+
</ItemGroup>
93113

94-
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac')) ">
95-
<Compile Include="**\*.apple.cs" />
96-
</ItemGroup>
97114

98-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net45')) ">
99-
<Compile Include="**\*.dotnet.cs" />
100-
</ItemGroup>
101-
102-
<ItemGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">
103-
<Compile Include="**\*.dotnet.cs" />
104-
</ItemGroup>
115+
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.TVOS')) ">
116+
<Compile Include="**\*.apple.cs" />
117+
</ItemGroup>
105118

106-
<ItemGroup Condition=" $(TargetFramework.StartsWith('Tizen')) ">
107-
<Compile Include="**\*.tizen.cs" />
108-
</ItemGroup>
119+
<ItemGroup Condition=" $(TargetFramework.Contains('-tvos')) ">
120+
<Compile Include="**\*.apple.cs" />
121+
</ItemGroup>
122+
123+
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.WatchOS')) ">
124+
<Compile Include="**\*.apple.cs" />
125+
</ItemGroup>
126+
127+
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac')) ">
128+
<Compile Include="**\*.apple.cs" />
129+
</ItemGroup>
130+
131+
<ItemGroup Condition=" $(TargetFramework.Contains('-mac')) ">
132+
<Compile Include="**\*.apple.cs" />
133+
</ItemGroup>
134+
135+
<ItemGroup Condition=" $(TargetFramework.StartsWith('net45')) ">
136+
<Compile Include="**\*.dotnet.cs" />
137+
</ItemGroup>
138+
139+
<ItemGroup Condition=" $(TargetFramework.Equals('net6.0')) ">
140+
<Compile Include="**\*.dotnet.cs" />
141+
</ItemGroup>
142+
143+
<ItemGroup Condition=" $(TargetFramework.StartsWith('Tizen')) ">
144+
<Compile Include="**\*.tizen.cs" />
145+
</ItemGroup>
109146
</Project>

0 commit comments

Comments
 (0)