added netcore as target, updated devtools, updated version

Author: davidegironi

AdvancedDataGridView.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30804.86
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35527.113 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedDataGridView", "AdvancedDataGridView\AdvancedDataGridView.csproj", "{6EBA0A55-B390-4479-A564-58D46094998D}"
 EndProject

AdvancedDataGridView/AdvancedDataGridView.csproj

@@ -10,7 +10,7 @@ About
 
 ## Requirements
 
-* Microsoft Windows with .NET Framework 4, .NET Core 5 or later
+* Microsoft Windows with .NET Framework 4, .NET Core 3.1, .NET 5 or later
 
 ## FAQ
 

AdvancedDataGridViewSample/AdvancedDataGridViewSample.csproj

@@ -6,7 +6,7 @@ $solutionName = "AdvancedDataGridView"
 $versionMajor = "1"
 $versionMinor = "2"
 $versionBuild = GetVersionBuild
-$versionRevision = "17"
+$versionRevision = "18"
 #build version number
 $version = GetVersion $versionMajor $versionMinor $versionBuild $versionRevision
 

README.md

@@ -266,7 +266,7 @@ task ReleaseBin -depends CleanWorking, UpdateVersion, Build {
 			}
 
 			#check if is SDK project
-			$isSdk = Select-String -Path "$sourceDir\$projectFile" -Pattern '<Project Sdk="Microsoft.NET.Sdk">' -SimpleMatch -Quiet
+			$isSdk = Select-String -Path "$sourceDir\$projectFile" -Pattern 'Microsoft.NET.Sdk' -SimpleMatch -Quiet
 
 			#copy project release files
 			robocopy @("$projectDirectory\bin\Release", "$workingDir\Bin\$projectName", '*.*', '/S', '/NP', '/XO', '/XF', '*.pdb', '*.xml') | Out-Default
@@ -479,18 +479,36 @@ task Test -depends Build {
 			$projectDirectoryFileInfo = Get-ChildItem "$sourceDir\$projectFile"
 			$projectDirectory = $projectDirectoryFileInfo.DirectoryName
 
-			ForEach ($test in $tests)
+			#check if is SDK project
+			$isSdk = Select-String -Path "$sourceDir\$projectFile" -Pattern 'Microsoft.NET.Sdk' -SimpleMatch -Quiet
+			
+			if($isSdk)
 			{
-				$targetFrameworks = GetTargetFrameworks($projectDirectoryFileInfo)
-				if ($projectName -eq $test.Name)
+				ForEach ($test in $tests)
 				{
-					ForEach($targetFramework in $targetFrameworks)
-					{	
-						$targetFrameworkName = $targetFramework.Name
-						
-						Write-Host -ForegroundColor Green "Running tests " $test.Name " on " $targetFrameworkName
-										
-						exec { dotnet test "$sourceDir\$projectFile" -c "Release" -f "$targetFrameworkName" | Out-Default }
+					$targetFrameworks = GetTargetFrameworks($projectDirectoryFileInfo)
+					if ($projectName -eq $test.Name)
+					{
+						ForEach($targetFramework in $targetFrameworks)
+						{	
+							$targetFrameworkName = $targetFramework.Name
+							
+							Write-Host -ForegroundColor Green "Running tests " $test.Name " on " $targetFrameworkName
+											
+							exec { dotnet test "$sourceDir\$projectFile" -c "Release" -f "$targetFrameworkName" | Out-Default }
+						}
+					}
+				}
+			}
+			else
+			{
+				ForEach ($test in $tests)
+				{
+					if ($projectName -eq $test.Name)
+					{
+						Write-Host -ForegroundColor Green "Running tests " $test.Name
+											
+						exec { dotnet test "$sourceDir\$projectFile" -c "Release" | Out-Default }
 					}
 				}
 			}
@@ -627,4 +645,4 @@ function Update-VersionProjectFiles ([string] $solutionFile, [string] $versionNu
 
 		$xmlDoc.Save("$sourceDir\$projectFile")
 	}
-}
+}