Skip to content

Commit 5da3018

Browse files
ericsinkericsink
committed
fix supported platform versions for ios and maccatalyst along the lines of #471 -- deal with a few other cases too, by putting all these in Directory.Build.props, generated by version_stamp, so they can be changed in a single place. Platform TFMs should have a version number for the platform.net6.0-android is still kinda wrong in this respect, TODO.
1 parent 91bd15c commit 5da3018

File tree

11 files changed

+43
-33
lines changed

11 files changed

+43
-33
lines changed

‎Directory.Build.props‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<Copyright>Copyright 2014-2022 SourceGear, LLC</Copyright>
55
<Company>SourceGear</Company>
66
<Authors>Eric Sink</Authors>
7-
<Version>2.1.0-pre20220427114414</Version>
8-
<AssemblyVersion>2.1.0.1577</AssemblyVersion>
9-
<FileVersion>2.1.0.1577</FileVersion>
7+
<Version>2.1.0-pre20220428150518</Version>
8+
<AssemblyVersion>2.1.0.1578</AssemblyVersion>
9+
<FileVersion>2.1.0.1578</FileVersion>
1010
<Description>SQLitePCLRaw is a Portable Class Library (PCL) for low-level (raw) access to SQLite</Description>
1111
<ProviderLangVersion>10.0</ProviderLangVersion>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -22,7 +22,12 @@
2222
<depversion_xunit>2.4.1</depversion_xunit>
2323
<depversion_xunit_runner_visualstudio>2.4.1</depversion_xunit_runner_visualstudio>
2424
<depversion_microsoft_net_test_sdk>15.0.0</depversion_microsoft_net_test_sdk>
25-
<monoandroid_tfm>monoandroid9.0</monoandroid_tfm>
25+
<tfm_classic_android>monoandroid9.0</tfm_classic_android>
26+
<tfm_classic_ios>xamarin.ios10</tfm_classic_ios>
27+
<tfm_net6_ios>net6.0-ios14.2</tfm_net6_ios>
28+
<tfm_net6_tvos>net6.0-tvos10</tfm_net6_tvos>
29+
<tfm_net6_maccatalyst>net6.0-ios14.0</tfm_net6_maccatalyst>
30+
<tfm_net6_android>net6.0-android</tfm_net6_android>
2631
<!--The NoNFloatUsing below is a workaround for xamarin/xamarin-macios/#14434-->
2732
<NoNFloatUsing>true</NoNFloatUsing>
2833
</PropertyGroup>

‎src/SQLitePCLRaw.bundle_e_sqlcipher/SQLitePCLRaw.bundle_e_sqlcipher.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Xamarin.Legacy.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net6.0-ios;net6.0-maccatalyst;net6.0-android;xamarin.ios10;$(monoandroid_tfm);net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;$(tfm_net6_ios);$(tfm_net6_maccatalyst);$(tfm_net6_android);$(tfm_classic_ios);$(tfm_classic_android);net461</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<PackageId>SQLitePCLRaw.bundle_e_sqlcipher</PackageId>
77
<AssemblyName>SQLitePCLRaw.batteries_v2</AssemblyName>
@@ -15,11 +15,11 @@
1515
</ItemGroup>
1616

1717
<Import Condition=" '$(TargetFramework)' == 'netstandard2.0' " Project="..\msbuild_bundle_fragments\e_sqlcipher_dllimport.xml" />
18-
<Import Condition=" '$(TargetFramework)' == 'net6.0-ios' " Project="..\msbuild_bundle_fragments\e_sqlcipher_ios.xml" />
19-
<Import Condition=" '$(TargetFramework)' == 'net6.0-maccatalyst' " Project="..\msbuild_bundle_fragments\e_sqlcipher_dllimport.xml" />
20-
<Import Condition=" '$(TargetFramework)' == 'net6.0-android' " Project="..\msbuild_bundle_fragments\e_sqlcipher_android.xml" />
21-
<Import Condition=" '$(TargetFramework)' == 'xamarin.ios10' " Project="..\msbuild_bundle_fragments\e_sqlcipher_ios.xml" />
22-
<Import Condition=" '$(TargetFramework)' == '$(monoandroid_tfm)' " Project="..\msbuild_bundle_fragments\e_sqlcipher_android.xml" />
18+
<Import Condition=" '$(TargetFramework)' == '$(tfm_net6_ios)' " Project="..\msbuild_bundle_fragments\e_sqlcipher_ios.xml" />
19+
<Import Condition=" '$(TargetFramework)' == '$(tfm_net6_maccatalyst)' " Project="..\msbuild_bundle_fragments\e_sqlcipher_dllimport.xml" />
20+
<Import Condition=" '$(TargetFramework)' == '$(tfm_net6_android)' " Project="..\msbuild_bundle_fragments\e_sqlcipher_android.xml" />
21+
<Import Condition=" '$(TargetFramework)' == '$(tfm_classic_ios)' " Project="..\msbuild_bundle_fragments\e_sqlcipher_ios.xml" />
22+
<Import Condition=" '$(TargetFramework)' == '$(tfm_classic_android)' " Project="..\msbuild_bundle_fragments\e_sqlcipher_android.xml" />
2323
<Import Condition=" '$(TargetFramework)' == 'net461' " Project="..\msbuild_bundle_fragments\e_sqlcipher_dynamic.xml" />
2424

2525
</Project>

‎src/SQLitePCLRaw.bundle_e_sqlite3/SQLitePCLRaw.bundle_e_sqlite3.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Xamarin.Legacy.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net6.0-ios;net6.0-maccatalyst;net6.0-android;xamarin.ios10;$(monoandroid_tfm);net461;net6.0-tvos10</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;$(tfm_net6_ios);$(tfm_net6_maccatalyst);$(tfm_net6_android);$(tfm_classic_ios);$(tfm_classic_android);net461;$(tfm_net6_tvos)</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<PackageId>SQLitePCLRaw.bundle_e_sqlite3</PackageId>
77
<AssemblyName>SQLitePCLRaw.batteries_v2</AssemblyName>
@@ -15,13 +15,13 @@
1515
</ItemGroup>
1616

1717
<Import Condition=" '$(TargetFramework)' == 'netstandard2.0' " Project="..\msbuild_bundle_fragments\e_sqlite3_dllimport.xml" />
18-
<Import Condition=" '$(TargetFramework)' == 'net6.0-ios' " Project="..\msbuild_bundle_fragments\e_sqlite3_ios.xml" />
19-
<Import Condition=" '$(TargetFramework)' == 'net6.0-maccatalyst' " Project="..\msbuild_bundle_fragments\e_sqlite3_dllimport.xml" />
20-
<Import Condition=" '$(TargetFramework)' == 'net6.0-android' " Project="..\msbuild_bundle_fragments\e_sqlite3_android.xml" />
21-
<Import Condition=" '$(TargetFramework)' == 'xamarin.ios10' " Project="..\msbuild_bundle_fragments\e_sqlite3_ios.xml" />
22-
<Import Condition=" '$(TargetFramework)' == '$(monoandroid_tfm)' " Project="..\msbuild_bundle_fragments\e_sqlite3_android.xml" />
18+
<Import Condition=" '$(TargetFramework)' == '$(tfm_net6_ios)' " Project="..\msbuild_bundle_fragments\e_sqlite3_ios.xml" />
19+
<Import Condition=" '$(TargetFramework)' == '$(tfm_net6_maccatalyst)' " Project="..\msbuild_bundle_fragments\e_sqlite3_dllimport.xml" />
20+
<Import Condition=" '$(TargetFramework)' == '$(tfm_net6_android)' " Project="..\msbuild_bundle_fragments\e_sqlite3_android.xml" />
21+
<Import Condition=" '$(TargetFramework)' == '$(tfm_classic_ios)' " Project="..\msbuild_bundle_fragments\e_sqlite3_ios.xml" />
22+
<Import Condition=" '$(TargetFramework)' == '$(tfm_classic_android)' " Project="..\msbuild_bundle_fragments\e_sqlite3_android.xml" />
2323
<Import Condition=" '$(TargetFramework)' == 'net461' " Project="..\msbuild_bundle_fragments\e_sqlite3_dynamic.xml" />
24-
<Import Condition=" '$(TargetFramework)' == 'net6.0-tvos10' " Project="..\msbuild_bundle_fragments\e_sqlite3_tvos.xml" />
24+
<Import Condition=" '$(TargetFramework)' == '$(tfm_net6_tvos)' " Project="..\msbuild_bundle_fragments\e_sqlite3_tvos.xml" />
2525

