diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe index 8dd7e45a..0cc40884 100644 Binary files a/.nuget/NuGet.exe and b/.nuget/NuGet.exe differ diff --git a/SQLite.Net.sln b/SQLite.Net.sln index e483aa6a..1e42feaa 100644 --- a/SQLite.Net.sln +++ b/SQLite.Net.sln @@ -1,24 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.27428.2015 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{59584026-7610-4CD5-A74E-D2B0A2E1CE87}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Platform.Win32", "src\SQLite.Net.Platform.Win32\SQLite.Net.Platform.Win32.csproj", "{03799AD1-9FCF-48CB-8E6E-B233DF583B10}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Platform.WinRT", "src\SQLite.Net.Platform.WinRT\SQLite.Net.Platform.WinRT.csproj", "{6891E212-AEEE-4763-AC6F-BD7213C13890}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Platform.WindowsPhone8", "src\SQLite.Net.Platform.WindowsPhone8\SQLite.Net.Platform.WindowsPhone8.csproj", "{741521F8-F9D8-40F4-A5D4-AED4E26841ED}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Platform.XamarinIOS", "src\SQLite.Net.Platform.XamarinIOS\SQLite.Net.Platform.XamarinIOS.csproj", "{6377929D-6253-450D-BF4B-3E8ECE2564F7}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Platform.XamarinAndroid", "src\SQLite.Net.Platform.XamarinAndroid\SQLite.Net.Platform.XamarinAndroid.csproj", "{219700F0-5444-4250-87D6-0551B39CA402}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Platform.Generic", "src\SQLite.Net.Platform.Generic\SQLite.Net.Platform.Generic.csproj", "{F662E15A-8753-468E-A67E-3FCF45F12B89}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Platform.WindowsPhoneApp81", "src\SQLite.Net.Platform.WindowsPhoneApp81\SQLite.Net.Platform.WindowsPhoneApp81.csproj", "{38AF8105-65B6-4A14-A258-1137D9E40EF1}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Platform.XamarinIOS.Unified", "src\SQLite.Net.Platform.XamarinIOS.Unified\SQLite.Net.Platform.XamarinIOS.Unified.csproj", "{3173703F-8B1F-4772-9AE3-44913F413FB1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Platform.OSX", "src\SQLite.Net.Platform.OSX\SQLite.Net.Platform.OSX.csproj", "{03799AD1-9FCF-48CB-8E6E-B233DF583B11}" @@ -27,16 +19,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{0C4021EF EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Tests.Win32", "tests\SQLite.Net.Tests.Win32\SQLite.Net.Tests.Win32.csproj", "{BFF4B373-2844-40AD-8994-2BA5AC42AEE0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Tests.XamarinIOS", "tests\SQLite.Net.Tests.XamarinIOS\SQLite.Net.Tests.XamarinIOS.csproj", "{4B386F57-D313-4842-AE9B-F54EDBF1EBD5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Tests.WinRT", "tests\SQLite.Net.Tests.WinRT\SQLite.Net.Tests.WinRT.csproj", "{5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Tests.XamarinAndroid", "tests\SQLite.Net.Tests.XamarinAndroid\SQLite.Net.Tests.XamarinAndroid.csproj", "{2C3224FB-4513-4A16-B67F-3C4F1BDC7765}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Tests.Generic", "tests\SQLite.Net.Tests.Generic\SQLite.Net.Tests.Generic.csproj", "{C129735F-5D4B-40BE-9410-F43E548FFF5E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Tests.WindowsPhone8", "tests\SQLite.Net.Tests.WindowsPhone8\SQLite.Net.Tests.WindowsPhone8.csproj", "{46DF3E43-6B65-4C3D-8911-64FCC301040F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Tests.XamarinIOS.Unified", "tests\SQLite.Net.Tests.XamarinIOS.Unified\SQLite.Net.Tests.XamarinIOS.Unified.csproj", "{0A947CD1-3C6F-415A-A122-233BAE3005FD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Tests.OSX", "tests\SQLite.Net.Tests.OSX\SQLite.Net.Tests.OSX.csproj", "{8EA10208-DC51-48A1-A0FE-726FEE55DE79}" @@ -52,9 +38,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{5BD976 .nuget\NuGet.targets = .nuget\NuGet.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net", "src\SQLite.Net\SQLite.Net.csproj", "{4971D437-0694-4297-A8CC-146CE08C3BD9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLite.Net", "src\SQLite.Net\SQLite.Net.csproj", "{4971D437-0694-4297-A8CC-146CE08C3BD9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Net.Async", "src\SQLite.Net.Async\SQLite.Net.Async.csproj", "{3AB34E91-8E1A-442F-8E66-2494B371A890}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLite.Net.Async", "src\SQLite.Net.Async\SQLite.Net.Async.csproj", "{3AB34E91-8E1A-442F-8E66-2494B371A890}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -129,143 +115,6 @@ Global {03799AD1-9FCF-48CB-8E6E-B233DF583B10}.Release|x64.Build.0 = Release|Any CPU {03799AD1-9FCF-48CB-8E6E-B233DF583B10}.Release|x86.ActiveCfg = Release|Any CPU {03799AD1-9FCF-48CB-8E6E-B233DF583B10}.Release|x86.Build.0 = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Ad-Hoc|ARM.ActiveCfg = Release|ARM - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Ad-Hoc|ARM.Build.0 = Release|ARM - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Ad-Hoc|Mixed Platforms.Build.0 = Release|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Ad-Hoc|x64.ActiveCfg = Release|x64 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Ad-Hoc|x64.Build.0 = Release|x64 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Ad-Hoc|x86.ActiveCfg = Release|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Ad-Hoc|x86.Build.0 = Release|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.AppStore|Any CPU.Build.0 = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.AppStore|ARM.ActiveCfg = Release|ARM - {6891E212-AEEE-4763-AC6F-BD7213C13890}.AppStore|ARM.Build.0 = Release|ARM - {6891E212-AEEE-4763-AC6F-BD7213C13890}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.AppStore|Mixed Platforms.ActiveCfg = Release|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.AppStore|Mixed Platforms.Build.0 = Release|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.AppStore|x64.ActiveCfg = Release|x64 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.AppStore|x64.Build.0 = Release|x64 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.AppStore|x86.ActiveCfg = Release|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.AppStore|x86.Build.0 = Release|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Debug|ARM.ActiveCfg = Debug|ARM - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Debug|ARM.Build.0 = Debug|ARM - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Debug|x64.ActiveCfg = Debug|x64 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Debug|x64.Build.0 = Debug|x64 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Debug|x86.ActiveCfg = Debug|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Debug|x86.Build.0 = Debug|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Release|Any CPU.Build.0 = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Release|ARM.ActiveCfg = Release|ARM - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Release|ARM.Build.0 = Release|ARM - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Release|iPhone.ActiveCfg = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Release|Mixed Platforms.Build.0 = Release|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Release|x64.ActiveCfg = Release|x64 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Release|x64.Build.0 = Release|x64 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Release|x86.ActiveCfg = Release|x86 - {6891E212-AEEE-4763-AC6F-BD7213C13890}.Release|x86.Build.0 = Release|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Ad-Hoc|ARM.ActiveCfg = Release|ARM - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Ad-Hoc|ARM.Build.0 = Release|ARM - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Ad-Hoc|Mixed Platforms.Build.0 = Release|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Ad-Hoc|x86.ActiveCfg = Release|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Ad-Hoc|x86.Build.0 = Release|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.AppStore|Any CPU.Build.0 = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.AppStore|ARM.ActiveCfg = Release|ARM - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.AppStore|ARM.Build.0 = Release|ARM - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.AppStore|Mixed Platforms.ActiveCfg = Release|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.AppStore|Mixed Platforms.Build.0 = Release|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.AppStore|x64.ActiveCfg = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.AppStore|x86.ActiveCfg = Release|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.AppStore|x86.Build.0 = Release|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Debug|ARM.ActiveCfg = Debug|ARM - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Debug|ARM.Build.0 = Debug|ARM - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Debug|x64.ActiveCfg = Debug|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Debug|x64.Build.0 = Debug|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Debug|x86.ActiveCfg = Debug|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Debug|x86.Build.0 = Debug|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Release|Any CPU.Build.0 = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Release|ARM.ActiveCfg = Release|ARM - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Release|ARM.Build.0 = Release|ARM - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Release|iPhone.ActiveCfg = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Release|Mixed Platforms.Build.0 = Release|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Release|x64.ActiveCfg = Release|Any CPU - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Release|x86.ActiveCfg = Release|x86 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED}.Release|x86.Build.0 = Release|x86 - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.AppStore|Any CPU.Build.0 = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.AppStore|ARM.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.AppStore|x64.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.AppStore|x86.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Debug|iPhone.Build.0 = Debug|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Debug|x64.ActiveCfg = Debug|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Debug|x86.ActiveCfg = Debug|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Debug|x86.Build.0 = Debug|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Release|Any CPU.Build.0 = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Release|ARM.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Release|iPhone.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Release|iPhone.Build.0 = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Release|x64.ActiveCfg = Release|Any CPU - {6377929D-6253-450D-BF4B-3E8ECE2564F7}.Release|x86.ActiveCfg = Release|Any CPU {219700F0-5444-4250-87D6-0551B39CA402}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {219700F0-5444-4250-87D6-0551B39CA402}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {219700F0-5444-4250-87D6-0551B39CA402}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU @@ -351,51 +200,6 @@ Global {F662E15A-8753-468E-A67E-3FCF45F12B89}.Release|x64.Build.0 = Release|Any CPU {F662E15A-8753-468E-A67E-3FCF45F12B89}.Release|x86.ActiveCfg = Release|Any CPU {F662E15A-8753-468E-A67E-3FCF45F12B89}.Release|x86.Build.0 = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Ad-Hoc|ARM.ActiveCfg = Release|ARM - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Ad-Hoc|ARM.Build.0 = Release|ARM - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Ad-Hoc|Mixed Platforms.Build.0 = Release|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Ad-Hoc|x86.ActiveCfg = Release|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Ad-Hoc|x86.Build.0 = Release|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.AppStore|Any CPU.Build.0 = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.AppStore|ARM.ActiveCfg = Release|ARM - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.AppStore|ARM.Build.0 = Release|ARM - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.AppStore|Mixed Platforms.ActiveCfg = Release|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.AppStore|Mixed Platforms.Build.0 = Release|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.AppStore|x64.ActiveCfg = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.AppStore|x86.ActiveCfg = Release|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.AppStore|x86.Build.0 = Release|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Debug|ARM.ActiveCfg = Debug|ARM - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Debug|ARM.Build.0 = Debug|ARM - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Debug|x64.ActiveCfg = Debug|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Debug|x64.Build.0 = Debug|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Debug|x86.ActiveCfg = Debug|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Debug|x86.Build.0 = Debug|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Release|Any CPU.Build.0 = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Release|ARM.ActiveCfg = Release|ARM - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Release|ARM.Build.0 = Release|ARM - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Release|iPhone.ActiveCfg = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Release|Mixed Platforms.Build.0 = Release|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Release|x64.ActiveCfg = Release|Any CPU - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Release|x86.ActiveCfg = Release|x86 - {38AF8105-65B6-4A14-A258-1137D9E40EF1}.Release|x86.Build.0 = Release|x86 {3173703F-8B1F-4772-9AE3-44913F413FB1}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {3173703F-8B1F-4772-9AE3-44913F413FB1}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {3173703F-8B1F-4772-9AE3-44913F413FB1}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU @@ -542,131 +346,6 @@ Global {BFF4B373-2844-40AD-8994-2BA5AC42AEE0}.Release|x64.Build.0 = Release|Any CPU {BFF4B373-2844-40AD-8994-2BA5AC42AEE0}.Release|x86.ActiveCfg = Release|Any CPU {BFF4B373-2844-40AD-8994-2BA5AC42AEE0}.Release|x86.Build.0 = Release|Any CPU - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|iPhone.Deploy.0 = Ad-Hoc|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Ad-Hoc|iPhoneSimulator - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|Mixed Platforms.ActiveCfg = Ad-Hoc|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|Mixed Platforms.Build.0 = Ad-Hoc|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|Mixed Platforms.Deploy.0 = Ad-Hoc|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|Any CPU.Build.0 = AppStore|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|ARM.ActiveCfg = AppStore|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|iPhone.ActiveCfg = AppStore|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|iPhone.Build.0 = AppStore|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|iPhone.Deploy.0 = AppStore|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|iPhoneSimulator.Deploy.0 = AppStore|iPhoneSimulator - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|Mixed Platforms.ActiveCfg = AppStore|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|Mixed Platforms.Build.0 = AppStore|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|Mixed Platforms.Deploy.0 = AppStore|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|x64.ActiveCfg = AppStore|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.AppStore|x86.ActiveCfg = AppStore|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|Any CPU.ActiveCfg = Debug|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|Any CPU.Build.0 = Debug|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|ARM.ActiveCfg = Debug|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|iPhone.ActiveCfg = Debug|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|iPhone.Build.0 = Debug|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|iPhone.Deploy.0 = Debug|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|Mixed Platforms.ActiveCfg = Debug|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|Mixed Platforms.Build.0 = Debug|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|Mixed Platforms.Deploy.0 = Debug|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|x64.ActiveCfg = Debug|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|x86.ActiveCfg = Debug|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Debug|x86.Build.0 = Debug|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|Any CPU.ActiveCfg = Release|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|Any CPU.Build.0 = Release|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|ARM.ActiveCfg = Release|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|iPhone.ActiveCfg = Release|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|iPhone.Build.0 = Release|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|iPhone.Deploy.0 = Release|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|Mixed Platforms.ActiveCfg = Release|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|Mixed Platforms.Build.0 = Release|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|Mixed Platforms.Deploy.0 = Release|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|x64.ActiveCfg = Release|iPhone - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5}.Release|x86.ActiveCfg = Release|iPhone - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|ARM.ActiveCfg = Release|ARM - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|ARM.Build.0 = Release|ARM - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|ARM.Deploy.0 = Release|ARM - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|Mixed Platforms.Build.0 = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|Mixed Platforms.Deploy.0 = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|x64.ActiveCfg = Release|x64 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|x64.Build.0 = Release|x64 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|x64.Deploy.0 = Release|x64 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|x86.ActiveCfg = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|x86.Build.0 = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Ad-Hoc|x86.Deploy.0 = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|Any CPU.Build.0 = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|Any CPU.Deploy.0 = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|ARM.ActiveCfg = Release|ARM - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|ARM.Build.0 = Release|ARM - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|ARM.Deploy.0 = Release|ARM - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|Mixed Platforms.ActiveCfg = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|Mixed Platforms.Build.0 = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|Mixed Platforms.Deploy.0 = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|x64.ActiveCfg = Release|x64 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|x64.Build.0 = Release|x64 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|x64.Deploy.0 = Release|x64 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|x86.ActiveCfg = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|x86.Build.0 = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.AppStore|x86.Deploy.0 = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|ARM.ActiveCfg = Debug|ARM - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|ARM.Build.0 = Debug|ARM - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|ARM.Deploy.0 = Debug|ARM - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|Mixed Platforms.Deploy.0 = Debug|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|x64.ActiveCfg = Debug|x64 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|x64.Build.0 = Debug|x64 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|x64.Deploy.0 = Debug|x64 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|x86.ActiveCfg = Debug|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|x86.Build.0 = Debug|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Debug|x86.Deploy.0 = Debug|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|Any CPU.Build.0 = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|Any CPU.Deploy.0 = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|ARM.ActiveCfg = Release|ARM - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|ARM.Build.0 = Release|ARM - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|ARM.Deploy.0 = Release|ARM - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|iPhone.ActiveCfg = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|Mixed Platforms.Build.0 = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|Mixed Platforms.Deploy.0 = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|x64.ActiveCfg = Release|x64 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|x64.Build.0 = Release|x64 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|x64.Deploy.0 = Release|x64 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|x86.ActiveCfg = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|x86.Build.0 = Release|x86 - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753}.Release|x86.Deploy.0 = Release|x86 {2C3224FB-4513-4A16-B67F-3C4F1BDC7765}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {2C3224FB-4513-4A16-B67F-3C4F1BDC7765}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {2C3224FB-4513-4A16-B67F-3C4F1BDC7765}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU @@ -760,60 +439,6 @@ Global {C129735F-5D4B-40BE-9410-F43E548FFF5E}.Release|x64.Build.0 = Release|Any CPU {C129735F-5D4B-40BE-9410-F43E548FFF5E}.Release|x86.ActiveCfg = Release|Any CPU {C129735F-5D4B-40BE-9410-F43E548FFF5E}.Release|x86.Build.0 = Release|Any CPU - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|ARM.ActiveCfg = Release|ARM - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|ARM.Build.0 = Release|ARM - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|ARM.Deploy.0 = Release|ARM - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|iPhone.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|Mixed Platforms.Build.0 = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|Mixed Platforms.Deploy.0 = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|x64.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|x86.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|x86.Build.0 = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Ad-Hoc|x86.Deploy.0 = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|Any CPU.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|ARM.ActiveCfg = Release|ARM - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|ARM.Build.0 = Release|ARM - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|ARM.Deploy.0 = Release|ARM - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|iPhone.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|iPhoneSimulator.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|Mixed Platforms.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|Mixed Platforms.Build.0 = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|Mixed Platforms.Deploy.0 = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|x64.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|x86.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|x86.Build.0 = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.AppStore|x86.Deploy.0 = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|Any CPU.ActiveCfg = Debug|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|Any CPU.Build.0 = Debug|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|ARM.ActiveCfg = Debug|ARM - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|ARM.Build.0 = Debug|ARM - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|ARM.Deploy.0 = Debug|ARM - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|iPhone.ActiveCfg = Debug|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|Mixed Platforms.Deploy.0 = Debug|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|x64.ActiveCfg = Debug|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|x86.ActiveCfg = Debug|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|x86.Build.0 = Debug|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Debug|x86.Deploy.0 = Debug|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|Any CPU.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|Any CPU.Build.0 = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|ARM.ActiveCfg = Release|ARM - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|ARM.Build.0 = Release|ARM - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|ARM.Deploy.0 = Release|ARM - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|iPhone.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|iPhoneSimulator.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|Mixed Platforms.Build.0 = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|Mixed Platforms.Deploy.0 = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|x64.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|x86.ActiveCfg = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|x86.Build.0 = Release|x86 - {46DF3E43-6B65-4C3D-8911-64FCC301040F}.Release|x86.Deploy.0 = Release|x86 {0A947CD1-3C6F-415A-A122-233BAE3005FD}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone {0A947CD1-3C6F-415A-A122-233BAE3005FD}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|iPhone {0A947CD1-3C6F-415A-A122-233BAE3005FD}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone @@ -1054,22 +679,18 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {03799AD1-9FCF-48CB-8E6E-B233DF583B10} = {59584026-7610-4CD5-A74E-D2B0A2E1CE87} - {6891E212-AEEE-4763-AC6F-BD7213C13890} = {59584026-7610-4CD5-A74E-D2B0A2E1CE87} - {741521F8-F9D8-40F4-A5D4-AED4E26841ED} = {59584026-7610-4CD5-A74E-D2B0A2E1CE87} - {6377929D-6253-450D-BF4B-3E8ECE2564F7} = {59584026-7610-4CD5-A74E-D2B0A2E1CE87} {219700F0-5444-4250-87D6-0551B39CA402} = {59584026-7610-4CD5-A74E-D2B0A2E1CE87} {F662E15A-8753-468E-A67E-3FCF45F12B89} = {59584026-7610-4CD5-A74E-D2B0A2E1CE87} - {38AF8105-65B6-4A14-A258-1137D9E40EF1} = {59584026-7610-4CD5-A74E-D2B0A2E1CE87} {3173703F-8B1F-4772-9AE3-44913F413FB1} = {59584026-7610-4CD5-A74E-D2B0A2E1CE87} {03799AD1-9FCF-48CB-8E6E-B233DF583B11} = {59584026-7610-4CD5-A74E-D2B0A2E1CE87} {BFF4B373-2844-40AD-8994-2BA5AC42AEE0} = {0C4021EF-617B-4620-ADD3-A702B4F9FA86} - {4B386F57-D313-4842-AE9B-F54EDBF1EBD5} = {0C4021EF-617B-4620-ADD3-A702B4F9FA86} - {5BB50827-ECC8-4BCD-9AFD-DCCA71F6D753} = {0C4021EF-617B-4620-ADD3-A702B4F9FA86} {2C3224FB-4513-4A16-B67F-3C4F1BDC7765} = {0C4021EF-617B-4620-ADD3-A702B4F9FA86} {C129735F-5D4B-40BE-9410-F43E548FFF5E} = {0C4021EF-617B-4620-ADD3-A702B4F9FA86} - {46DF3E43-6B65-4C3D-8911-64FCC301040F} = {0C4021EF-617B-4620-ADD3-A702B4F9FA86} {0A947CD1-3C6F-415A-A122-233BAE3005FD} = {0C4021EF-617B-4620-ADD3-A702B4F9FA86} {8EA10208-DC51-48A1-A0FE-726FEE55DE79} = {0C4021EF-617B-4620-ADD3-A702B4F9FA86} {9E5D6B89-B69B-486B-9F7B-406BE8690589} = {49C7015B-F41A-47A6-8200-B925902E74E9} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6A2E5073-1A9C-4584-A90B-030370703E2E} + EndGlobalSection EndGlobal diff --git a/appveyor.yml b/appveyor.yml index 9a38b206..3e1c56dc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,5 @@ +image: Visual Studio 2017 + build: project: SQLite.Net.OSS.sln diff --git a/nuget/SQLite.Net.Async.nuspec b/nuget/SQLite.Net.Async.nuspec index 79bdc696..a82765fd 100644 --- a/nuget/SQLite.Net.Async.nuspec +++ b/nuget/SQLite.Net.Async.nuspec @@ -2,7 +2,7 @@ SQLite.Net.Async-PCL - 3.1.1 + 4.0.0-beta1 SQLite.Net.Async PCL Øystein Krog,Frank Krueger,Tim Heuer Øystein Krog @@ -10,14 +10,14 @@ https://github.com/oysteinkrog/SQLite.Net-PCL false SQLite.Net PCL is an open source, minimal library to allow .NET and Mono applications to store data in SQLite databases. - This is a fork of the original sqlite-net project, which aims to cleanup/improve the code and deliver the package as PCL assemblies with some additional platform-specific implementations. - This package is compatible with the following .net platforms: net4+sl5+wp8+win8+monotouch+monoAndroid + This is a fork of the original sqlite-net project, which aims to cleanup/improve the code and deliver the package as .NET Standard assemblies with some additional platform-specific implementations. + This package is compatible with the following .NET Standard platforms: Xamarin.iOS (Classic), Xamarin.iOS (Unified), Xamarin.Android, UWP, Win32, Generic A .NET client library to access SQLite embedded database files in a LINQ manner. This package provides Async extensions to the core SQLite.Net package. https://github.com/oysteinkrog/SQLite.Net-PCL/commits - sqlite pcl sql database ios android windows metro winrt xamarin monotouch monodroid win32 windowsphone wp wp8 wp8.1 + sqlite netstandard sql database ios android windows xamarin monotouch monodroid win32 - + diff --git a/nuget/SQLite.Net.Core.nuspec b/nuget/SQLite.Net.Core.nuspec index 2a3cf574..892d3c0b 100644 --- a/nuget/SQLite.Net.Core.nuspec +++ b/nuget/SQLite.Net.Core.nuspec @@ -2,7 +2,7 @@ SQLite.Net.Core-PCL - 3.1.1 + 4.0.0-beta1 SQLite.Net PCL Øystein Krog,Frank Krueger,Tim Heuer Øystein Krog @@ -10,16 +10,15 @@ https://github.com/oysteinkrog/SQLite.Net-PCL false SQLite.Net PCL is an open source, minimal library to allow .NET and Mono applications to store data in SQLite databases. - This is a fork of the original sqlite-net project, which aims to cleanup/improve the code and deliver the package as PCL assemblies with some additional platform-specific implementations. - This package is compatible with the following .net platforms: Xamarin.iOS (Classic), Xamarin.iOS (Unified), Xamarin.Android, Windows Phone 8.1, Windows Phone 8.0, Windows 8.1, Windows 8.0, Win32, Generic, PCL(net4+sl4+wp7+win8+monotouch+MonoAndroid) + This is a fork of the original sqlite-net project, which aims to cleanup/improve the code and deliver the package as .NET Standard assemblies with some additional platform-specific implementations. + This package is compatible with the following .NET Standard platforms: Xamarin.iOS (Classic), Xamarin.iOS (Unified), Xamarin.Android, UWP, Win32, Generic A .NET client library to access SQLite embedded database files in a LINQ manner. https://github.com/oysteinkrog/SQLite.Net-PCL/commits - sqlite pcl sql database ios android windows metro winrt xamarin monotouch monodroid win32 windowsphone wp wp8 wp8.1 + sqlite netstandard sql database ios android windows xamarin monotouch monodroid win32 - - + diff --git a/nuget/SQLite.Net.nuspec b/nuget/SQLite.Net.nuspec index 7ff18a5f..327e0e07 100644 --- a/nuget/SQLite.Net.nuspec +++ b/nuget/SQLite.Net.nuspec @@ -2,7 +2,7 @@ SQLite.Net-PCL - 3.1.1 + 4.0.0-beta1 SQLite.Net PCL Øystein Krog,Frank Krueger,Tim Heuer Øystein Krog @@ -10,49 +10,31 @@ https://github.com/oysteinkrog/SQLite.Net-PCL false SQLite.Net PCL is an open source, minimal library to allow .NET and Mono applications to store data in SQLite databases. - This is a fork of the original sqlite-net project, which aims to cleanup/improve the code and deliver the package as PCL assemblies with some additional platform-specific implementations. - This package is compatible with the following .net platforms: Xamarin.iOS (Classic), Xamarin.iOS (Unified), Xamarin.Android, Windows Phone 8.1, Windows Phone 8.0, Windows 8.1, Windows 8.0, Win32, Generic, PCL(net4+sl4+wp7+win8+monotouch+MonoAndroid) + This is a fork of the original sqlite-net project, which aims to cleanup/improve the code and deliver the package as .NET Standard assemblies with some additional platform-specific implementations. + This package is compatible with the following .NET Standard platforms: Xamarin.iOS (Classic), Xamarin.iOS (Unified), Xamarin.Android, UWP, Win32, Generic A .NET client library to access SQLite embedded database files in a LINQ manner. https://github.com/oysteinkrog/SQLite.Net-PCL/commits - sqlite pcl sql database ios android windows metro winrt xamarin monotouch monodroid win32 windowsphone wp wp8 wp8.1 + sqlite netstandard sql database ios android windows xamarin monotouch monodroid win32 - - - - + - - - - - - - - - - - - - - - - - + + diff --git a/nuget/build.bat b/nuget/build.bat index aac7ae93..c2dc7456 100644 --- a/nuget/build.bat +++ b/nuget/build.bat @@ -1,4 +1,4 @@ @mkdir output -..\.nuget\nuget pack SQLite.Net.Core.nuspec -o output -..\.nuget\nuget pack SQLite.Net.nuspec -o output -..\.nuget\nuget pack SQLite.Net.Async.nuspec -o output +..\.nuget\nuget pack SQLite.Net.Core.nuspec -OutputDirectory output +..\.nuget\nuget pack SQLite.Net.nuspec -OutputDirectory output +..\.nuget\nuget pack SQLite.Net.Async.nuspec -OutputDirectory output diff --git a/nuget/prepare.bat b/nuget/prepare.bat index 72e96e09..129e0e7f 100644 --- a/nuget/prepare.bat +++ b/nuget/prepare.bat @@ -1,9 +1,8 @@ mkdir SQLite.Net -copy /y ..\src\SQLite.Net\bin\Release\SQLite.Net.dll SQLite.Net -type nul >SQLite.Net\_._ +copy /y ..\src\SQLite.Net\bin\Release\netstandard1.0\SQLite.Net.dll SQLite.Net mkdir SQLite.Net.Async -copy /y ..\src\SQLite.Net.Async\bin\Release\SQLite.Net.Async.dll SQLite.Net.Async +copy /y ..\src\SQLite.Net.Async\bin\Release\netstandard1.0\SQLite.Net.Async.dll SQLite.Net.Async mkdir SQLite.Net.Platform.Generic copy /y ..\src\SQLite.Net.Platform.Generic\bin\Release\SQLite.Net.Platform.Generic.dll SQLite.Net.Platform.Generic @@ -11,20 +10,8 @@ copy /y ..\src\SQLite.Net.Platform.Generic\bin\Release\SQLite.Net.Platform.Gener mkdir SQLite.Net.Platform.Win32 copy /y ..\src\SQLite.Net.Platform.Win32\bin\Release\SQLite.Net.Platform.Win32.dll SQLite.Net.Platform.Win32 -mkdir SQLite.Net.Platform.WindowsPhone8 -mkdir SQLite.Net.Platform.WindowsPhone8\ARM -mkdir SQLite.Net.Platform.WindowsPhone8\x86 -copy /y ..\src\SQLite.Net.Platform.WindowsPhone8\bin\x86\Release\SQLite.Net.Platform.WindowsPhone8.dll SQLite.Net.Platform.WindowsPhone8\x86 -copy /y ..\src\SQLite.Net.Platform.WindowsPhone8\bin\ARM\Release\SQLite.Net.Platform.WindowsPhone8.dll SQLite.Net.Platform.WindowsPhone8\ARM - -mkdir SQLite.Net.Platform.WinRT -copy /y ..\src\SQLite.Net.Platform.WinRT\bin\Release\SQLite.Net.Platform.WinRT.dll SQLite.Net.Platform.WinRT - mkdir SQLite.Net.Platform.XamarinAndroid copy /y ..\src\SQLite.Net.Platform.XamarinAndroid\bin\Release\SQLite.Net.Platform.XamarinAndroid.dll SQLite.Net.Platform.XamarinAndroid -mkdir SQLite.Net.Platform.XamarinIOS -copy /y ..\src\SQLite.Net.Platform.XamarinIOS\bin\iPhone\Release\SQLite.Net.Platform.XamarinIOS.dll SQLite.Net.Platform.XamarinIOS - mkdir SQLite.Net.Platform.XamarinIOS.Unified copy /y ..\src\SQLite.Net.Platform.XamarinIOS.Unified\bin\Release\SQLite.Net.Platform.XamarinIOS.Unified.dll SQLite.Net.Platform.XamarinIOS.Unified diff --git a/nuget/upload.bat b/nuget/upload.bat index a182a700..ea82fb7e 100644 --- a/nuget/upload.bat +++ b/nuget/upload.bat @@ -1,3 +1,3 @@ -..\.nuget\nuget push output\SQLite.Net.Core-PCL.3.1.1.nupkg -..\.nuget\nuget push output\SQLite.Net-PCL.3.1.1.nupkg -..\.nuget\nuget push output\SQLite.Net.Async-PCL.3.1.1.nupkg +..\.nuget\nuget push output\SQLite.Net.Core-PCL.4.0.0-beta1.nupkg +..\.nuget\nuget push output\SQLite.Net-PCL.4.0.0-beta1.nupkg +..\.nuget\nuget push output\SQLite.Net.Async-PCL.4.0.0-beta1.nupkg diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs index 2f341e3e..2b2105e7 100644 --- a/src/GlobalAssemblyInfo.cs +++ b/src/GlobalAssemblyInfo.cs @@ -11,5 +11,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.1.1.0")] -[assembly: AssemblyFileVersion("3.1.1.0")] +[assembly: AssemblyVersion("4.0.0.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] diff --git a/src/SQLite.Net.Async/SQLite.Net.Async.csproj b/src/SQLite.Net.Async/SQLite.Net.Async.csproj index 64cac4b0..d21bb429 100644 --- a/src/SQLite.Net.Async/SQLite.Net.Async.csproj +++ b/src/SQLite.Net.Async/SQLite.Net.Async.csproj @@ -1,70 +1,24 @@ - - - + + - Debug - AnyCPU - {3AB34E91-8E1A-442F-8E66-2494B371A890} - Library - Properties - SQLite.Net.Async - SQLite.Net.Async - v4.5 - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile259 - 10.0 - ..\..\ - true - - - - - 4.0 + netstandard1.0 + false - - true - full - false - bin\Debug\ - TRACE;DEBUG;JETBRAINS_ANNOTATIONS - prompt - 4 - true + + + TRACE;DEBUG;NETSTANDARD1_0;JETBRAINS_ANNOTATIONS - - pdbonly - true - bin\Release\ - TRACE;JETBRAINS_ANNOTATIONS - prompt - 4 + + + TRACE;RELEASE;NETSTANDARD1_0;JETBRAINS_ANNOTATIONS + - - - + + - - Properties\GlobalAssemblyInfo.cs - - - - + - - - {4971D437-0694-4297-A8CC-146CE08C3BD9} - SQLite.Net - - - - - \ No newline at end of file + + diff --git a/src/SQLite.Net.Platform.Win32/SQLite.Net.Platform.Win32.csproj b/src/SQLite.Net.Platform.Win32/SQLite.Net.Platform.Win32.csproj index 4a613652..5b072491 100644 --- a/src/SQLite.Net.Platform.Win32/SQLite.Net.Platform.Win32.csproj +++ b/src/SQLite.Net.Platform.Win32/SQLite.Net.Platform.Win32.csproj @@ -14,6 +14,7 @@ ..\..\ true + PackageReference true @@ -40,9 +41,6 @@ - - ..\..\packages\System.Data.SQLite.Core.1.0.92.0\lib\net40\System.Data.SQLite.dll - @@ -71,9 +69,6 @@ Always - - - - - {ABF3D656-3D1C-45D1-B6FD-41B088E5A533} - SQLite.Net - - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - 12.0 - - - - - \ No newline at end of file diff --git a/src/SQLite.Net.Platform.WinRT/SQLiteApiWinRT.cs b/src/SQLite.Net.Platform.WinRT/SQLiteApiWinRT.cs deleted file mode 100644 index d8fadde1..00000000 --- a/src/SQLite.Net.Platform.WinRT/SQLiteApiWinRT.cs +++ /dev/null @@ -1,969 +0,0 @@ -using System; -using SQLite.Net.Interop; -using System.Runtime.InteropServices; -using System.Text; -using Sqlite3DatabaseHandle = System.IntPtr; -using Sqlite3Statement = System.IntPtr; - -namespace SQLite.Net.Platform.WinRT -{ - public class SQLiteApiWinRT : ISQLiteApiExt - { - private readonly bool _useWinSqlite; - - /// - /// Creates a SQLite API object for use from WinRT. - /// - /// Optional: Temporary folder path. Defaults to - /// Optional: Whether to use WinSQLite instead of SQLite. WinSQLite is built-in to Windows 10.0.10586.0 and above. Using it can reduce app size and potentially increase SQLite load time. - public SQLiteApiWinRT(string tempFolderPath = null, bool useWinSqlite = false) - { - _useWinSqlite = useWinSqlite; - - if (_useWinSqlite) - { - WinSQLite3.SetDirectory(/*temp directory type*/2, tempFolderPath ?? Windows.Storage.ApplicationData.Current.TemporaryFolder.Path); - } - else - { - SQLite3.SetDirectory(/*temp directory type*/2, tempFolderPath ?? Windows.Storage.ApplicationData.Current.TemporaryFolder.Path); - } - } - - public int BindBlob(IDbStatement stmt, int index, byte[] val, int n, IntPtr free) - { - var dbStatement = (DbStatement)stmt; - - if (_useWinSqlite) - { - return WinSQLite3.BindBlob(dbStatement.InternalStmt, index, val, n, free); - } - else - { - return SQLite3.BindBlob(dbStatement.InternalStmt, index, val, n, free); - } - } - - public int BindDouble(IDbStatement stmt, int index, double val) - { - var dbStatement = (DbStatement)stmt; - - - if (_useWinSqlite) - { - return WinSQLite3.BindDouble(dbStatement.InternalStmt, index, val); - } - else - { - return SQLite3.BindDouble(dbStatement.InternalStmt, index, val); - } - } - - public int BindInt(IDbStatement stmt, int index, int val) - { - var dbStatement = (DbStatement)stmt; - - if (_useWinSqlite) - { - return WinSQLite3.BindInt(dbStatement.InternalStmt, index, val); - } - else - { - return SQLite3.BindInt(dbStatement.InternalStmt, index, val); - } - } - - public int BindInt64(IDbStatement stmt, int index, long val) - { - var dbStatement = (DbStatement)stmt; - - - if (_useWinSqlite) - { - return WinSQLite3.BindInt64(dbStatement.InternalStmt, index, val); - } - else - { - return SQLite3.BindInt64(dbStatement.InternalStmt, index, val); - } - } - - public int BindNull(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement)stmt; - - - if (_useWinSqlite) - { - return WinSQLite3.BindNull(dbStatement.InternalStmt, index); - } - else - { - return SQLite3.BindNull(dbStatement.InternalStmt, index); - } - } - - public int BindParameterIndex(IDbStatement stmt, string name) - { - var dbStatement = (DbStatement)stmt; - - - if (_useWinSqlite) - { - return WinSQLite3.BindParameterIndex(dbStatement.InternalStmt, name); - } - else - { - return SQLite3.BindParameterIndex(dbStatement.InternalStmt, name); - } - } - - public int BindText16(IDbStatement stmt, int index, string val, int n, IntPtr free) - { - var dbStatement = (DbStatement)stmt; - - - if (_useWinSqlite) - { - return WinSQLite3.BindText(dbStatement.InternalStmt, index, val, n, free); - } - else - { - return SQLite3.BindText(dbStatement.InternalStmt, index, val, n, free); - } - } - - public Result BusyTimeout(IDbHandle db, int milliseconds) - { - var dbHandle = (DbHandle)db; - - if (_useWinSqlite) - { - return (Result)WinSQLite3.BusyTimeout(dbHandle.InternalDbHandle, milliseconds); - } - else - { - return (Result)SQLite3.BusyTimeout(dbHandle.InternalDbHandle, milliseconds); - } - } - - public int Changes(IDbHandle db) - { - var dbHandle = (DbHandle)db; - - if (_useWinSqlite) - { - return WinSQLite3.Changes(dbHandle.InternalDbHandle); - } - else - { - return SQLite3.Changes(dbHandle.InternalDbHandle); - } - } - - public Result Close(IDbHandle db) - { - var dbHandle = (DbHandle)db; - - if (_useWinSqlite) - { - return (Result)WinSQLite3.Close(dbHandle.InternalDbHandle); - } - else - { - return (Result)SQLite3.Close(dbHandle.InternalDbHandle); - } - } - - public Result Initialize() - { - throw new NotSupportedException(); - } - public Result Shutdown() - { - throw new NotSupportedException(); - } - - public Result Config(ConfigOption option) - { - if (_useWinSqlite) - { - return (Result)WinSQLite3.Config(option); - } - else - { - return (Result)SQLite3.Config(option); - } - } - - - public byte[] ColumnBlob(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement)stmt; - int length = ColumnBytes(stmt, index); - byte[] result = new byte[length]; - if (length > 0) - { - - if (_useWinSqlite) - { - Marshal.Copy(WinSQLite3.ColumnBlob(dbStatement.InternalStmt, index), result, 0, length); - } - else - { - Marshal.Copy(SQLite3.ColumnBlob(dbStatement.InternalStmt, index), result, 0, length); - } - } - return result; - } - - public byte[] ColumnByteArray(IDbStatement stmt, int index) - { - return ColumnBlob(stmt, index); - } - - public int ColumnBytes(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement)stmt; - - if (_useWinSqlite) - { - return WinSQLite3.ColumnBytes(dbStatement.InternalStmt, index); - } - else - { - return SQLite3.ColumnBytes(dbStatement.InternalStmt, index); - } - } - - public int ColumnCount(IDbStatement stmt) - { - var dbStatement = (DbStatement)stmt; - - if (_useWinSqlite) - { - return WinSQLite3.ColumnCount(dbStatement.InternalStmt); - } - else - { - return SQLite3.ColumnCount(dbStatement.InternalStmt); - } - } - - public double ColumnDouble(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement)stmt; - - if (_useWinSqlite) - { - return WinSQLite3.ColumnDouble(dbStatement.InternalStmt, index); - } - else - { - return SQLite3.ColumnDouble(dbStatement.InternalStmt, index); - } - } - - public int ColumnInt(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement)stmt; - - if (_useWinSqlite) - { - return WinSQLite3.ColumnInt(dbStatement.InternalStmt, index); - } - else - { - return SQLite3.ColumnInt(dbStatement.InternalStmt, index); - } - } - - public long ColumnInt64(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement)stmt; - - if (_useWinSqlite) - { - return WinSQLite3.ColumnInt64(dbStatement.InternalStmt, index); - } - else - { - return SQLite3.ColumnInt64(dbStatement.InternalStmt, index); - } - } - - public string ColumnName16(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement)stmt; - - if (_useWinSqlite) - { - return WinSQLite3.ColumnName16(dbStatement.InternalStmt, index); - } - else - { - return SQLite3.ColumnName16(dbStatement.InternalStmt, index); - } - } - - public string ColumnText16(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement)stmt; - - if (_useWinSqlite) - { - return Marshal.PtrToStringUni(WinSQLite3.ColumnText16(dbStatement.InternalStmt, index)); - } - else - { - return Marshal.PtrToStringUni(SQLite3.ColumnText16(dbStatement.InternalStmt, index)); - } - } - - public ColType ColumnType(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement)stmt; - - if (_useWinSqlite) - { - return (ColType)WinSQLite3.ColumnType(dbStatement.InternalStmt, index); - } - else - { - return (ColType)SQLite3.ColumnType(dbStatement.InternalStmt, index); - } - } - - public int LibVersionNumber() - { - if (_useWinSqlite) - { - return WinSQLite3.sqlite3_libversion_number(); - } - else - { - return SQLite3.sqlite3_libversion_number(); - } - } - - public string SourceID() - { - - if (_useWinSqlite) - { - return Marshal.PtrToStringAnsi(WinSQLite3.sqlite3_sourceid()); - } - else - { - return Marshal.PtrToStringAnsi(SQLite3.sqlite3_sourceid()); - } - } - - public Result EnableLoadExtension(IDbHandle db, int onoff) - { - return (Result)1; - } - - public string Errmsg16(IDbHandle db) - { - var dbHandle = (DbHandle)db; - - if (_useWinSqlite) - { - return WinSQLite3.GetErrmsg(dbHandle.InternalDbHandle); - } - else - { - return SQLite3.GetErrmsg(dbHandle.InternalDbHandle); - } - } - - public Result Finalize(IDbStatement stmt) - { - var dbStatement = (DbStatement)stmt; - Sqlite3Statement internalStmt = dbStatement.InternalStmt; - - if (_useWinSqlite) - { - return (Result)WinSQLite3.Finalize(internalStmt); - } - else - { - return (Result)SQLite3.Finalize(internalStmt); - } - } - - public long LastInsertRowid(IDbHandle db) - { - var dbHandle = (DbHandle)db; - - if (_useWinSqlite) - { - return WinSQLite3.LastInsertRowid(dbHandle.InternalDbHandle); - } - else - { - return SQLite3.LastInsertRowid(dbHandle.InternalDbHandle); - } - } - - public Result Open(byte[] filename, out IDbHandle db, int flags, IntPtr zvfs) - { - Sqlite3DatabaseHandle internalDbHandle; - Result ret; - - if (_useWinSqlite) - { - ret = (Result)WinSQLite3.Open(filename, out internalDbHandle, flags, zvfs); - } - else - { - ret = (Result)SQLite3.Open(filename, out internalDbHandle, flags, zvfs); - } - - db = new DbHandle(internalDbHandle); - return ret; - } - - public ExtendedResult ExtendedErrCode(IDbHandle db) - { - var dbHandle = (DbHandle)db; - - if (_useWinSqlite) - { - return WinSQLite3.sqlite3_extended_errcode(dbHandle.InternalDbHandle); - } - else - { - return SQLite3.sqlite3_extended_errcode(dbHandle.InternalDbHandle); - } - } - - public IDbStatement Prepare2(IDbHandle db, string query) - { - var dbHandle = (DbHandle)db; - var stmt = default(Sqlite3Statement); - - if (_useWinSqlite) - { - var r = WinSQLite3.Prepare2(dbHandle.InternalDbHandle, query, query.Length, out stmt, IntPtr.Zero); - if (r != Result.OK) - { - throw SQLiteException.New(r, WinSQLite3.GetErrmsg(dbHandle.InternalDbHandle)); - } - } - else - { - var r = SQLite3.Prepare2(dbHandle.InternalDbHandle, query, query.Length, out stmt, IntPtr.Zero); - if (r != Result.OK) - { - throw SQLiteException.New(r, SQLite3.GetErrmsg(dbHandle.InternalDbHandle)); - } - } - - return new DbStatement(stmt); - } - - public Result Reset(IDbStatement stmt) - { - var dbStatement = (DbStatement)stmt; - - if (_useWinSqlite) - { - return (Result)WinSQLite3.Reset(dbStatement.InternalStmt); - } - else - { - return (Result)SQLite3.Reset(dbStatement.InternalStmt); - } - } - - public Result Step(IDbStatement stmt) - { - var dbStatement = (DbStatement)stmt; - - if (_useWinSqlite) - { - return (Result)WinSQLite3.Step(dbStatement.InternalStmt); - } - else - { - return (Result)SQLite3.Step(dbStatement.InternalStmt); - } - } - - #region Backup - - public IDbBackupHandle BackupInit(IDbHandle destHandle, string destName, IDbHandle srcHandle, string srcName) - { - var internalDestDb = (DbHandle)destHandle; - var internalSrcDb = (DbHandle)srcHandle; - IntPtr p; - - if (_useWinSqlite) - { - p = WinSQLite3.sqlite3_backup_init(internalDestDb.InternalDbHandle, - destName, - internalSrcDb.InternalDbHandle, - srcName); - } - else - { - p = SQLite3.sqlite3_backup_init(internalDestDb.InternalDbHandle, - destName, - internalSrcDb.InternalDbHandle, - srcName); - } - - if (p == IntPtr.Zero) - { - return null; - } - else - { - return new DbBackupHandle(p); - } - } - - public Result BackupStep(IDbBackupHandle handle, int pageCount) - { - var internalBackup = (DbBackupHandle)handle; - - if (_useWinSqlite) - { - return WinSQLite3.sqlite3_backup_step(internalBackup.DbBackupPtr, pageCount); - } - else - { - return SQLite3.sqlite3_backup_step(internalBackup.DbBackupPtr, pageCount); - } - } - - public Result BackupFinish(IDbBackupHandle handle) - { - var internalBackup = (DbBackupHandle)handle; - - if (_useWinSqlite) - { - return WinSQLite3.sqlite3_backup_finish(internalBackup.DbBackupPtr); - } - else - { - return SQLite3.sqlite3_backup_finish(internalBackup.DbBackupPtr); - } - } - - public int BackupRemaining(IDbBackupHandle handle) - { - var internalBackup = (DbBackupHandle)handle; - - if (_useWinSqlite) - { - return WinSQLite3.sqlite3_backup_remaining(internalBackup.DbBackupPtr); - } - else - { - return SQLite3.sqlite3_backup_remaining(internalBackup.DbBackupPtr); - } - } - - public int BackupPagecount(IDbBackupHandle handle) - { - var internalBackup = (DbBackupHandle)handle; - - if (_useWinSqlite) - { - return WinSQLite3.sqlite3_backup_pagecount(internalBackup.DbBackupPtr); - } - else - { - return SQLite3.sqlite3_backup_pagecount(internalBackup.DbBackupPtr); - } - } - - public int Sleep(int millis) - { - - if (_useWinSqlite) - { - return WinSQLite3.sqlite3_sleep(millis); - } - else - { - return SQLite3.sqlite3_sleep(millis); - } - } - - private struct DbBackupHandle : IDbBackupHandle - { - public DbBackupHandle(IntPtr dbBackupPtr) - : this() - { - DbBackupPtr = dbBackupPtr; - } - - internal IntPtr DbBackupPtr { get; set; } - - public bool Equals(IDbBackupHandle other) - { - return other is DbBackupHandle && DbBackupPtr == ((DbBackupHandle)other).DbBackupPtr; - } - } - - #endregion - - private struct DbHandle : IDbHandle - { - public DbHandle(Sqlite3DatabaseHandle internalDbHandle) - : this() - { - InternalDbHandle = internalDbHandle; - } - - public Sqlite3DatabaseHandle InternalDbHandle { get; set; } - - public bool Equals(IDbHandle other) - { - return other is DbHandle && InternalDbHandle == ((DbHandle)other).InternalDbHandle; - } - } - - private struct DbStatement : IDbStatement - { - public DbStatement(Sqlite3Statement internalStmt) - : this() - { - InternalStmt = internalStmt; - } - - internal Sqlite3Statement InternalStmt { get; set; } - - public bool Equals(IDbStatement other) - { - return (other is DbStatement) && ((DbStatement)other).InternalStmt == InternalStmt; - } - } - } - - public static class SQLite3 - { - [DllImport("sqlite3", EntryPoint = "sqlite3_open", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Open([MarshalAs(UnmanagedType.LPStr)] string filename, out IntPtr db); - - [DllImport("sqlite3", EntryPoint = "sqlite3_open_v2", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Open([MarshalAs(UnmanagedType.LPStr)] string filename, out IntPtr db, int flags, IntPtr zvfs); - - [DllImport("sqlite3", EntryPoint = "sqlite3_open_v2", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Open(byte[] filename, out IntPtr db, int flags, IntPtr zvfs); - - [DllImport("sqlite3", EntryPoint = "sqlite3_open16", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Open16([MarshalAs(UnmanagedType.LPWStr)] string filename, out IntPtr db); - - [DllImport("sqlite3", EntryPoint = "sqlite3_close", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Close(IntPtr db); - - [DllImport("sqlite3", EntryPoint = "sqlite3_config", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Config(ConfigOption option); - - [DllImport("sqlite3", EntryPoint = "sqlite3_win32_set_directory", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Unicode)] - public static extern int SetDirectory(uint directoryType, string directoryPath); - - [DllImport("sqlite3", EntryPoint = "sqlite3_busy_timeout", CallingConvention = CallingConvention.Cdecl)] - public static extern Result BusyTimeout(IntPtr db, int milliseconds); - - [DllImport("sqlite3", EntryPoint = "sqlite3_changes", CallingConvention = CallingConvention.Cdecl)] - public static extern int Changes(IntPtr db); - - [DllImport("sqlite3", EntryPoint = "sqlite3_prepare16_v2", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Prepare2(IntPtr db, [MarshalAs(UnmanagedType.LPWStr)] string sql, int numBytes, out IntPtr stmt, IntPtr pzTail); - - [DllImport("sqlite3", EntryPoint = "sqlite3_step", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Step(IntPtr stmt); - - [DllImport("sqlite3", EntryPoint = "sqlite3_reset", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Reset(IntPtr stmt); - - [DllImport("sqlite3", EntryPoint = "sqlite3_finalize", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Finalize(IntPtr stmt); - - [DllImport("sqlite3", EntryPoint = "sqlite3_last_insert_rowid", CallingConvention = CallingConvention.Cdecl)] - public static extern long LastInsertRowid(IntPtr db); - - [DllImport("sqlite3", EntryPoint = "sqlite3_errmsg16", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr Errmsg(IntPtr db); - - public static string GetErrmsg(IntPtr db) - { - return Marshal.PtrToStringUni(Errmsg(db)); - } - - [DllImport("sqlite3", EntryPoint = "sqlite3_bind_parameter_index", CallingConvention = CallingConvention.Cdecl)] - public static extern int BindParameterIndex(IntPtr stmt, [MarshalAs(UnmanagedType.LPStr)] string name); - - [DllImport("sqlite3", EntryPoint = "sqlite3_bind_null", CallingConvention = CallingConvention.Cdecl)] - public static extern int BindNull(IntPtr stmt, int index); - - [DllImport("sqlite3", EntryPoint = "sqlite3_bind_int", CallingConvention = CallingConvention.Cdecl)] - public static extern int BindInt(IntPtr stmt, int index, int val); - - [DllImport("sqlite3", EntryPoint = "sqlite3_bind_int64", CallingConvention = CallingConvention.Cdecl)] - public static extern int BindInt64(IntPtr stmt, int index, long val); - - [DllImport("sqlite3", EntryPoint = "sqlite3_bind_double", CallingConvention = CallingConvention.Cdecl)] - public static extern int BindDouble(IntPtr stmt, int index, double val); - - [DllImport("sqlite3", EntryPoint = "sqlite3_bind_text16", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Unicode)] - public static extern int BindText(IntPtr stmt, int index, [MarshalAs(UnmanagedType.LPWStr)] string val, int n, IntPtr free); - - [DllImport("sqlite3", EntryPoint = "sqlite3_bind_blob", CallingConvention = CallingConvention.Cdecl)] - public static extern int BindBlob(IntPtr stmt, int index, byte[] val, int n, IntPtr free); - - [DllImport("sqlite3", EntryPoint = "sqlite3_column_count", CallingConvention = CallingConvention.Cdecl)] - public static extern int ColumnCount(IntPtr stmt); - - [DllImport("sqlite3", EntryPoint = "sqlite3_column_name", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr ColumnName(IntPtr stmt, int index); - - [DllImport("sqlite3", EntryPoint = "sqlite3_column_name16", CallingConvention = CallingConvention.Cdecl)] - private static extern IntPtr ColumnName16Internal(IntPtr stmt, int index); - public static string ColumnName16(IntPtr stmt, int index) - { - return Marshal.PtrToStringUni(ColumnName16Internal(stmt, index)); - } - - [DllImport("sqlite3", EntryPoint = "sqlite3_column_type", CallingConvention = CallingConvention.Cdecl)] - public static extern ColType ColumnType(IntPtr stmt, int index); - - [DllImport("sqlite3", EntryPoint = "sqlite3_column_int", CallingConvention = CallingConvention.Cdecl)] - public static extern int ColumnInt(IntPtr stmt, int index); - - [DllImport("sqlite3", EntryPoint = "sqlite3_column_int64", CallingConvention = CallingConvention.Cdecl)] - public static extern long ColumnInt64(IntPtr stmt, int index); - - [DllImport("sqlite3", EntryPoint = "sqlite3_column_double", CallingConvention = CallingConvention.Cdecl)] - public static extern double ColumnDouble(IntPtr stmt, int index); - - [DllImport("sqlite3", EntryPoint = "sqlite3_column_text", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr ColumnText(IntPtr stmt, int index); - - [DllImport("sqlite3", EntryPoint = "sqlite3_column_text16", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr ColumnText16(IntPtr stmt, int index); - - [DllImport("sqlite3", EntryPoint = "sqlite3_column_blob", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr ColumnBlob(IntPtr stmt, int index); - - [DllImport("sqlite3", EntryPoint = "sqlite3_column_bytes", CallingConvention = CallingConvention.Cdecl)] - public static extern int ColumnBytes(IntPtr stmt, int index); - - public static string ColumnString(IntPtr stmt, int index) - { - return Marshal.PtrToStringUni(SQLite3.ColumnText16(stmt, index)); - } - - public static byte[] ColumnByteArray(IntPtr stmt, int index) - { - int length = ColumnBytes(stmt, index); - byte[] result = new byte[length]; - if (length > 0) - Marshal.Copy(ColumnBlob(stmt, index), result, 0, length); - return result; - } - - [DllImport("sqlite3", EntryPoint = "sqlite3_extended_errcode", CallingConvention = CallingConvention.Cdecl)] - public static extern ExtendedResult sqlite3_extended_errcode(IntPtr db); - - [DllImport("sqlite3", EntryPoint = "sqlite3_libversion_number", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_libversion_number(); - - [DllImport("sqlite3", EntryPoint = "sqlite3_sourceid", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr sqlite3_sourceid(); - - #region Backup - - [DllImport("sqlite3", EntryPoint = "sqlite3_backup_init", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr sqlite3_backup_init(IntPtr destDB, - [MarshalAs(UnmanagedType.LPStr)] string destName, - IntPtr srcDB, - [MarshalAs(UnmanagedType.LPStr)] string srcName); - - [DllImport("sqlite3", EntryPoint = "sqlite3_backup_step", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_backup_step(IntPtr backup, int pageCount); - - [DllImport("sqlite3", EntryPoint = "sqlite3_backup_finish", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_backup_finish(IntPtr backup); - - [DllImport("sqlite3", EntryPoint = "sqlite3_backup_remaining", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_backup_remaining(IntPtr backup); - - [DllImport("sqlite3", EntryPoint = "sqlite3_backup_pagecount", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_backup_pagecount(IntPtr backup); - - [DllImport("sqlite3", EntryPoint = "sqlite3_sleep", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_sleep(int millis); - - #endregion - } - - /// - /// WinSQLite is built-in to Windows 10.0.10586.0 and above. Using it can reduce app size and potentially increase SQLite load time. - /// For more information see: - /// - public static class WinSQLite3 - { - [DllImport("winsqlite3", EntryPoint = "sqlite3_open", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Open([MarshalAs(UnmanagedType.LPStr)] string filename, out IntPtr db); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_open_v2", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Open([MarshalAs(UnmanagedType.LPStr)] string filename, out IntPtr db, int flags, IntPtr zvfs); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_open_v2", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Open(byte[] filename, out IntPtr db, int flags, IntPtr zvfs); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_open16", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Open16([MarshalAs(UnmanagedType.LPWStr)] string filename, out IntPtr db); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_close", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Close(IntPtr db); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_config", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Config(ConfigOption option); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_win32_set_directory", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Unicode)] - public static extern int SetDirectory(uint directoryType, string directoryPath); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_busy_timeout", CallingConvention = CallingConvention.Cdecl)] - public static extern Result BusyTimeout(IntPtr db, int milliseconds); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_changes", CallingConvention = CallingConvention.Cdecl)] - public static extern int Changes(IntPtr db); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_prepare16_v2", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Prepare2(IntPtr db, [MarshalAs(UnmanagedType.LPStr)] string sql, int numBytes, out IntPtr stmt, IntPtr pzTail); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_step", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Step(IntPtr stmt); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_reset", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Reset(IntPtr stmt); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_finalize", CallingConvention = CallingConvention.Cdecl)] - public static extern Result Finalize(IntPtr stmt); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_last_insert_rowid", CallingConvention = CallingConvention.Cdecl)] - public static extern long LastInsertRowid(IntPtr db); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_errmsg16", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr Errmsg(IntPtr db); - - public static string GetErrmsg(IntPtr db) - { - return Marshal.PtrToStringUni(Errmsg(db)); - } - - [DllImport("winsqlite3", EntryPoint = "sqlite3_bind_parameter_index", CallingConvention = CallingConvention.Cdecl)] - public static extern int BindParameterIndex(IntPtr stmt, [MarshalAs(UnmanagedType.LPStr)] string name); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_bind_null", CallingConvention = CallingConvention.Cdecl)] - public static extern int BindNull(IntPtr stmt, int index); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_bind_int", CallingConvention = CallingConvention.Cdecl)] - public static extern int BindInt(IntPtr stmt, int index, int val); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_bind_int64", CallingConvention = CallingConvention.Cdecl)] - public static extern int BindInt64(IntPtr stmt, int index, long val); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_bind_double", CallingConvention = CallingConvention.Cdecl)] - public static extern int BindDouble(IntPtr stmt, int index, double val); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_bind_text16", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Unicode)] - public static extern int BindText(IntPtr stmt, int index, [MarshalAs(UnmanagedType.LPWStr)] string val, int n, IntPtr free); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_bind_blob", CallingConvention = CallingConvention.Cdecl)] - public static extern int BindBlob(IntPtr stmt, int index, byte[] val, int n, IntPtr free); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_column_count", CallingConvention = CallingConvention.Cdecl)] - public static extern int ColumnCount(IntPtr stmt); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_column_name", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr ColumnName(IntPtr stmt, int index); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_column_name16", CallingConvention = CallingConvention.Cdecl)] - private static extern IntPtr ColumnName16Internal(IntPtr stmt, int index); - public static string ColumnName16(IntPtr stmt, int index) - { - return Marshal.PtrToStringUni(ColumnName16Internal(stmt, index)); - } - - [DllImport("winsqlite3", EntryPoint = "sqlite3_column_type", CallingConvention = CallingConvention.Cdecl)] - public static extern ColType ColumnType(IntPtr stmt, int index); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_column_int", CallingConvention = CallingConvention.Cdecl)] - public static extern int ColumnInt(IntPtr stmt, int index); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_column_int64", CallingConvention = CallingConvention.Cdecl)] - public static extern long ColumnInt64(IntPtr stmt, int index); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_column_double", CallingConvention = CallingConvention.Cdecl)] - public static extern double ColumnDouble(IntPtr stmt, int index); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_column_text", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr ColumnText(IntPtr stmt, int index); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_column_text16", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr ColumnText16(IntPtr stmt, int index); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_column_blob", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr ColumnBlob(IntPtr stmt, int index); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_column_bytes", CallingConvention = CallingConvention.Cdecl)] - public static extern int ColumnBytes(IntPtr stmt, int index); - - public static string ColumnString(IntPtr stmt, int index) - { - return Marshal.PtrToStringUni(WinSQLite3.ColumnText16(stmt, index)); - } - - public static byte[] ColumnByteArray(IntPtr stmt, int index) - { - int length = ColumnBytes(stmt, index); - byte[] result = new byte[length]; - if (length > 0) - Marshal.Copy(ColumnBlob(stmt, index), result, 0, length); - return result; - } - - [DllImport("winsqlite3", EntryPoint = "sqlite3_extended_errcode", CallingConvention = CallingConvention.Cdecl)] - public static extern ExtendedResult sqlite3_extended_errcode(IntPtr db); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_libversion_number", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_libversion_number(); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_sourceid", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr sqlite3_sourceid(); - - #region Backup - - [DllImport("winsqlite3", EntryPoint = "sqlite3_backup_init", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr sqlite3_backup_init(IntPtr destDB, - [MarshalAs(UnmanagedType.LPStr)] string destName, - IntPtr srcDB, - [MarshalAs(UnmanagedType.LPStr)] string srcName); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_backup_step", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_backup_step(IntPtr backup, int pageCount); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_backup_finish", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_backup_finish(IntPtr backup); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_backup_remaining", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_backup_remaining(IntPtr backup); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_backup_pagecount", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_backup_pagecount(IntPtr backup); - - [DllImport("winsqlite3", EntryPoint = "sqlite3_sleep", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_sleep(int millis); - - #endregion - } -} diff --git a/src/SQLite.Net.Platform.WinRT/SQLitePlatformWinRT.cs b/src/SQLite.Net.Platform.WinRT/SQLitePlatformWinRT.cs deleted file mode 100644 index a77c508f..00000000 --- a/src/SQLite.Net.Platform.WinRT/SQLitePlatformWinRT.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Windows.Storage; -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.WinRT -{ - public class SQLitePlatformWinRT : ISQLitePlatform - { - /// - /// Creates a SQLite platform object for use from WinRT. - /// - /// Optional: Temporary folder path. Defaults to - /// Optional: Whether to use WinSQLite instead of SQLite. WinSQLite is built-in to Windows 10.0.10586.0 and above. Using it can reduce app size and potentially increase SQLite load time. - public SQLitePlatformWinRT(string tempFolderPath = null, bool useWinSqlite = false) - { - SQLiteApi = new SQLiteApiWinRT(tempFolderPath, useWinSqlite); - VolatileService = new VolatileServiceWinRT(); - StopwatchFactory = new StopwatchFactoryWinRT(); - ReflectionService = new ReflectionServiceWinRT(); - } - - public string DatabaseRootDirectory - { - get { return ApplicationData.Current.LocalFolder.Path; } - } - - public ISQLiteApi SQLiteApi { get; private set; } - public IStopwatchFactory StopwatchFactory { get; private set; } - public IReflectionService ReflectionService { get; private set; } - public IVolatileService VolatileService { get; private set; } - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.WinRT/StopwatchFactoryWinRT.cs b/src/SQLite.Net.Platform.WinRT/StopwatchFactoryWinRT.cs deleted file mode 100644 index 1b583c9c..00000000 --- a/src/SQLite.Net.Platform.WinRT/StopwatchFactoryWinRT.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Diagnostics; -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.WinRT -{ - public class StopwatchFactoryWinRT : IStopwatchFactory - { - public IStopwatch Create() - { - return new StopwatchWinRT(); - } - - private class StopwatchWinRT : IStopwatch - { - private readonly Stopwatch _stopWatch; - - public StopwatchWinRT() - { - _stopWatch = new Stopwatch(); - } - - public void Stop() - { - _stopWatch.Stop(); - } - - public void Reset() - { - _stopWatch.Reset(); - } - - public void Start() - { - _stopWatch.Start(); - } - - public long ElapsedMilliseconds - { - get { return _stopWatch.ElapsedMilliseconds; } - } - } - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.WinRT/VolatileServiceWinRT.cs b/src/SQLite.Net.Platform.WinRT/VolatileServiceWinRT.cs deleted file mode 100644 index 896c4aeb..00000000 --- a/src/SQLite.Net.Platform.WinRT/VolatileServiceWinRT.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Threading; -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.WinRT -{ - public class VolatileServiceWinRT : IVolatileService - { - public void Write(ref int transactionDepth, int depth) - { - Volatile.Write(ref transactionDepth, depth); - } - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.WindowsPhone8/Properties/AssemblyInfo.cs b/src/SQLite.Net.Platform.WindowsPhone8/Properties/AssemblyInfo.cs deleted file mode 100644 index fbef1141..00000000 --- a/src/SQLite.Net.Platform.WindowsPhone8/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("SQLite.Net.Platform.WindowsPhone8")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SQLite.Net.Platform.WindowsPhone8")] -[assembly: AssemblyCopyright("Copyright © Øystein Krog")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. - -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM - -[assembly: Guid("741521f8-f9d8-40f4-a5d4-aed4e26841ed")] \ No newline at end of file diff --git a/src/SQLite.Net.Platform.WindowsPhone8/ReflectionServiceWP8.cs b/src/SQLite.Net.Platform.WindowsPhone8/ReflectionServiceWP8.cs deleted file mode 100644 index 1ade84ad..00000000 --- a/src/SQLite.Net.Platform.WindowsPhone8/ReflectionServiceWP8.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Reflection; -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.WindowsPhone8 -{ - public class ReflectionServiceWP8 : IReflectionService - { - public IEnumerable GetPublicInstanceProperties(Type mappedType) - { - if (mappedType == null) - { - throw new ArgumentNullException("mappedType"); - } - return from p in mappedType.GetRuntimeProperties() - where - ((p.GetMethod != null && p.GetMethod.IsPublic) || (p.SetMethod != null && p.SetMethod.IsPublic) || - (p.GetMethod != null && p.GetMethod.IsStatic) || (p.SetMethod != null && p.SetMethod.IsStatic)) - select p; - } - - public object GetMemberValue(object obj, Expression expr, MemberInfo member) - { - if (member.MemberType == MemberTypes.Property) - { - var m = (PropertyInfo) member; - return m.GetValue(obj, null); - } - if (member.MemberType == MemberTypes.Field) - { - return Expression.Lambda(expr).Compile().DynamicInvoke(); - } - throw new NotSupportedException("MemberExpr: " + member.MemberType); - } - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.WindowsPhone8/SQLite.Net.Platform.WindowsPhone8.csproj b/src/SQLite.Net.Platform.WindowsPhone8/SQLite.Net.Platform.WindowsPhone8.csproj deleted file mode 100644 index a3409ee5..00000000 --- a/src/SQLite.Net.Platform.WindowsPhone8/SQLite.Net.Platform.WindowsPhone8.csproj +++ /dev/null @@ -1,134 +0,0 @@ - - - - - Debug - AnyCPU - 10.0.20506 - 2.0 - {741521F8-F9D8-40F4-A5D4-AED4E26841ED} - {C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - SQLite.Net.Platform.WindowsPhone8 - SQLite.Net.Platform.WindowsPhone8 - WindowsPhone - v8.0 - $(TargetFrameworkVersion) - false - true - 11.0 - true - ..\..\ - true - 568df22d - - - true - full - false - Bin\Debug - DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE - true - true - prompt - 4 - - - pdbonly - true - Bin\Release - TRACE;SILVERLIGHT;WINDOWS_PHONE - true - true - prompt - 4 - - - true - full - false - Bin\x86\Debug - DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE - true - true - prompt - 4 - - - pdbonly - true - Bin\x86\Release - TRACE;SILVERLIGHT;WINDOWS_PHONE - true - true - prompt - 4 - - - true - full - false - Bin\ARM\Debug - DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE - true - true - prompt - 4 - - - pdbonly - true - Bin\ARM\Release - TRACE;SILVERLIGHT;WINDOWS_PHONE - true - true - prompt - 4 - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - {ABF3D656-3D1C-45D1-B6FD-41B088E5A533} - SQLite.Net - - - - - ..\..\packages\sqlite-net-wp8.3.8.5\lib\windowsphone8\Sqlite.winmd - True - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file diff --git a/src/SQLite.Net.Platform.WindowsPhone8/SQLiteApiWP8.cs b/src/SQLite.Net.Platform.WindowsPhone8/SQLiteApiWP8.cs deleted file mode 100644 index aee9cc0b..00000000 --- a/src/SQLite.Net.Platform.WindowsPhone8/SQLiteApiWP8.cs +++ /dev/null @@ -1,292 +0,0 @@ -using System; -using System.Text; -using Sqlite; -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.WindowsPhone8 -{ - public class SQLiteApiWP8 : ISQLiteApi - { - public Result Open(byte[] filename, out IDbHandle db, int flags, IntPtr zVfs) - { - string dbFileName = Encoding.UTF8.GetString(filename, 0, filename.Length - 1); - Database internalDbHandle = null; - var ret = (Result) Sqlite3.sqlite3_open_v2(dbFileName, out internalDbHandle, flags, ""); - db = new DbHandle(internalDbHandle); - return ret; - } - - public ExtendedResult ExtendedErrCode(IDbHandle db) - { - // not supported - return 0; -// var dbHandle = (DbHandle)db; -// return Sqlite3.sqlite3_extended_errcode(dbHandle.InternalDbHandle); - } - - public int LibVersionNumber() - { - // not supported - return 0; -// return Sqlite3.sqlite3_libversion_number(); - } - - public string SourceID() - { - // not supported - return String.Empty; -// return Sqlite3.sqlite3_sourceid(); - } - - - public Result EnableLoadExtension(IDbHandle db, int onoff) - { - var dbHandle = (DbHandle) db; - return (Result) Sqlite3.sqlite3_enable_load_extension(dbHandle.InternalDbHandle, onoff); - } - - public Result Close(IDbHandle db) - { - var dbHandle = (DbHandle) db; - return (Result) Sqlite3.sqlite3_close(dbHandle.InternalDbHandle); - } - - public Result Initialize() - { - throw new NotSupportedException(); - } - - public Result Shutdown() - { - throw new NotSupportedException(); - } - - public Result Config(ConfigOption option) - { - throw new NotSupportedException(); - } - - public Result BusyTimeout(IDbHandle db, int milliseconds) - { - var dbHandle = (DbHandle) db; - return (Result) Sqlite3.sqlite3_busy_timeout(dbHandle.InternalDbHandle, milliseconds); - } - - public int Changes(IDbHandle db) - { - var dbHandle = (DbHandle) db; - return Sqlite3.sqlite3_changes(dbHandle.InternalDbHandle); - } - - - public IDbStatement Prepare2(IDbHandle db, string query) - { - var dbHandle = (DbHandle) db; - var stmt = default(Statement); - - int r = Sqlite3.sqlite3_prepare_v2(dbHandle.InternalDbHandle, query, out stmt); - - if (r != 0) - { - throw SQLiteException.New((Result) r, GetErrmsg(db)); - } - return new DbStatement(stmt); - } - - public Result Step(IDbStatement stmt) - { - var dbStatement = (DbStatement) stmt; - return (Result) Sqlite3.sqlite3_step(dbStatement.InternalStmt); - } - - public Result Reset(IDbStatement stmt) - { - var dbStatement = (DbStatement) stmt; - return (Result) Sqlite3.sqlite3_reset(dbStatement.InternalStmt); - } - - public Result Finalize(IDbStatement stmt) - { - var dbStatement = (DbStatement) stmt; - Statement internalStmt = dbStatement.InternalStmt; - return (Result) Sqlite3.sqlite3_finalize(internalStmt); - } - - public long LastInsertRowid(IDbHandle db) - { - var dbHandle = (DbHandle) db; - return Sqlite3.sqlite3_last_insert_rowid(dbHandle.InternalDbHandle); - } - - public string Errmsg16(IDbHandle db) - { - var dbHandle = (DbHandle) db; - return Sqlite3.sqlite3_errmsg(dbHandle.InternalDbHandle); - } - - public int BindParameterIndex(IDbStatement stmt, string name) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_bind_parameter_index(dbStatement.InternalStmt, name); - } - - public int BindNull(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_bind_null(dbStatement.InternalStmt, index); - } - - public int BindInt(IDbStatement stmt, int index, int val) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_bind_int(dbStatement.InternalStmt, index, val); - } - - public int BindInt64(IDbStatement stmt, int index, long val) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_bind_int64(dbStatement.InternalStmt, index, val); - } - - public int BindDouble(IDbStatement stmt, int index, double val) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_bind_double(dbStatement.InternalStmt, index, val); - } - - public int BindText16(IDbStatement stmt, int index, string val, int n, IntPtr free) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_bind_text(dbStatement.InternalStmt, index, val, n); - } - - public int BindBlob(IDbStatement stmt, int index, byte[] val, int n, IntPtr free) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_bind_blob(dbStatement.InternalStmt, index, val, n); - } - - public int ColumnCount(IDbStatement stmt) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_column_count(dbStatement.InternalStmt); - } - - public string ColumnName16(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_column_name(dbStatement.InternalStmt, index); - } - - public ColType ColumnType(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement) stmt; - return (ColType) Sqlite3.sqlite3_column_type(dbStatement.InternalStmt, index); - } - - public int ColumnInt(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_column_int(dbStatement.InternalStmt, index); - } - - public long ColumnInt64(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_column_int64(dbStatement.InternalStmt, index); - } - - public double ColumnDouble(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_column_double(dbStatement.InternalStmt, index); - } - - public int ColumnBytes(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_column_bytes(dbStatement.InternalStmt, index); - } - - public byte[] ColumnByteArray(IDbStatement stmt, int index) - { - return ColumnBlob(stmt, index); - } - - public string ColumnText16(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_column_text(dbStatement.InternalStmt, index); - } - - public byte[] ColumnBlob(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_column_blob(dbStatement.InternalStmt, index); - } - - public Result Open(string filename, out IDbHandle db) - { - Database internalDbHandle = null; - var ret = (Result) Sqlite3.sqlite3_open(filename, out internalDbHandle); - db = new DbHandle(internalDbHandle); - return ret; - } - - public string GetErrmsg(IDbHandle db) - { - var dbHandle = (DbHandle) db; - return Sqlite3.sqlite3_errmsg(dbHandle.InternalDbHandle); - } - - public string ColumnString(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_column_text(dbStatement.InternalStmt, index); - } - - public string ColumnName(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_column_name(dbStatement.InternalStmt, index); - } - - public string ColumnText(IDbStatement stmt, int index) - { - var dbStatement = (DbStatement) stmt; - return Sqlite3.sqlite3_column_text(dbStatement.InternalStmt, index); - } - - private struct DbHandle : IDbHandle - { - public DbHandle(Database internalDbHandle) - : this() - { - InternalDbHandle = internalDbHandle; - } - - public Database InternalDbHandle { get; set; } - - public bool Equals(IDbHandle other) - { - return other is DbHandle && InternalDbHandle == ((DbHandle) other).InternalDbHandle; - } - } - - private struct DbStatement : IDbStatement - { - public DbStatement(Statement internalStmt) - : this() - { - InternalStmt = internalStmt; - } - - internal Statement InternalStmt { get; set; } - - public bool Equals(IDbStatement other) - { - return (other is DbStatement) && ((DbStatement) other).InternalStmt == InternalStmt; - } - } - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.WindowsPhone8/SQLitePlatformWP8.cs b/src/SQLite.Net.Platform.WindowsPhone8/SQLitePlatformWP8.cs deleted file mode 100644 index 268a0c57..00000000 --- a/src/SQLite.Net.Platform.WindowsPhone8/SQLitePlatformWP8.cs +++ /dev/null @@ -1,24 +0,0 @@ -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.WindowsPhone8 -{ - public class SQLitePlatformWP8 : ISQLitePlatform - { - public SQLitePlatformWP8() - { - var api = new SQLiteApiWP8(); - -// api.SetDirectory(/*temp directory type*/2, Windows.Storage.ApplicationData.Current.TemporaryFolder.Path); - - SQLiteApi = api; - VolatileService = new VolatileServiceWP8(); - ReflectionService = new ReflectionServiceWP8(); - StopwatchFactory = new StopwatchFactoryWP8(); - } - - public ISQLiteApi SQLiteApi { get; private set; } - public IStopwatchFactory StopwatchFactory { get; private set; } - public IReflectionService ReflectionService { get; private set; } - public IVolatileService VolatileService { get; private set; } - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.WindowsPhone8/StopwatchFactoryWP8.cs b/src/SQLite.Net.Platform.WindowsPhone8/StopwatchFactoryWP8.cs deleted file mode 100644 index 06a18cbc..00000000 --- a/src/SQLite.Net.Platform.WindowsPhone8/StopwatchFactoryWP8.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Diagnostics; -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.WindowsPhone8 -{ - public class StopwatchFactoryWP8 : IStopwatchFactory - { - public IStopwatch Create() - { - return new StopwatchWP8(); - } - - private class StopwatchWP8 : IStopwatch - { - private readonly Stopwatch _stopWatch; - - public StopwatchWP8() - { - _stopWatch = new Stopwatch(); - } - - public void Stop() - { - _stopWatch.Stop(); - } - - public void Reset() - { - _stopWatch.Reset(); - } - - public void Start() - { - _stopWatch.Start(); - } - - public long ElapsedMilliseconds - { - get { return _stopWatch.ElapsedMilliseconds; } - } - } - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.WindowsPhone8/VolatileServiceWP8.cs b/src/SQLite.Net.Platform.WindowsPhone8/VolatileServiceWP8.cs deleted file mode 100644 index c4775524..00000000 --- a/src/SQLite.Net.Platform.WindowsPhone8/VolatileServiceWP8.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Threading; -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.WindowsPhone8 -{ - public class VolatileServiceWP8 : IVolatileService - { - public void Write(ref int transactionDepth, int depth) - { - Volatile.Write(ref transactionDepth, depth); - } - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.WindowsPhone8/packages.config b/src/SQLite.Net.Platform.WindowsPhone8/packages.config deleted file mode 100644 index f4eb0ee4..00000000 --- a/src/SQLite.Net.Platform.WindowsPhone8/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/SQLite.Net.Platform.WindowsPhoneApp81/Properties/AssemblyInfo.cs b/src/SQLite.Net.Platform.WindowsPhoneApp81/Properties/AssemblyInfo.cs deleted file mode 100644 index 070648cd..00000000 --- a/src/SQLite.Net.Platform.WindowsPhoneApp81/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Reflection; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("SQLite.Net.Platform.WindowsPhoneApp81")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Øystein Krog")] -[assembly: AssemblyProduct("SQLite.Net.Platform.WinRT")] -[assembly: AssemblyCopyright("Copyright © Øystein Krog")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] diff --git a/src/SQLite.Net.Platform.WindowsPhoneApp81/SQLite.Net.Platform.WindowsPhoneApp81.csproj b/src/SQLite.Net.Platform.WindowsPhoneApp81/SQLite.Net.Platform.WindowsPhoneApp81.csproj deleted file mode 100644 index 19c9ce53..00000000 --- a/src/SQLite.Net.Platform.WindowsPhoneApp81/SQLite.Net.Platform.WindowsPhoneApp81.csproj +++ /dev/null @@ -1,123 +0,0 @@ - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {38AF8105-65B6-4A14-A258-1137D9E40EF1} - Library - Properties - SQLite.Net.Platform.WindowsPhoneApp81 - SQLite.Net.Platform.WindowsPhoneApp81 - en-US - 8.1 - 12 - 512 - {76F1466A-8B6D-4E39-A767-685A06062A39};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - true - full - false - bin\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE;NETFX_CORE;WINDOWS_PHONE_APP - prompt - 4 - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_PHONE_APP - true - ;2008 - pdbonly - ARM - false - prompt - true - - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_PHONE_APP - true - ;2008 - pdbonly - x86 - false - prompt - true - - - - - {4971d437-0694-4297-a8cc-146ce08c3bd9} - SQLite.Net - - - - - Properties\GlobalAssemblyInfo.cs - - - ReflectionServiceWinRT.cs - - - SQLiteApiWinRT.cs - - - SQLitePlatformWinRT.cs - - - StopwatchFactoryWinRT.cs - - - VolatileServiceWinRT.cs - - - - - 12.0 - - - WindowsPhoneApp - - - - \ No newline at end of file diff --git a/src/SQLite.Net.Platform.XamarinAndroid/SQLite.Net.Platform.XamarinAndroid.csproj b/src/SQLite.Net.Platform.XamarinAndroid/SQLite.Net.Platform.XamarinAndroid.csproj index 0b8acb05..d2f0606c 100644 --- a/src/SQLite.Net.Platform.XamarinAndroid/SQLite.Net.Platform.XamarinAndroid.csproj +++ b/src/SQLite.Net.Platform.XamarinAndroid/SQLite.Net.Platform.XamarinAndroid.csproj @@ -14,8 +14,8 @@ 512 Resources\Resource.Designer.cs Off - True - v6.0 + true + v8.1 true diff --git a/src/SQLite.Net.Platform.XamarinIOS/Properties/AssemblyInfo.cs b/src/SQLite.Net.Platform.XamarinIOS/Properties/AssemblyInfo.cs deleted file mode 100644 index 17dc5c71..00000000 --- a/src/SQLite.Net.Platform.XamarinIOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("SQLite.Net.Platform.XamarinIOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Øystein Krog")] -[assembly: AssemblyProduct("SQLite.Net.Platform.XamarinIOS")] -[assembly: AssemblyCopyright("Copyright ©Øystein Krog 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. - -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM - -[assembly: Guid("d5fbb63f-29de-4148-887f-bfe12c64783b")] \ No newline at end of file diff --git a/src/SQLite.Net.Platform.XamarinIOS/ReflectionServiceIOS.cs b/src/SQLite.Net.Platform.XamarinIOS/ReflectionServiceIOS.cs deleted file mode 100644 index ec69f0ef..00000000 --- a/src/SQLite.Net.Platform.XamarinIOS/ReflectionServiceIOS.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Reflection; -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.XamarinIOS -{ - public class ReflectionServiceIOS : IReflectionService - { - public IEnumerable GetPublicInstanceProperties(Type mappedType) - { - return mappedType.GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.SetProperty); - } - - public object GetMemberValue(object obj, Expression expr, MemberInfo member) - { - if (member.MemberType == MemberTypes.Property) - { - var m = (PropertyInfo) member; - return m.GetValue(obj, null); - } - if (member.MemberType == MemberTypes.Field) - { - var m = (FieldInfo) member; - return m.GetValue(obj); - } - throw new NotSupportedException("MemberExpr: " + member.MemberType); - } - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.XamarinIOS/SQLite.Net.Platform.XamarinIOS.csproj b/src/SQLite.Net.Platform.XamarinIOS/SQLite.Net.Platform.XamarinIOS.csproj deleted file mode 100644 index ac4638d3..00000000 --- a/src/SQLite.Net.Platform.XamarinIOS/SQLite.Net.Platform.XamarinIOS.csproj +++ /dev/null @@ -1,61 +0,0 @@ - - - - Debug - iPhoneSimulator - 8.0.30703 - 2.0 - {6377929D-6253-450D-BF4B-3E8ECE2564F7} - {6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - SQLite.Net.Platform.XamarinIOS - Resources - SQLite.Net.Platform.XamarinIOS - - - true - full - false - bin\iPhone\Debug - DEBUG - prompt - 4 - false - true - iPhone Developer - - - none - true - bin\iPhone\Release - prompt - 4 - false - iPhone Developer - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - {4971d437-0694-4297-a8cc-146ce08c3bd9} - SQLite.Net - - - - \ No newline at end of file diff --git a/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOS.cs b/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOS.cs deleted file mode 100644 index 4d60991a..00000000 --- a/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOS.cs +++ /dev/null @@ -1,266 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.XamarinIOS { - public class SQLiteApiIOS : ISQLiteApiExt { - public Result Open(byte[] filename, out IDbHandle db, int flags, IntPtr zvfs) { - IntPtr dbPtr; - Result r = SQLiteApiIOSInternal.sqlite3_open_v2(filename, out dbPtr, flags, zvfs); - db = new DbHandle(dbPtr); - return r; - } - - public ExtendedResult ExtendedErrCode(IDbHandle db) { - var internalDbHandle = (DbHandle)db; - return SQLiteApiIOSInternal.sqlite3_extended_errcode(internalDbHandle.DbPtr); - } - - public int LibVersionNumber() { - return SQLiteApiIOSInternal.sqlite3_libversion_number(); - } - - public string SourceID() - { - return Marshal.PtrToStringAnsi(SQLiteApiIOSInternal.sqlite3_sourceid()); - } - - public Result EnableLoadExtension(IDbHandle db, int onoff) { - var internalDbHandle = (DbHandle)db; - return SQLiteApiIOSInternal.sqlite3_enable_load_extension(internalDbHandle.DbPtr, onoff); - } - - public Result Close(IDbHandle db) { - var internalDbHandle = (DbHandle)db; - return SQLiteApiIOSInternal.sqlite3_close(internalDbHandle.DbPtr); - } - - public Result Initialize() { - return SQLiteApiIOSInternal.sqlite3_initialize(); - } - - public Result Shutdown() { - return SQLiteApiIOSInternal.sqlite3_shutdown(); - } - - public Result Config(ConfigOption option) { - return SQLiteApiIOSInternal.sqlite3_config(option); - } - - public Result BusyTimeout(IDbHandle db, int milliseconds) { - var internalDbHandle = (DbHandle)db; - return SQLiteApiIOSInternal.sqlite3_busy_timeout(internalDbHandle.DbPtr, milliseconds); - } - - public int Changes(IDbHandle db) { - var internalDbHandle = (DbHandle)db; - return SQLiteApiIOSInternal.sqlite3_changes(internalDbHandle.DbPtr); - } - - public IDbStatement Prepare2(IDbHandle db, string query) { - var internalDbHandle = (DbHandle)db; - IntPtr stmt; - Result r = SQLiteApiIOSInternal.sqlite3_prepare16_v2(internalDbHandle.DbPtr, - query, - -1, - out stmt, - IntPtr.Zero); - if(r != Result.OK) { - throw SQLiteException.New(r, Errmsg16(internalDbHandle)); - } - return new DbStatement(stmt); - } - - public Result Step(IDbStatement stmt) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_step(internalStmt.StmtPtr); - } - - public Result Reset(IDbStatement stmt) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_reset(internalStmt.StmtPtr); - } - - public Result Finalize(IDbStatement stmt) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_finalize(internalStmt.StmtPtr); - } - - public long LastInsertRowid(IDbHandle db) { - var internalDbHandle = (DbHandle)db; - return SQLiteApiIOSInternal.sqlite3_last_insert_rowid(internalDbHandle.DbPtr); - } - - public string Errmsg16(IDbHandle db) { - var internalDbHandle = (DbHandle)db; - return Marshal.PtrToStringUni(SQLiteApiIOSInternal.sqlite3_errmsg16(internalDbHandle.DbPtr)); - } - - public int BindParameterIndex(IDbStatement stmt, string name) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_bind_parameter_index(internalStmt.StmtPtr, name); - } - - public int BindNull(IDbStatement stmt, int index) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_bind_null(internalStmt.StmtPtr, index); - } - - public int BindInt(IDbStatement stmt, int index, int val) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_bind_int(internalStmt.StmtPtr, index, val); - } - - public int BindInt64(IDbStatement stmt, int index, long val) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_bind_int64(internalStmt.StmtPtr, index, val); - } - - public int BindDouble(IDbStatement stmt, int index, double val) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_bind_double(internalStmt.StmtPtr, index, val); - } - - public int BindText16(IDbStatement stmt, int index, string val, int n, IntPtr free) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_bind_text16(internalStmt.StmtPtr, index, val, n, free); - } - - public int BindBlob(IDbStatement stmt, int index, byte[] val, int n, IntPtr free) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_bind_blob(internalStmt.StmtPtr, index, val, n, free); - } - - public int ColumnCount(IDbStatement stmt) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_column_count(internalStmt.StmtPtr); - } - - public string ColumnName16(IDbStatement stmt, int index) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.ColumnName16(internalStmt.StmtPtr, index); - } - - public ColType ColumnType(IDbStatement stmt, int index) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_column_type(internalStmt.StmtPtr, index); - } - - public int ColumnInt(IDbStatement stmt, int index) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_column_int(internalStmt.StmtPtr, index); - } - - public long ColumnInt64(IDbStatement stmt, int index) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_column_int64(internalStmt.StmtPtr, index); - } - - public double ColumnDouble(IDbStatement stmt, int index) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_column_double(internalStmt.StmtPtr, index); - } - - public string ColumnText16(IDbStatement stmt, int index) { - var internalStmt = (DbStatement)stmt; - return Marshal.PtrToStringUni(SQLiteApiIOSInternal.sqlite3_column_text16(internalStmt.StmtPtr, index)); - } - - public byte[] ColumnBlob(IDbStatement stmt, int index) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.ColumnBlob(internalStmt.StmtPtr, index); - } - - public int ColumnBytes(IDbStatement stmt, int index) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.sqlite3_column_bytes(internalStmt.StmtPtr, index); - } - - public byte[] ColumnByteArray(IDbStatement stmt, int index) { - var internalStmt = (DbStatement)stmt; - return SQLiteApiIOSInternal.ColumnByteArray(internalStmt.StmtPtr, index); - } - - #region Backup - - public IDbBackupHandle BackupInit(IDbHandle destHandle, string destName, IDbHandle srcHandle, string srcName) { - var internalDestDb = (DbHandle)destHandle; - var internalSrcDb = (DbHandle)srcHandle; - - IntPtr p = SQLiteApiIOSInternal.sqlite3_backup_init(internalDestDb.DbPtr, - destName, - internalSrcDb.DbPtr, - srcName); - - if(p == IntPtr.Zero) { - return null; - } else { - return new DbBackupHandle(p); - } - } - - public Result BackupStep(IDbBackupHandle handle, int pageCount) { - var internalBackup = (DbBackupHandle)handle; - return SQLiteApiIOSInternal.sqlite3_backup_step(internalBackup.DbBackupPtr, pageCount); - } - - public Result BackupFinish(IDbBackupHandle handle) { - var internalBackup = (DbBackupHandle)handle; - return SQLiteApiIOSInternal.sqlite3_backup_finish(internalBackup.DbBackupPtr); - } - - public int BackupRemaining(IDbBackupHandle handle) { - var internalBackup = (DbBackupHandle)handle; - return SQLiteApiIOSInternal.sqlite3_backup_remaining(internalBackup.DbBackupPtr); - } - - public int BackupPagecount(IDbBackupHandle handle) { - var internalBackup = (DbBackupHandle)handle; - return SQLiteApiIOSInternal.sqlite3_backup_pagecount(internalBackup.DbBackupPtr); - } - - public int Sleep(int millis) { - return SQLiteApiIOSInternal.sqlite3_sleep(millis); - } - - private struct DbBackupHandle : IDbBackupHandle { - public DbBackupHandle(IntPtr dbBackupPtr) : this() { - DbBackupPtr = dbBackupPtr; - } - - internal IntPtr DbBackupPtr { get; set; } - - public bool Equals(IDbBackupHandle other) { - return other is DbBackupHandle && DbBackupPtr == ((DbBackupHandle)other).DbBackupPtr; - } - } - - #endregion - - private struct DbHandle : IDbHandle { - public DbHandle(IntPtr dbPtr) - : this() { - DbPtr = dbPtr; - } - - internal IntPtr DbPtr { get; set; } - - public bool Equals(IDbHandle other) { - return other is DbHandle && DbPtr == ((DbHandle)other).DbPtr; - } - } - - private struct DbStatement : IDbStatement { - public DbStatement(IntPtr stmtPtr) - : this() { - StmtPtr = stmtPtr; - } - - internal IntPtr StmtPtr { get; set; } - - public bool Equals(IDbStatement other) { - return other is DbStatement && StmtPtr == ((DbStatement)other).StmtPtr; - } - } - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOSInternal.cs b/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOSInternal.cs deleted file mode 100644 index 7620620d..00000000 --- a/src/SQLite.Net.Platform.XamarinIOS/SQLiteApiIOSInternal.cs +++ /dev/null @@ -1,188 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.XamarinIOS -{ - internal static class SQLiteApiIOSInternal - { - private const string DllName = "sqlite3"; - - [DllImport(DllName, EntryPoint = "sqlite3_column_blob", CallingConvention = CallingConvention.Cdecl)] - public static extern byte[] ColumnBlob(IntPtr stmt, int index); - - public static byte[] ColumnByteArray(IntPtr stmt, int index) - { - int length = sqlite3_column_bytes(stmt, index); - var result = new byte[length]; - if (length > 0) - { - Marshal.Copy(sqlite3_column_blob(stmt, index), result, 0, length); - } - return result; - } - - public static string ColumnName16(IntPtr stmt, int index) - { - return Marshal.PtrToStringUni(sqlite3_column_name16(stmt, index)); - } - - [DllImport(DllName, EntryPoint = "sqlite3_bind_blob", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_bind_blob(IntPtr stmt, int index, byte[] val, int n, IntPtr free); - - [DllImport(DllName, EntryPoint = "sqlite3_bind_double", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_bind_double(IntPtr stmt, int index, double val); - - [DllImport(DllName, EntryPoint = "sqlite3_bind_int", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_bind_int(IntPtr stmt, int index, int val); - - [DllImport(DllName, EntryPoint = "sqlite3_bind_int64", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_bind_int64(IntPtr stmt, int index, long val); - - [DllImport(DllName, EntryPoint = "sqlite3_bind_null", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_bind_null(IntPtr stmt, int index); - - [DllImport(DllName, EntryPoint = "sqlite3_bind_parameter_index", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_bind_parameter_index(IntPtr stmt, [MarshalAs(UnmanagedType.LPStr)] string name); - - [DllImport(DllName, EntryPoint = "sqlite3_bind_text16", CallingConvention = CallingConvention.Cdecl, - CharSet = CharSet.Unicode)] - public static extern int sqlite3_bind_text16(IntPtr stmt, - int index, - [MarshalAs(UnmanagedType.LPWStr)] string val, - int n, - IntPtr free); - - [DllImport(DllName, EntryPoint = "sqlite3_busy_timeout", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_busy_timeout(IntPtr db, int milliseconds); - - [DllImport(DllName, EntryPoint = "sqlite3_changes", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_changes(IntPtr db); - - [DllImport(DllName, EntryPoint = "sqlite3_close", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_close(IntPtr db); - - [DllImport("sqlite3", EntryPoint = "sqlite3_initialize", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_initialize(); - - [DllImport("sqlite3", EntryPoint = "sqlite3_shutdown", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_shutdown(); - - [DllImport(DllName, EntryPoint = "sqlite3_column_blob", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr sqlite3_column_blob(IntPtr stmt, int index); - - [DllImport(DllName, EntryPoint = "sqlite3_column_bytes", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_column_bytes(IntPtr stmt, int index); - - [DllImport(DllName, EntryPoint = "sqlite3_column_count", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_column_count(IntPtr stmt); - - [DllImport(DllName, EntryPoint = "sqlite3_column_double", CallingConvention = CallingConvention.Cdecl)] - public static extern double sqlite3_column_double(IntPtr stmt, int index); - - // [DllImport(DllName, EntryPoint = "sqlite3_column_name", CallingConvention = CallingConvention.Cdecl)] - // private extern IntPtr ColumnNameInternal(IntPtr stmt, int index); - - // [DllImport(DllName, EntryPoint = "sqlite3_column_name", CallingConvention = CallingConvention.Cdecl)] - // public string ColumnName(IntPtr stmt, int index) - // { - // return ColumnNameInternal(stmt, index); - // } - - [DllImport(DllName, EntryPoint = "sqlite3_column_int", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_column_int(IntPtr stmt, int index); - - [DllImport(DllName, EntryPoint = "sqlite3_column_int64", CallingConvention = CallingConvention.Cdecl)] - public static extern long sqlite3_column_int64(IntPtr stmt, int index); - - [DllImport(DllName, EntryPoint = "sqlite3_column_text16", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr sqlite3_column_text16(IntPtr stmt, int index); - - [DllImport(DllName, EntryPoint = "sqlite3_column_type", CallingConvention = CallingConvention.Cdecl)] - public static extern ColType sqlite3_column_type(IntPtr stmt, int index); - - [DllImport(DllName, EntryPoint = "sqlite3_config", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_config(ConfigOption option); - - [DllImport(DllName, EntryPoint = "sqlite3_enable_load_extension", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_enable_load_extension(IntPtr db, int onoff); - - [DllImport(DllName, EntryPoint = "sqlite3_errmsg16", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr sqlite3_errmsg16(IntPtr db); - - [DllImport(DllName, EntryPoint = "sqlite3_finalize", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_finalize(IntPtr stmt); - - [DllImport(DllName, EntryPoint = "sqlite3_last_insert_rowid", CallingConvention = CallingConvention.Cdecl)] - public static extern long sqlite3_last_insert_rowid(IntPtr db); - - [DllImport(DllName, EntryPoint = "sqlite3_open", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_open([MarshalAs(UnmanagedType.LPStr)] string filename, out IntPtr db); - - [DllImport(DllName, EntryPoint = "sqlite3_open_v2", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_open([MarshalAs(UnmanagedType.LPStr)] string filename, out IntPtr db, int flags, IntPtr zvfs); - - [DllImport(DllName, EntryPoint = "sqlite3_open16", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_open16([MarshalAs(UnmanagedType.LPWStr)] string filename, out IntPtr db); - - [DllImport(DllName, EntryPoint = "sqlite3_open_v2", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_open_v2(byte[] filename, out IntPtr db, int flags, IntPtr zvfs); - - [DllImport(DllName, EntryPoint = "sqlite3_prepare16_v2", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_prepare16_v2(IntPtr db, - [MarshalAs(UnmanagedType.LPWStr)] string sql, - int numBytes, - out IntPtr stmt, - IntPtr pzTail); - - [DllImport(DllName, EntryPoint = "sqlite3_reset", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_reset(IntPtr stmt); - - [DllImport(DllName, EntryPoint = "sqlite3_step", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_step(IntPtr stmt); - - [DllImport(DllName, EntryPoint = "sqlite3_win32_set_directory", CallingConvention = CallingConvention.Cdecl, - CharSet = CharSet.Unicode)] - public static extern int sqlite3_win32_set_directory(uint directoryType, string directoryPath); - - [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Unicode)] - private static extern IntPtr LoadLibrary(string lpFileName); - - [DllImport(DllName, EntryPoint = "sqlite3_column_name16", CallingConvention = CallingConvention.Cdecl)] - private static extern IntPtr sqlite3_column_name16(IntPtr stmt, int index); - - [DllImport("sqlite3", EntryPoint = "sqlite3_extended_errcode", CallingConvention = CallingConvention.Cdecl)] - public static extern ExtendedResult sqlite3_extended_errcode(IntPtr db); - - [DllImport("sqlite3", EntryPoint = "sqlite3_libversion_number", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_libversion_number(); - - [DllImport("sqlite3", EntryPoint = "sqlite3_sourceid", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr sqlite3_sourceid(); - - #region Backup - - [DllImport(DllName, EntryPoint = "sqlite3_backup_init", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr sqlite3_backup_init(IntPtr destDB, - [MarshalAs(UnmanagedType.LPStr)] string destName, - IntPtr srcDB, - [MarshalAs(UnmanagedType.LPStr)] string srcName); - - [DllImport(DllName, EntryPoint = "sqlite3_backup_step", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_backup_step(IntPtr backup, int pageCount); - - [DllImport(DllName, EntryPoint = "sqlite3_backup_finish", CallingConvention = CallingConvention.Cdecl)] - public static extern Result sqlite3_backup_finish(IntPtr backup); - - [DllImport(DllName, EntryPoint = "sqlite3_backup_remaining", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_backup_remaining(IntPtr backup); - - [DllImport(DllName, EntryPoint = "sqlite3_backup_pagecount", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_backup_pagecount(IntPtr backup); - - [DllImport(DllName, EntryPoint = "sqlite3_sleep", CallingConvention = CallingConvention.Cdecl)] - public static extern int sqlite3_sleep(int millis); - - #endregion - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.XamarinIOS/SQLitePlatformIOS.cs b/src/SQLite.Net.Platform.XamarinIOS/SQLitePlatformIOS.cs deleted file mode 100644 index 1a39432e..00000000 --- a/src/SQLite.Net.Platform.XamarinIOS/SQLitePlatformIOS.cs +++ /dev/null @@ -1,20 +0,0 @@ -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.XamarinIOS -{ - public class SQLitePlatformIOS : ISQLitePlatform - { - public SQLitePlatformIOS() - { - SQLiteApi = new SQLiteApiIOS(); - StopwatchFactory = new StopwatchFactoryIOS(); - ReflectionService = new ReflectionServiceIOS(); - VolatileService = new VolatileServiceIOS(); - } - - public ISQLiteApi SQLiteApi { get; private set; } - public IStopwatchFactory StopwatchFactory { get; private set; } - public IReflectionService ReflectionService { get; private set; } - public IVolatileService VolatileService { get; private set; } - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.XamarinIOS/StopwatchFactoryIOS.cs b/src/SQLite.Net.Platform.XamarinIOS/StopwatchFactoryIOS.cs deleted file mode 100644 index 9d5905f2..00000000 --- a/src/SQLite.Net.Platform.XamarinIOS/StopwatchFactoryIOS.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Diagnostics; -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.XamarinIOS -{ - public class StopwatchFactoryIOS : IStopwatchFactory - { - public IStopwatch Create() - { - return new StopwatchIOS(); - } - - private class StopwatchIOS : IStopwatch - { - private readonly Stopwatch _stopWatch; - - public StopwatchIOS() - { - _stopWatch = new Stopwatch(); - } - - public void Stop() - { - _stopWatch.Stop(); - } - - public void Reset() - { - _stopWatch.Reset(); - } - - public void Start() - { - _stopWatch.Start(); - } - - public long ElapsedMilliseconds - { - get { return _stopWatch.ElapsedMilliseconds; } - } - } - } -} \ No newline at end of file diff --git a/src/SQLite.Net.Platform.XamarinIOS/VolatileServiceIOS.cs b/src/SQLite.Net.Platform.XamarinIOS/VolatileServiceIOS.cs deleted file mode 100644 index efa3f33c..00000000 --- a/src/SQLite.Net.Platform.XamarinIOS/VolatileServiceIOS.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Threading; -using SQLite.Net.Interop; - -namespace SQLite.Net.Platform.XamarinIOS -{ - public class VolatileServiceIOS : IVolatileService - { - public void Write(ref int transactionDepth, int depth) - { - Volatile.Write(ref transactionDepth, depth); - } - } -} \ No newline at end of file diff --git a/src/SQLite.Net/SQLite.Net.csproj b/src/SQLite.Net/SQLite.Net.csproj index dc185d3c..4a176283 100644 --- a/src/SQLite.Net/SQLite.Net.csproj +++ b/src/SQLite.Net/SQLite.Net.csproj @@ -1,142 +1,24 @@ - - - + + - Debug - AnyCPU - {4971D437-0694-4297-A8CC-146CE08C3BD9} - Library - Properties - SQLite.Net - SQLite.Net - v4.5 - 512 - - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile259 - 10.0 - - - - - 4.0 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - ..\..\ - true + netstandard1.0 + false - - true - full - false - bin\Debug\ - TRACE;DEBUG;JETBRAINS_ANNOTATIONS - prompt - 4 - true + + + TRACE;DEBUG;NETSTANDARD1_0;JETBRAINS_ANNOTATIONS - - pdbonly - true - bin\Release\ - TRACE;JETBRAINS_ANNOTATIONS - prompt - 4 + + + TRACE;RELEASE;NETSTANDARD1_0;JETBRAINS_ANNOTATIONS + - - - + + - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - - - \ No newline at end of file + + diff --git a/tests/SQLite.Net.Tests.Generic/SQLite.Net.Tests.Generic.csproj b/tests/SQLite.Net.Tests.Generic/SQLite.Net.Tests.Generic.csproj index bdfba89a..911ba7e0 100644 --- a/tests/SQLite.Net.Tests.Generic/SQLite.Net.Tests.Generic.csproj +++ b/tests/SQLite.Net.Tests.Generic/SQLite.Net.Tests.Generic.csproj @@ -10,6 +10,7 @@ v4.5 + PackageReference true @@ -34,30 +35,6 @@ - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - - ..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll - - - ..\..\packages\PCLStorage.1.0.2\lib\net45\PCLStorage.dll - - - ..\..\packages\PCLStorage.1.0.2\lib\net45\PCLStorage.Abstractions.dll - - - ..\..\packages\System.Data.SQLite.Core.1.0.98.1\lib\net45\System.Data.SQLite.dll - @@ -80,15 +57,20 @@ - + + + + + 11.0.2 + + + 2.6.4 + + + 1.0.2 + + + 1.0.108 + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/tests/SQLite.Net.Tests.Generic/packages.config b/tests/SQLite.Net.Tests.Generic/packages.config deleted file mode 100644 index bc5d5c89..00000000 --- a/tests/SQLite.Net.Tests.Generic/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tests/SQLite.Net.Tests.OSX/SQLite.Net.Tests.OSX.csproj b/tests/SQLite.Net.Tests.OSX/SQLite.Net.Tests.OSX.csproj index af966781..59588e31 100644 --- a/tests/SQLite.Net.Tests.OSX/SQLite.Net.Tests.OSX.csproj +++ b/tests/SQLite.Net.Tests.OSX/SQLite.Net.Tests.OSX.csproj @@ -13,6 +13,7 @@ 512 ..\..\ true + PackageReference true @@ -32,22 +33,6 @@ 4 - - ..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True - - - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll - True - - - ..\..\packages\PCLStorage.1.0.2\lib\net45\PCLStorage.dll - True - - - ..\..\packages\PCLStorage.1.0.2\lib\net45\PCLStorage.Abstractions.dll - True - @@ -75,7 +60,18 @@ - + + + + + 11.0.2 + + + 2.6.4 + + + 1.0.2 + diff --git a/tests/SQLite.Net.Tests.OSX/packages.config b/tests/SQLite.Net.Tests.OSX/packages.config deleted file mode 100644 index 1c7e5284..00000000 --- a/tests/SQLite.Net.Tests.OSX/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tests/SQLite.Net.Tests.Win32/SQLite.Net.Tests.Win32.csproj b/tests/SQLite.Net.Tests.Win32/SQLite.Net.Tests.Win32.csproj index e7cfc593..92620045 100644 --- a/tests/SQLite.Net.Tests.Win32/SQLite.Net.Tests.Win32.csproj +++ b/tests/SQLite.Net.Tests.Win32/SQLite.Net.Tests.Win32.csproj @@ -17,6 +17,7 @@ 2.0 + PackageReference true @@ -36,40 +37,8 @@ 4 - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - True - - - ..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True - - - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll - True - - - ..\..\packages\PCLStorage.1.0.2\lib\net45\PCLStorage.dll - True - - - ..\..\packages\PCLStorage.1.0.2\lib\net45\PCLStorage.Abstractions.dll - True - - - ..\..\packages\System.Data.SQLite.Core.1.0.98.1\lib\net45\System.Data.SQLite.dll - True - @@ -96,7 +65,21 @@ - + + + + + 11.0.2 + + + 2.6.4 + + + 1.0.2 + + + 1.0.108 + @@ -105,11 +88,7 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - -