Remove submodule; use NuGet for STPC

Author: asherber

.gitmodules

@@ -8,8 +8,6 @@
 
 Because StaTypPocoQueries.Core includes support for F# quotations, bringing FSharp.Core along for the ride, this library supports those as well. 
 
-Note that the NuGet package include its own copy of StaTypPocoQueries.Core, rather than referencing that library's NuGet package. This is so that the package can target .NET 4.5 as well as .NET Standard 2.0 (the published NuGet for StaTypPocoQueries.Core is .NET Standard only). The private version also uppercases reserved words in the generated SQL that are lowercased in the published version.
-
 ## Usage
 
 These examples assume that `Database.EnableAutoSelect == true`, so that the `SELECT` (or `DELETE`) portion of the SQL command is generated for you based on your POCO class. For this reason, the library cannot be used with `dynamic`.

README.md

@@ -7,10 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StaTypPocoQueries.PetaPoco"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StaTypPocoQueries.PetaPoco.Tests", "StaTypPocoQueries.PetaPoco.Tests\StaTypPocoQueries.PetaPoco.Tests.csproj", "{EDAC5415-091B-4A11-9D1C-13D79529556E}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "StaTypPocoQueries.Core", "statically-typed-poco-queries\StaTypPocoQueries.Core\StaTypPocoQueries.Core.fsproj", "{3A8693E2-CD22-4D15-8390-40B65890ABC8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StaTypPocoQueries.Core.Tests", "statically-typed-poco-queries\StaTypPocoQueries.Core.Tests\StaTypPocoQueries.Core.Tests.csproj", "{EEE97224-ED40-4027-9522-6ABF0CAADDDD}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,14 +21,6 @@ Global
 		{EDAC5415-091B-4A11-9D1C-13D79529556E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EDAC5415-091B-4A11-9D1C-13D79529556E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EDAC5415-091B-4A11-9D1C-13D79529556E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A8693E2-CD22-4D15-8390-40B65890ABC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A8693E2-CD22-4D15-8390-40B65890ABC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A8693E2-CD22-4D15-8390-40B65890ABC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A8693E2-CD22-4D15-8390-40B65890ABC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEE97224-ED40-4027-9522-6ABF0CAADDDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEE97224-ED40-4027-9522-6ABF0CAADDDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEE97224-ED40-4027-9522-6ABF0CAADDDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEE97224-ED40-4027-9522-6ABF0CAADDDD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

StaTypPocoQueries.PetaPoco.sln

@@ -7,27 +7,16 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Description>PetaPoco bindings for StaTypPocoQueries.</Description>
     <Authors>Aaron Sherber</Authors>
-    <NuspecFile>StaTypPocoQueries.PetaPoco.nuspec</NuspecFile>
     <Copyright>Copyright 2018</Copyright>
+    <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/asherber/StaTypPocoQueries.PetaPoco</PackageProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/asherber/StaTypPocoQueries.PetaPoco/master/media/static-64.png</PackageIconUrl>
+    <PackageTags>petapoco statyppocoqueries statically typed</PackageTags>
+    <PackageReleaseNotes>Use published StaTypPocoQueries instead of private build.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="PetaPoco.Compiled" Version="[6.0.353,7.0)" />
+    <PackageReference Include="StaTypPocoQueries.Core" Version="[1.7,2)" />
   </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\statically-typed-poco-queries\StaTypPocoQueries.Core\StaTypPocoQueries.Core.fsproj" />
-  </ItemGroup>
-
-  <Target Name="SetNuspecProperties" BeforeTargets="GenerateNuspec">
-    <PropertyGroup>
-      <NuspecProperties>$(NuspecProperties);id=$(AssemblyName)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);config=$(Configuration)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);version=$(PackageVersion)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);description=$(Description)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);authors=$(Authors)</NuspecProperties> 
-    </PropertyGroup>
-    <Message Importance="high" Text="NuspecProperties: $(NuspecProperties)" />
-  </Target>
-
 </Project>

Directory.Build.props …coQueries.PetaPoco/Directory.Build.propsDirectory.Build.props renamed to StaTypPocoQueries.PetaPoco/Directory.Build.props Directory.Build.props renamed to StaTypPocoQueries.PetaPoco/Directory.Build.props

@@ -1,5 +1,5 @@
 {
-  "version": "1.0",
+  "version": "1.1",
   "publicReleaseRefSpec": [
     "^refs/heads/master$",
     "^refs/heads/v\\d+(?:\\.\\d+)?$"