2626
</Project>
2727

‎src/SQLitePCLRaw.bundle_green/SQLitePCLRaw.bundle_green.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Xamarin.Legacy.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net6.0-ios;net6.0-maccatalyst;net6.0-android;xamarin.ios10;$(monoandroid_tfm);net461;net6.0-tvos10</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;$(tfm_net6_ios);$(tfm_net6_maccatalyst);$(tfm_net6_android);$(tfm_classic_ios);$(tfm_classic_android);net461;$(tfm_net6_tvos)</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<PackageId>SQLitePCLRaw.bundle_green</PackageId>
77
<AssemblyName>SQLitePCLRaw.batteries_v2</AssemblyName>
@@ -15,13 +15,13 @@
1515
</ItemGroup>
1616

1717
<Import Condition=" '$(TargetFramework)' == 'netstandard2.0' " Project="..\msbuild_bundle_fragments\e_sqlite3_dllimport.xml" />
18-
<Import Condition=" '$(TargetFramework)' == 'net6.0-ios' " Project="..\msbuild_bundle_fragments\sqlite3_dllimport.xml" />
19-
<Import Condition=" '$(TargetFramework)' == 'net6.0-maccatalyst' " Project="..\msbuild_bundle_fragments\sqlite3_dllimport.xml" />
20-
<Import Condition=" '$(TargetFramework)' == 'net6.0-android' " Project="..\msbuild_bundle_fragments\e_sqlite3_android.xml" />
21-
<Import Condition=" '$(TargetFramework)' == 'xamarin.ios10' " Project="..\msbuild_bundle_fragments\sqlite3_dllimport.xml" />
22-
<Import Condition=" '$(TargetFramework)' == '$(monoandroid_tfm)' " Project="..\msbuild_bundle_fragments\e_sqlite3_android.xml" />
18+
<Import Condition=" '$(TargetFramework)' == '$(tfm_net6_ios)' " Project="..\msbuild_bundle_fragments\sqlite3_dllimport.xml" />
19+
<Import Condition=" '$(TargetFramework)' == '$(tfm_net6_maccatalyst)' " Project="..\msbuild_bundle_fragments\sqlite3_dllimport.xml" />
20+
<Import Condition=" '$(TargetFramework)' == '$(tfm_net6_android)' " Project="..\msbuild_bundle_fragments\e_sqlite3_android.xml" />
21+
<Import Condition=" '$(TargetFramework)' == '$(tfm_classic_ios)' " Project="..\msbuild_bundle_fragments\sqlite3_dllimport.xml" />
22+
<Import Condition=" '$(TargetFramework)' == '$(tfm_classic_android)' " Project="..\msbuild_bundle_fragments\e_sqlite3_android.xml" />
2323
<Import Condition=" '$(TargetFramework)' == 'net461' " Project="..\msbuild_bundle_fragments\e_sqlite3_dynamic.xml" />
24-
<Import Condition=" '$(TargetFramework)' == 'net6.0-tvos10' " Project="..\msbuild_bundle_fragments\e_sqlite3_tvos.xml" />
24+
<Import Condition=" '$(TargetFramework)' == '$(tfm_net6_tvos)' " Project="..\msbuild_bundle_fragments\e_sqlite3_tvos.xml" />
2525

