From 00abb18d7093f1ff3b38783dcb1a707b53020b3f Mon Sep 17 00:00:00 2001 From: Riku Virtanen Date: Wed, 15 Feb 2023 14:34:52 +0200 Subject: [PATCH 1/6] Updated dependency MySql.Data --- Frends.Community.MySql/Frends.Community.MySql.csproj | 4 ++-- README.md | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Frends.Community.MySql/Frends.Community.MySql.csproj b/Frends.Community.MySql/Frends.Community.MySql.csproj index d1320d2..d2e8f1f 100644 --- a/Frends.Community.MySql/Frends.Community.MySql.csproj +++ b/Frends.Community.MySql/Frends.Community.MySql.csproj @@ -10,7 +10,7 @@ true Frends true - 2.1.0 + 2.1.1 @@ -23,7 +23,7 @@ - + diff --git a/README.md b/README.md index 99e7907..093e960 100644 --- a/README.md +++ b/README.md @@ -100,4 +100,5 @@ NOTE: Be sure to merge the latest from "upstream" before making a pull request! | ----- | ----- | | 1.0.7 | Initial version of MySql Query Task | | 2.0.0 | Task parameters are completely chnaged, so manual work is needed when updating to this version. Tasks are now based on dapper.| +| 2.1.1 | MySql.Data library updated from 8.0.23 to 8.0.32. | From 271d077128ab9ba5060d06b8eb1dc2926739dc55 Mon Sep 17 00:00:00 2001 From: Riku Virtanen Date: Wed, 15 Feb 2023 14:56:23 +0200 Subject: [PATCH 2/6] Updated dependency for test project --- .../Frends.Community.MySql.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj b/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj index cdb8c68..45eecce 100644 --- a/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj +++ b/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj @@ -11,7 +11,7 @@ - + From b98c1202f39f5af6e9367e2f8b92a05c958757ef Mon Sep 17 00:00:00 2001 From: Riku Virtanen Date: Wed, 15 Feb 2023 14:59:24 +0200 Subject: [PATCH 3/6] Changed test framework --- .../Frends.Community.MySql.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj b/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj index 45eecce..53e974b 100644 --- a/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj +++ b/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj @@ -1,7 +1,7 @@  - net5 + net471 false From 217625543d0eae982213a23aa33cf928580a2b7c Mon Sep 17 00:00:00 2001 From: Riku Virtanen Date: Wed, 15 Feb 2023 16:06:12 +0200 Subject: [PATCH 4/6] Debugging --- .../Frends.Community.MySql.Tests.csproj | 2 +- Frends.Community.MySql/Frends.Community.MySql.csproj | 6 ------ Frends.Community.MySql/FrendsTaskMetadata.json | 9 +++++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj b/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj index 53e974b..45eecce 100644 --- a/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj +++ b/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj @@ -1,7 +1,7 @@  - net471 + net5 false diff --git a/Frends.Community.MySql/Frends.Community.MySql.csproj b/Frends.Community.MySql/Frends.Community.MySql.csproj index d2e8f1f..4f476c5 100644 --- a/Frends.Community.MySql/Frends.Community.MySql.csproj +++ b/Frends.Community.MySql/Frends.Community.MySql.csproj @@ -32,10 +32,4 @@ - - - - - - diff --git a/Frends.Community.MySql/FrendsTaskMetadata.json b/Frends.Community.MySql/FrendsTaskMetadata.json index b7a25a2..ef027b9 100644 --- a/Frends.Community.MySql/FrendsTaskMetadata.json +++ b/Frends.Community.MySql/FrendsTaskMetadata.json @@ -1,10 +1,11 @@ { - "Tasks": [ + "Tasks": + [ { "TaskMethod": "Frends.Community.MySql.MySqlTasks.ExecuteQuery" }, - { - "TaskMethod": "Frends.Community.MySql.MySqlTasks.ExecuteProcedure" - } + { + "TaskMethod": "Frends.Community.MySql.MySqlTasks.ExecuteProcedure" + } ] } \ No newline at end of file From 2d7b9132bd5a55ac24b0743e2f8077c52a95219b Mon Sep 17 00:00:00 2001 From: Riku Virtanen Date: Wed, 15 Feb 2023 16:17:26 +0200 Subject: [PATCH 5/6] Fixed --- .../Frends.Community.MySql.Tests.csproj | 2 +- Frends.Community.MySql.Tests/MySqlQueryTests.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj b/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj index 45eecce..53e974b 100644 --- a/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj +++ b/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj @@ -1,7 +1,7 @@  - net5 + net471 false diff --git a/Frends.Community.MySql.Tests/MySqlQueryTests.cs b/Frends.Community.MySql.Tests/MySqlQueryTests.cs index 3bf09ca..50586ae 100644 --- a/Frends.Community.MySql.Tests/MySqlQueryTests.cs +++ b/Frends.Community.MySql.Tests/MySqlQueryTests.cs @@ -2,7 +2,6 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions; using MySql.Data.MySqlClient; using NUnit.Framework; @@ -166,7 +165,7 @@ public async Task ShouldSuccess_InsertValues() var q = new QueryInput { ConnectionString = _connectionString, - CommandText = "insert into HodorTest (name, value) values ( " + rndName.AddDoubleQuote() + " , " + rndValue + " );" + CommandText = $"insert into HodorTest (name, value) values ( \"{rndName}\" , {rndValue});" }; _options.MySqlTransactionIsolationLevel = MySqlTransactionIsolationLevel.Default; From 953ce407401bd46eb9addb7e0a93bc4033d985be Mon Sep 17 00:00:00 2001 From: Riku Virtanen Date: Wed, 15 Feb 2023 16:19:10 +0200 Subject: [PATCH 6/6] Removed symbols from workflows --- .github/workflows/BuildAndTestOnEveryPush.yml | 2 +- .github/workflows/PackAndPushAfterMerge.yml | 2 +- Frends.Community.MySql/Definitions.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/BuildAndTestOnEveryPush.yml b/.github/workflows/BuildAndTestOnEveryPush.yml index 05fdcd4..35e1c20 100644 --- a/.github/workflows/BuildAndTestOnEveryPush.yml +++ b/.github/workflows/BuildAndTestOnEveryPush.yml @@ -25,4 +25,4 @@ jobs: run: dotnet pack --configuration Release --include-source - name: Push NuGet package to the testfeed - run: dotnet nuget push Frends.Community.MySql/bin/Release/Frends.Community.MySql.*.nupkg --api-key ${{ secrets.COMMUNITY_FEED_API_KEY }} --source https://www.myget.org/F/frends-community-test/api/v2/package --symbol-source https://www.myget.org/F/frends-community-test/symbols/api/v2/package + run: dotnet nuget push Frends.Community.MySql/bin/Release/Frends.Community.MySql.*.nupkg --api-key ${{ secrets.COMMUNITY_FEED_API_KEY }} --source https://www.myget.org/F/frends-community-test/api/v2/package diff --git a/.github/workflows/PackAndPushAfterMerge.yml b/.github/workflows/PackAndPushAfterMerge.yml index 8c04f01..73976c3 100644 --- a/.github/workflows/PackAndPushAfterMerge.yml +++ b/.github/workflows/PackAndPushAfterMerge.yml @@ -24,7 +24,7 @@ jobs: run: dotnet pack --configuration Release --include-source - name: Push NuGet package to the (prod) feed - run: dotnet nuget push Frends.Community.MySql/bin/Release/Frends.Community.MySql.*.nupkg --api-key ${{ secrets.COMMUNITY_FEED_API_KEY }} --source https://www.myget.org/F/frends-community/api/v2/package --symbol-source https://www.myget.org/F/frends-community/symbols/api/v2/package + run: dotnet nuget push Frends.Community.MySql/bin/Release/Frends.Community.MySql.*.nupkg --api-key ${{ secrets.COMMUNITY_FEED_API_KEY }} --source https://www.myget.org/F/frends-community/api/v2/package - name: Create Release id: create_release diff --git a/Frends.Community.MySql/Definitions.cs b/Frends.Community.MySql/Definitions.cs index f712043..e76ce91 100644 --- a/Frends.Community.MySql/Definitions.cs +++ b/Frends.Community.MySql/Definitions.cs @@ -66,7 +66,7 @@ public class Options { /// - /// Timeout value in seconds + /// Timeout value in seconds. /// [DefaultValue(30)] public int TimeoutSeconds { get; set; }