diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dbb9685..bd3179a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,7 +23,10 @@ jobs: dotnet-version: '3.1.101' - name: Build NuGet - run: dotnet pack -c Release -o out --version-suffix ${{ steps.vars.outputs.tag }} Lucene.Net.Sql.MySql/Lucene.Net.Sql.MySql.csproj + run: dotnet pack -c Release -o out --version-suffix ${{ steps.vars.outputs.tag }} - - name: Deploy NuGet Binaries + - name: Deploy NuGet Core Binaries + run: dotnet nuget push out/Lucene.Net.Sql.${{ steps.vars.outputs.tag }}.nupkg -k ${{ secrets.CICD_KEY }} -s https://api.nuget.org/v3/index.json + + - name: Deploy NuGet MySql Binaries run: dotnet nuget push out/Lucene.Net.Sql.MySql.${{ steps.vars.outputs.tag }}.nupkg -k ${{ secrets.CICD_KEY }} -s https://api.nuget.org/v3/index.json \ No newline at end of file diff --git a/Lucene.Net.Sql.MySql/Lucene.Net.Sql.MySql.csproj b/Lucene.Net.Sql.MySql/Lucene.Net.Sql.MySql.csproj index 773bd8e..e0776b2 100644 --- a/Lucene.Net.Sql.MySql/Lucene.Net.Sql.MySql.csproj +++ b/Lucene.Net.Sql.MySql/Lucene.Net.Sql.MySql.csproj @@ -25,14 +25,12 @@ 8.0 enable - - $(TargetsForTfmSpecificBuildOutput);IncludeReferenceAssets - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -40,17 +38,10 @@ - + - - - - - - - \ No newline at end of file diff --git a/Lucene.Net.Sql.MySql/MySqlLuceneOperator.cs b/Lucene.Net.Sql.MySql/MySqlLuceneOperator.cs index 7dbd357..ea85b02 100644 --- a/Lucene.Net.Sql.MySql/MySqlLuceneOperator.cs +++ b/Lucene.Net.Sql.MySql/MySqlLuceneOperator.cs @@ -2,7 +2,7 @@ using J2N.Collections.Generic; using Lucene.Net.Sql.Exceptions; using Lucene.Net.Sql.Models; -using MySql.Data.MySqlClient; +using MySqlConnector; #pragma warning disable CA2100 diff --git a/Lucene.Net.Sql.Tests/Lucene.Net.Sql.Tests.csproj b/Lucene.Net.Sql.Tests/Lucene.Net.Sql.Tests.csproj index db19d51..f92af8b 100644 --- a/Lucene.Net.Sql.Tests/Lucene.Net.Sql.Tests.csproj +++ b/Lucene.Net.Sql.Tests/Lucene.Net.Sql.Tests.csproj @@ -7,8 +7,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Lucene.Net.Sql/Lucene.Net.Sql.csproj b/Lucene.Net.Sql/Lucene.Net.Sql.csproj index 76b8359..c18d93e 100644 --- a/Lucene.Net.Sql/Lucene.Net.Sql.csproj +++ b/Lucene.Net.Sql/Lucene.Net.Sql.csproj @@ -4,18 +4,39 @@ netstandard2.0 1701;1702;1591;0649 + $(VersionSuffix) true + Modestas Petravicius + Lucene.Net SQL + Lucene.Net SQL + Lucene.NET SQL is a library that enables persistance of Lucene index files to SQL databases. + true + GPL-3.0-or-later + GPL-3.0-or-later + https://github.com/GowenGit/Lucene-net-sql + https://github.com/GowenGit/Lucene-net-sql + Lucene; SQL; Storage; Directory + icon.png + true + + true + snupkg + 8.0 enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/Lucene.Net.Sql.MySql.Example/Lucene.Net.Sql.MySql.Example.csproj b/examples/Lucene.Net.Sql.MySql.Example/Lucene.Net.Sql.MySql.Example.csproj similarity index 96% rename from Lucene.Net.Sql.MySql.Example/Lucene.Net.Sql.MySql.Example.csproj rename to examples/Lucene.Net.Sql.MySql.Example/Lucene.Net.Sql.MySql.Example.csproj index 74c1171..8f8151c 100644 --- a/Lucene.Net.Sql.MySql.Example/Lucene.Net.Sql.MySql.Example.csproj +++ b/examples/Lucene.Net.Sql.MySql.Example/Lucene.Net.Sql.MySql.Example.csproj @@ -7,7 +7,7 @@ - + diff --git a/Lucene.Net.Sql.MySql.Example/Program.cs b/examples/Lucene.Net.Sql.MySql.Example/Program.cs similarity index 93% rename from Lucene.Net.Sql.MySql.Example/Program.cs rename to examples/Lucene.Net.Sql.MySql.Example/Program.cs index 1049413..f82372e 100644 --- a/Lucene.Net.Sql.MySql.Example/Program.cs +++ b/examples/Lucene.Net.Sql.MySql.Example/Program.cs @@ -6,7 +6,7 @@ namespace Lucene.Net.Sql.MySql.Example { - // dotnet pack -c Release -o out --version-suffix 0.0.3-alpha Lucene.Net.Sql.MySql/Lucene.Net.Sql.MySql.csproj + // dotnet pack -c Release -o out --version-suffix 0.0.6-alpha public class Program { public static void Main(string[] args) diff --git a/examples/examples.sln b/examples/examples.sln new file mode 100644 index 0000000..0615b14 --- /dev/null +++ b/examples/examples.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30615.102 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Sql.MySql.Example", "Lucene.Net.Sql.MySql.Example\Lucene.Net.Sql.MySql.Example.csproj", "{7B7A7611-6716-4BC7-9A54-495A4ECE0520}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7B7A7611-6716-4BC7-9A54-495A4ECE0520}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7B7A7611-6716-4BC7-9A54-495A4ECE0520}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7B7A7611-6716-4BC7-9A54-495A4ECE0520}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7B7A7611-6716-4BC7-9A54-495A4ECE0520}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {919A8782-5C86-4078-80BE-5D44445260C5} + EndGlobalSection +EndGlobal diff --git a/lucene-net-sql.sln b/lucene-net-sql.sln index 389a042..9389a79 100644 --- a/lucene-net-sql.sln +++ b/lucene-net-sql.sln @@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Sql.MySql", "Luc EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Sql.Performance", "Lucene.Net.Sql.Performance\Lucene.Net.Sql.Performance.csproj", "{D7AD39A2-F26F-45A1-8581-0ACB31E55923}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lucene.Net.Sql.MySql.Example", "Lucene.Net.Sql.MySql.Example\Lucene.Net.Sql.MySql.Example.csproj", "{81A7EFC1-B3DF-423D-8155-732BFA5C0F26}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -35,10 +33,6 @@ Global {D7AD39A2-F26F-45A1-8581-0ACB31E55923}.Debug|Any CPU.Build.0 = Debug|Any CPU {D7AD39A2-F26F-45A1-8581-0ACB31E55923}.Release|Any CPU.ActiveCfg = Release|Any CPU {D7AD39A2-F26F-45A1-8581-0ACB31E55923}.Release|Any CPU.Build.0 = Release|Any CPU - {81A7EFC1-B3DF-423D-8155-732BFA5C0F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81A7EFC1-B3DF-423D-8155-732BFA5C0F26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81A7EFC1-B3DF-423D-8155-732BFA5C0F26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81A7EFC1-B3DF-423D-8155-732BFA5C0F26}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE