Merge pull request #1651 from libgit2/net46

Target net46 instead of net461

Author: ethomson

LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

@@ -1,14 +1,13 @@
 <ProjectSdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
- <DefineConstantsCondition=" '$(TargetFramework)' == 'net461' ">$(DefineConstants);DESKTOP</DefineConstants>
+ <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>
  <ProjectReferenceInclude="..\LibGit2Sharp\LibGit2Sharp.csproj" />
- <ProjectReferenceInclude="..\NativeLibraryLoadTestApp\x86\NativeLibraryLoadTestApp.x86.csproj"Condition="'$(TargetFramework)' == 'net461'"ReferenceOutputAssembly="false"OutputItemType="TestAppExe" />
- <ProjectReferenceInclude="..\NativeLibraryLoadTestApp\x64\NativeLibraryLoadTestApp.x64.csproj"Condition="'$(TargetFramework)' == 'net461'"ReferenceOutputAssembly="false"OutputItemType="TestAppExe" />
+ <ProjectReferenceInclude="..\NativeLibraryLoadTestApp\x86\NativeLibraryLoadTestApp.x86.csproj"Condition="'$(TargetFramework)' == 'net46'"ReferenceOutputAssembly="false"OutputItemType="TestAppExe" />
+ <ProjectReferenceInclude="..\NativeLibraryLoadTestApp\x64\NativeLibraryLoadTestApp.x64.csproj"Condition="'$(TargetFramework)' == 'net46'"ReferenceOutputAssembly="false"OutputItemType="TestAppExe" />
  </ItemGroup>
 
  <ItemGroup>
@@ -22,7 +21,7 @@
 
  <ItemGroup>
  <CompileInclude="..\LibGit2Sharp\Core\Platform.cs"Link="TestHelpers\Platform.cs" />
- <CompileRemove="desktop\**"Condition=" '$(TargetFramework)' != 'net461' " />
+ <CompileRemove="desktop\**"Condition=" '$(TargetFramework)' != 'net46' " />
  </ItemGroup>
 
  <ItemGroup>

LibGit2Sharp.Tests/SetErrorFixture.cs

@@ -49,7 +49,7 @@ public void FormatAggregateException()
 ExceptionexceptionToThrow=newAggregateException(aggregateExceptionMessage,newException(innerExceptionMessage),newException(innerExceptionMessage2));
 
 StringBuildersb=newStringBuilder();
-#if DESKTOP
+#if NETFRAMEWORK
 sb.AppendLine(aggregateExceptionMessage);
 #else
 sb.AppendLine($"{aggregateExceptionMessage} ({innerExceptionMessage}) ({innerExceptionMessage2})");

LibGit2Sharp/LibGit2Sharp.csproj

@@ -1,7 +1,7 @@
 <ProjectSdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
  <Description>LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .Net and Mono.</Description>
  <Company>LibGit2Sharp contributors</Company>
@@ -29,7 +29,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReferenceInclude="LibGit2Sharp.NativeBinaries"Version="[1.0.258]"PrivateAssets="none" />
+ <PackageReferenceInclude="LibGit2Sharp.NativeBinaries"Version="[1.0.260]"PrivateAssets="none" />
  <PackageReferenceInclude="Microsoft.SourceLink.GitHub"Version="1.0.0-beta-63127-02"PrivateAssets="all" />
  <PackageReferenceInclude="Nerdbank.GitVersioning"Version="2.2.13"PrivateAssets="all" />
  </ItemGroup>

NativeLibraryLoadTestApp/x64/NativeLibraryLoadTestApp.x64.csproj

@@ -2,7 +2,7 @@
 
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>net461</TargetFramework>
+ <TargetFramework>net46</TargetFramework>
  <PlatformTarget>x64</PlatformTarget>
  </PropertyGroup>
 

NativeLibraryLoadTestApp/x86/NativeLibraryLoadTestApp.x86.csproj

@@ -2,7 +2,7 @@
 
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>net461</TargetFramework>
+ <TargetFramework>net46</TargetFramework>
  <PlatformTarget>x86</PlatformTarget>
  </PropertyGroup>
 

appveyor.yml

@@ -90,16 +90,16 @@ test_script:
 {
  .\packages\OpenCover\tools\OpenCover.Console.exe `
  -register:user `
- "-target:""$Env:userprofile\.nuget\packages\xunit.runner.console\2.4.0\tools\net461\$runner""" `
- "-targetargs:""$Env:APPVEYOR_BUILD_FOLDER\bin\LibGit2Sharp.Tests\Release\net461\LibGit2Sharp.Tests.dll"" -noshadow" `
+ "-target:""$Env:userprofile\.nuget\packages\xunit.runner.console\2.4.0\tools\net46\$runner""" `
+ "-targetargs:""$Env:APPVEYOR_BUILD_FOLDER\bin\LibGit2Sharp.Tests\Release\net46\LibGit2Sharp.Tests.dll"" -noshadow" `
  "-filter:+[LibGit2Sharp]* -[LibGit2Sharp.Tests]*" `
  -hideskipped:All `
  -output:opencoverCoverage.xml
  }
  ElseIf ($Env:SHOULD_RUN_COVERITY_ANALYSIS -eq $False)
 {
- & "$Env:userprofile\.nuget\packages\xunit.runner.console\2.4.0\tools\net461\$runner" `
- "$Env:APPVEYOR_BUILD_FOLDER\bin\LibGit2Sharp.Tests\Release\net461\LibGit2Sharp.Tests.dll" -noshadow
+ & "$Env:userprofile\.nuget\packages\xunit.runner.console\2.4.0\tools\net46\$runner" `
+ "$Env:APPVEYOR_BUILD_FOLDER\bin\LibGit2Sharp.Tests\Release\net46\LibGit2Sharp.Tests.dll" -noshadow
  }
  }
 

buildandtest.cmd

@@ -31,7 +31,7 @@ dotnet build "%~dp0\" /v:minimal /nologo /property:ExtraDefine="%EXTRADEFINE%"
 @IF ERRORLEVEL 1EXIT /B %ERRORLEVEL%
 
 :: Run tests on Desktop and CoreCLR
-"%userprofile%\.nuget\packages\xunit.runner.console\2.4.0\tools\net452\xunit.console.exe""%~dp0bin\LibGit2Sharp.Tests\%Configuration%\net461\LibGit2Sharp.Tests.dll" -noshadow
+"%userprofile%\.nuget\packages\xunit.runner.console\2.4.0\tools\net452\xunit.console.exe""%~dp0bin\LibGit2Sharp.Tests\%Configuration%\net46\LibGit2Sharp.Tests.dll" -noshadow
 @IF ERRORLEVEL 1EXIT /B %ERRORLEVEL%
 dotnet test "%~dp0LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj" -f netcoreapp2.0 --no-restore --no-build
 @IF ERRORLEVEL 1EXIT /B %ERRORLEVEL%