2626
</Project>
2727

‎src/SQLitePCLRaw.bundle_zetetic/SQLitePCLRaw.bundle_zetetic.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Xamarin.Legacy.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net6.0-ios;xamarin.ios10;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;$(tfm_net6_ios);$(tfm_classic_ios);net461</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<PackageId>SQLitePCLRaw.bundle_zetetic</PackageId>
77
<AssemblyName>SQLitePCLRaw.batteries_v2</AssemblyName>
@@ -15,8 +15,8 @@
1515
</ItemGroup>
1616

1717
<Import Condition=" '$(TargetFramework)' == 'netstandard2.0' " Project="..\msbuild_bundle_fragments\sqlcipher_dllimport.xml" />
18-
<Import Condition=" '$(TargetFramework)' == 'net6.0-ios' " Project="..\msbuild_bundle_fragments\sqlcipher_ios.xml" />
19-
<Import Condition=" '$(TargetFramework)' == 'xamarin.ios10' " Project="..\msbuild_bundle_fragments\sqlcipher_ios.xml" />
18+
<Import Condition=" '$(TargetFramework)' == '$(tfm_net6_ios)' " Project="..\msbuild_bundle_fragments\sqlcipher_ios.xml" />
19+
<Import Condition=" '$(TargetFramework)' == '$(tfm_classic_ios)' " Project="..\msbuild_bundle_fragments\sqlcipher_ios.xml" />
2020
<Import Condition=" '$(TargetFramework)' == 'net461' " Project="..\msbuild_bundle_fragments\sqlcipher_dynamic.xml" />
2121

2222
</Project>

‎src/SQLitePCLRaw.lib.e_sqlcipher.android/SQLitePCLRaw.lib.e_sqlcipher.android.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Xamarin.Legacy.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0-android;$(monoandroid_tfm)</TargetFrameworks>
3+
<TargetFrameworks>$(tfm_net6_android);$(tfm_classic_android)</TargetFrameworks>
44
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlcipher.snk</AssemblyOriginatorKeyFile>

‎src/SQLitePCLRaw.lib.e_sqlcipher.ios/SQLitePCLRaw.lib.e_sqlcipher.ios.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Xamarin.Legacy.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0-ios;xamarin.ios10</TargetFrameworks>
3+
<TargetFrameworks>$(tfm_net6_ios);$(tfm_classic_ios)</TargetFrameworks>
44
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlcipher.snk</AssemblyOriginatorKeyFile>

‎src/SQLitePCLRaw.lib.e_sqlite3.android/SQLitePCLRaw.lib.e_sqlite3.android.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Xamarin.Legacy.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0-android;$(monoandroid_tfm)</TargetFrameworks>
3+
<TargetFrameworks>$(tfm_net6_android);$(tfm_classic_android)</TargetFrameworks>
44
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlite3.snk</AssemblyOriginatorKeyFile>

‎src/SQLitePCLRaw.lib.e_sqlite3.ios/SQLitePCLRaw.lib.e_sqlite3.ios.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Xamarin.Legacy.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0-ios;xamarin.ios10</TargetFrameworks>
3+
<TargetFrameworks>$(tfm_net6_ios);$(tfm_classic_ios)</TargetFrameworks>
44
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlite3.snk</AssemblyOriginatorKeyFile>

‎src/SQLitePCLRaw.lib.sqlcipher.ios.placeholder/SQLitePCLRaw.lib.sqlcipher.ios.placeholder.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Xamarin.Legacy.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0-ios;xamarin.ios10</TargetFrameworks>
3+
<TargetFrameworks>$(tfm_net6_ios);$(tfm_classic_ios)</TargetFrameworks>
44
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyName>SQLitePCLRaw.lib.sqlcipher</AssemblyName>

0 commit comments

Comments
 (0)