progress on net6 xamarin support #467 -- use Xamarin.Legacy.Sdk, supe…

…r-helpful package suggested by @jpobst. change commands in build script to use dotnet build now instead of old desktop msbuild. as indicated in xamarin/Xamarin.Legacy.Sdk#34 , tvos is not supported, so for now, this commit changes tvos build to net6 without including support for legacy. none of this is tested yet.
ericsink · Jan 28, 2022 · b6951fb · b6951fb
1 parent a0b19fa
commit b6951fb
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 26 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
     <Copyright>Copyright 2014-2021 SourceGear, LLC</Copyright>
     <Company>SourceGear</Company>
     <Authors>Eric Sink</Authors>
-    <Version>2.0.8-pre20220128122014</Version>
+    <Version>2.0.8-pre20220128123315</Version>
     <AssemblyVersion>2.0.8.1488</AssemblyVersion>
     <FileVersion>2.0.8.1488</FileVersion>
     <Description>SQLitePCLRaw is a Portable Class Library (PCL) for low-level (raw) access to SQLite</Description>

diff --git a/build/Program.fs b/build/Program.fs
@@ -123,8 +123,9 @@ let main argv =
     for s in msbuild_dirs do
         let dir_name = sprintf "SQLitePCLRaw.%s" s
         let dir = (Path.Combine(top, "src", dir_name))
