Merge pull request #9 from CommunityHiQ/dependencyUpdate

Updated dependency MySql.Data
CommunityHiQ · Feb 16, 2023 · 853529f · 853529f
2 parents f61ad48 + 953ce40
commit 853529f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 19 deletions.
diff --git 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
@@ -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.Tests/Frends.Community.MySql.Tests.csproj b/Frends.Community.MySql.Tests/Frends.Community.MySql.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5</TargetFramework>
+    <TargetFramework>net471</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MySql.Data" Version="8.0.23" />
+    <PackageReference Include="MySql.Data" Version="8.0.32" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="nunit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />

diff --git 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;

diff --git a/Frends.Community.MySql/Definitions.cs b/Frends.Community.MySql/Definitions.cs
@@ -66,7 +66,7 @@ public class Options
     {
 
         /// <summary>
-        /// Timeout value in seconds
+        /// Timeout value in seconds.
         /// </summary>
         [DefaultValue(30)]
         public int TimeoutSeconds { get; set; }

diff --git a/Frends.Community.MySql/Frends.Community.MySql.csproj b/Frends.Community.MySql/Frends.Community.MySql.csproj
@@ -10,7 +10,7 @@
 		<IncludeSource>true</IncludeSource>
 		<PackageTags>Frends</PackageTags>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<Version>2.1.0</Version>
+		<Version>2.1.1</Version>
 
 	</PropertyGroup>
 
@@ -23,7 +23,7 @@
 	<ItemGroup>
 		<PackageReference Include="Dapper" Version="2.0.78" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="MySql.Data" Version="8.0.23" />
+		<PackageReference Include="MySql.Data" Version="8.0.32" />
 		<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
 		<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
 		<PackageReference Include="System.Data.Common" Version="4.3.0" />
@@ -32,10 +32,4 @@
 		<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
 	</ItemGroup>
 
-	<ProjectExtensions>
-		<VisualStudio>
-			<UserProperties frendstaskmetadata_1json__JsonSchema="http://json.schemastore.org/azure-iot-edge-deployment-template-2.0" />
-		</VisualStudio>
-	</ProjectExtensions>
-
 </Project>
diff --git 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"
+    }
   ]
 }
diff --git 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. |