-        exec "dotnet" "restore" dir
-        exec "msbuild" "/p:Configuration=Release" dir
+        //exec "dotnet" "restore" dir
+        //exec "msbuild" "/p:Configuration=Release" dir
+        exec "dotnet" "build -c Release" dir
 
     let msbuild_pack_dirs = [
         "lib.e_sqlite3.android"
@@ -136,8 +137,9 @@ let main argv =
     for s in msbuild_pack_dirs do
         let dir_name = sprintf "SQLitePCLRaw.%s" s
         let dir = (Path.Combine(top, "src", dir_name))
-        exec "dotnet" "restore" dir
-        exec "msbuild" "/p:Configuration=Release /t:pack" dir
+        //exec "dotnet" "restore" dir
+        //exec "msbuild" "/p:Configuration=Release /t:pack" dir
+        exec "dotnet" "pack -c Release" dir
 
     let get_build_prop p =
         let path_xml = Path.Combine(top, "Directory.Build.props")

diff --git a/...ies_v2.e_sqlcipher.internal.ios/SQLitePCLRaw.batteries_v2.e_sqlcipher.internal.ios.csproj b/...ies_v2.e_sqlcipher.internal.ios/SQLitePCLRaw.batteries_v2.e_sqlcipher.internal.ios.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Xamarin.Legacy.Sdk">
   <PropertyGroup>
-	<TargetFrameworks>xamarin.ios10</TargetFrameworks>
+	<TargetFrameworks>net6-ios;xamarin.ios10</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
 	<AssemblyName>SQLitePCLRaw.batteries_v2</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.batteries_v2.snk</AssemblyOriginatorKeyFile>

diff --git a/...tteries_v2.e_sqlite3.internal.ios/SQLitePCLRaw.batteries_v2.e_sqlite3.internal.ios.csproj b/...tteries_v2.e_sqlite3.internal.ios/SQLitePCLRaw.batteries_v2.e_sqlite3.internal.ios.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Xamarin.Legacy.Sdk">
   <PropertyGroup>
-	<TargetFrameworks>xamarin.ios10</TargetFrameworks>
+    <TargetFrameworks>net6-ios;xamarin.ios10</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
 	<AssemblyName>SQLitePCLRaw.batteries_v2</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.batteries_v2.snk</AssemblyOriginatorKeyFile>

diff --git a/...eries_v2.e_sqlite3.internal.tvos/SQLitePCLRaw.batteries_v2.e_sqlite3.internal.tvos.csproj b/...eries_v2.e_sqlite3.internal.tvos/SQLitePCLRaw.batteries_v2.e_sqlite3.internal.tvos.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Xamarin.Legacy.Sdk">
   <PropertyGroup>
-	<TargetFrameworks>xamarin.tvos10</TargetFrameworks>
+	<TargetFrameworks>net6-tvos</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
 	<AssemblyName>SQLitePCLRaw.batteries_v2</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.batteries_v2.snk</AssemblyOriginatorKeyFile>

diff --git a/...tteries_v2.sqlcipher.internal.ios/SQLitePCLRaw.batteries_v2.sqlcipher.internal.ios.csproj b/...tteries_v2.sqlcipher.internal.ios/SQLitePCLRaw.batteries_v2.sqlcipher.internal.ios.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Xamarin.Legacy.Sdk">
   <PropertyGroup>
-	<TargetFrameworks>xamarin.ios10</TargetFrameworks>
+	<TargetFrameworks>net6-ios;xamarin.ios10</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
 	<AssemblyName>SQLitePCLRaw.batteries_v2</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.batteries_v2.snk</AssemblyOriginatorKeyFile>

diff --git a/src/SQLitePCLRaw.lib.e_sqlcipher.android/SQLitePCLRaw.lib.e_sqlcipher.android.csproj b/src/SQLitePCLRaw.lib.e_sqlcipher.android/SQLitePCLRaw.lib.e_sqlcipher.android.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Xamarin.Legacy.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>MonoAndroid80</TargetFrameworks>
+		<TargetFrameworks>net6-android;MonoAndroid80</TargetFrameworks>
 		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlcipher.snk</AssemblyOriginatorKeyFile>

diff --git a/src/SQLitePCLRaw.lib.e_sqlcipher.ios/SQLitePCLRaw.lib.e_sqlcipher.ios.csproj b/src/SQLitePCLRaw.lib.e_sqlcipher.ios/SQLitePCLRaw.lib.e_sqlcipher.ios.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Xamarin.Legacy.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>xamarin.ios10</TargetFrameworks>
+		<TargetFrameworks>net6-ios;xamarin.ios10</TargetFrameworks>
 		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlcipher.snk</AssemblyOriginatorKeyFile>

diff --git a/src/SQLitePCLRaw.lib.e_sqlite3.android/SQLitePCLRaw.lib.e_sqlite3.android.csproj b/src/SQLitePCLRaw.lib.e_sqlite3.android/SQLitePCLRaw.lib.e_sqlite3.android.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Xamarin.Legacy.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>MonoAndroid80</TargetFrameworks>
+		<TargetFrameworks>net6-android;MonoAndroid80</TargetFrameworks>
 		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlite3.snk</AssemblyOriginatorKeyFile>

diff --git a/src/SQLitePCLRaw.lib.e_sqlite3.ios/SQLitePCLRaw.lib.e_sqlite3.ios.csproj b/src/SQLitePCLRaw.lib.e_sqlite3.ios/SQLitePCLRaw.lib.e_sqlite3.ios.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Xamarin.Legacy.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>xamarin.ios10</TargetFrameworks>
+		<TargetFrameworks>net6-ios;xamarin.ios10</TargetFrameworks>
 		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlite3.snk</AssemblyOriginatorKeyFile>

diff --git a/src/SQLitePCLRaw.lib.e_sqlite3.tvos/SQLitePCLRaw.lib.e_sqlite3.tvos.csproj b/src/SQLitePCLRaw.lib.e_sqlite3.tvos/SQLitePCLRaw.lib.e_sqlite3.tvos.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Xamarin.Legacy.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>xamarin.tvos10</TargetFrameworks>
+		<TargetFrameworks>net6-tvos</TargetFrameworks>
 		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlite3.snk</AssemblyOriginatorKeyFile>

diff --git a/...itePCLRaw.lib.sqlcipher.ios.placeholder/SQLitePCLRaw.lib.sqlcipher.ios.placeholder.csproj b/...itePCLRaw.lib.sqlcipher.ios.placeholder/SQLitePCLRaw.lib.sqlcipher.ios.placeholder.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Xamarin.Legacy.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>xamarin.ios10</TargetFrameworks>
+		<TargetFrameworks>net6-ios;xamarin.ios10</TargetFrameworks>
 		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyName>SQLitePCLRaw.lib.sqlcipher</AssemblyName>

diff --git a/src/global.json b/src/global.json
@@ -1,6 +1,7 @@
 {
 	"msbuild-sdks": 
 	{
-		"MSBuild.Sdk.Extras": "2.0.54"
+		"MSBuild.Sdk.Extras": "2.0.54",
+		"Xamarin.Legacy.Sdk": "0.1.2-alpha6"
 	}
 }