Merge pull request #1891 from libgit2/add-net50

bording · web-flow · commit 7c78387a3b5c · 2021-07-03T19:51:50.000-04:00
Add .NET 5 test target
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,8 +7,5 @@
     <PackageOutputPath>$(MSBuildThisFileDirectory)bin\Packages\$(Configuration)\</PackageOutputPath>
     <DefineConstants Condition=" '$(ExtraDefine)' != '' ">$(DefineConstants);$(ExtraDefine)</DefineConstants>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
+  
 </Project>
diff --git a/LibGit2Sharp.Tests/BlobFixture.cs b/LibGit2Sharp.Tests/BlobFixture.cs
@@ -3,7 +3,6 @@
 using System.Text;
 using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
-using Xunit.Extensions;
 
 namespace LibGit2Sharp.Tests
 {
@@ -44,6 +43,7 @@ public void CanGetBlobAsFilteredText(string autocrlf, string expectedText)
             }
         }
 
+#if NETFRAMEWORK || NETCOREAPP2_1
         [Theory]
         [InlineData("ascii", 4, "31 32 33 34")]
         [InlineData("utf-7", 4, "31 32 33 34")]
@@ -83,6 +83,7 @@ public void CanGetBlobAsTextWithVariousEncodings(string encodingName, int expect
                 Assert.Equal(expectedUtf7Chars, string.Join(" ", utf7Chars));
             }
         }
+#endif
 
         [Fact]
         public void CanGetBlobSize()
@@ -185,7 +186,7 @@ public void CanStageAFileGeneratedFromABlobContentStream()
                     var sb = new StringBuilder();
                     for (int j = 0; j < 2000; j++)
                     {
-                        sb.Append(((i + 1)*(j + 1)).ToString("X8"));
+                        sb.Append(((i + 1) * (j + 1)).ToString("X8"));
                     }
                     File.AppendAllText(Path.Combine(repo.Info.WorkingDirectory, "small.txt"), sb.ToString());
                 }
diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -1,29 +1,28 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp2.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\LibGit2Sharp\LibGit2Sharp.csproj" />
-    <ProjectReference Include="..\NativeLibraryLoadTestApp\x86\NativeLibraryLoadTestApp.x86.csproj" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
-    <ProjectReference Include="..\NativeLibraryLoadTestApp\x64\NativeLibraryLoadTestApp.x64.csproj" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
+    <ProjectReference Include="..\NativeLibraryLoadTestApp\x86\NativeLibraryLoadTestApp.x86.csproj" Condition="'$(TargetFramework)' == 'net472'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
+    <ProjectReference Include="..\NativeLibraryLoadTestApp\x64\NativeLibraryLoadTestApp.x64.csproj" Condition="'$(TargetFramework)' == 'net472'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="coverlet.msbuild" Version="2.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="Moq" Version="4.10.1" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.console" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <PackageReference Include="xunit.skippablefact" Version="1.3.12" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageReference Include="xunit.skippablefact" Version="1.4.13" />
   </ItemGroup>
 
   <ItemGroup>
     <Compile Include="..\LibGit2Sharp\Core\Platform.cs" Link="TestHelpers\Platform.cs" />
-    <Compile Remove="desktop\**" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
+    <Compile Remove="desktop\**" Condition="'$(TargetFramework)' != 'net472'" />
     <Content Include="Resources\**\*.*" CopyToOutputDirectory="PreserveNewest" />
     <None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
diff --git a/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs b/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs
@@ -7,7 +7,6 @@
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
-using LibGit2Sharp.Core;
 using Xunit;
 
 namespace LibGit2Sharp.Tests.TestHelpers
@@ -21,7 +20,7 @@ public BaseFixture()
             BuildFakeConfigs(this);
 
 #if LEAKS_IDENTIFYING
-            LeaksContainer.Clear();
+            Core.LeaksContainer.Clear();
 #endif
         }
 
@@ -65,7 +64,11 @@ private static void SetUpTestEnvironment()
 
             if (resourcesPath == null)
             {
+#if NETFRAMEWORK
                 resourcesPath = Path.Combine(Directory.GetParent(new Uri(typeof(BaseFixture).GetTypeInfo().Assembly.CodeBase).LocalPath).FullName, "Resources");
+#else
+                resourcesPath = Path.Combine(Directory.GetParent(typeof(BaseFixture).GetTypeInfo().Assembly.Location).FullName, "Resources");
+#endif
             }
 
             ResourcesDirectory = new DirectoryInfo(resourcesPath);
@@ -273,11 +276,11 @@ public virtual void Dispose()
             GC.Collect();
             GC.WaitForPendingFinalizers();
 
-            if (LeaksContainer.TypeNames.Any())
+            if (Core.LeaksContainer.TypeNames.Any())
             {
                 Assert.False(true, string.Format("Some handles of the following types haven't been properly released: {0}.{1}"
                     + "In order to get some help fixing those leaks, uncomment the define LEAKS_TRACKING in Libgit2Object.cs{1}"
-                    + "and run the tests locally.", string.Join(", ", LeaksContainer.TypeNames), Environment.NewLine));
+                    + "and run the tests locally.", string.Join(", ", Core.LeaksContainer.TypeNames), Environment.NewLine));
             }
 #endif
         }
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -34,7 +34,7 @@
   <ItemGroup>
     <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.312]" PrivateAssets="none" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.50" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.220" PrivateAssets="all" />
   </ItemGroup>
 
   <Import Project="..\Targets\CodeGenerator.targets" />
diff --git a/azure-pipelines/dotnet.yml b/azure-pipelines/dotnet.yml
@@ -6,22 +6,6 @@ steps:
 - script: dotnet pack --no-build -c $(BuildConfiguration) /v:m /bl:"$(Build.ArtifactStagingDirectory)/build_logs/pack.binlog"
   displayName: dotnet pack
 
-- task: DotNetCoreCLI@2
-  displayName: dotnet test -f net46 (w/ coverage)
-  inputs:
-    command: test
-    arguments: --no-build -c $(BuildConfiguration) -f net46 --filter "TestCategory!=FailsInCloudTest & TestCategory!=FailsWhileInstrumented" -v n /p:CollectCoverage=true
-    testRunTitle: net46-$(Agent.JobName)
-  condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-
-- task: DotNetCoreCLI@2
-  displayName: dotnet test -f net46 (w/o coverage)
-  inputs:
-    command: test
-    arguments: --no-build -c $(BuildConfiguration) -f net46 --filter "TestCategory!=FailsInCloudTest & TestCategory=FailsWhileInstrumented" -v n
-    testRunTitle: net46-$(Agent.JobName)-nocoverage
-  condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-
 - task: DotNetCoreCLI@2
   displayName: dotnet test -f net472 (w/ coverage)
   inputs:
@@ -45,6 +29,13 @@ steps:
     arguments: --no-build -c $(BuildConfiguration) -f netcoreapp2.1 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true
     testRunTitle: netcoreapp2.1-$(Agent.JobName)
 
+- task: DotNetCoreCLI@2
+  displayName: dotnet test -f net5.0
+  inputs:
+    command: test
+    arguments: --no-build -c $(BuildConfiguration) -f net5.0 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true
+    testRunTitle: net5.0-$(Agent.JobName)
+
 - task: PowerShell@2
   inputs:
     filePath: azure-pipelines/artifacts/_pipelines.ps1
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.1.201"
+    "version": "5.0.301"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using System.Text;`
`4`	`4`	`using LibGit2Sharp.Tests.TestHelpers;`
`5`	`5`	`using Xunit;`
`6`		`-using Xunit.Extensions;`
`7`	`6`
`8`	`7`	`namespace LibGit2Sharp.Tests`
`9`	`8`	`{`
`@@ -44,6 +43,7 @@ public void CanGetBlobAsFilteredText(string autocrlf, string expectedText)`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`
	`46`	`+#if NETFRAMEWORK \|\| NETCOREAPP2_1`
`47`	`47`	`[Theory]`
`48`	`48`	`[InlineData("ascii", 4, "31 32 33 34")]`
`49`	`49`	`[InlineData("utf-7", 4, "31 32 33 34")]`
`@@ -83,6 +83,7 @@ public void CanGetBlobAsTextWithVariousEncodings(string encodingName, int expect`
`83`	`83`	`Assert.Equal(expectedUtf7Chars, string.Join(" ", utf7Chars));`
`84`	`84`	`}`
`85`	`85`	`}`
	`86`	`+#endif`
`86`	`87`
`87`	`88`	`[Fact]`
`88`	`89`	`public void CanGetBlobSize()`
`@@ -185,7 +186,7 @@ public void CanStageAFileGeneratedFromABlobContentStream()`
`185`	`186`	`var sb = new StringBuilder();`
`186`	`187`	`for (int j = 0; j < 2000; j++)`
`187`	`188`	`{`
`188`		`- sb.Append(((i + 1)*(j + 1)).ToString("X8"));`
	`189`	`+ sb.Append(((i + 1) * (j + 1)).ToString("X8"));`
`189`	`190`	`}`
`190`	`191`	`File.AppendAllText(Path.Combine(repo.Info.WorkingDirectory, "small.txt"), sb.ToString());`
`191`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`using System.Reflection;`
`8`	`8`	`using System.Text;`
`9`	`9`	`using System.Text.RegularExpressions;`
`10`		`-using LibGit2Sharp.Core;`
`11`	`10`	`using Xunit;`
`12`	`11`
`13`	`12`	`namespace LibGit2Sharp.Tests.TestHelpers`
`@@ -21,7 +20,7 @@ public BaseFixture()`
`21`	`20`	`BuildFakeConfigs(this);`
`22`	`21`
`23`	`22`	`#if LEAKS_IDENTIFYING`
`24`		`- LeaksContainer.Clear();`
	`23`	`+ Core.LeaksContainer.Clear();`
`25`	`24`	`#endif`
`26`	`25`	`}`
`27`	`26`
`@@ -65,7 +64,11 @@ private static void SetUpTestEnvironment()`
`65`	`64`
`66`	`65`	`if (resourcesPath == null)`
`67`	`66`	`{`
	`67`	`+#if NETFRAMEWORK`
`68`	`68`	`resourcesPath = Path.Combine(Directory.GetParent(new Uri(typeof(BaseFixture).GetTypeInfo().Assembly.CodeBase).LocalPath).FullName, "Resources");`
	`69`	`+#else`
	`70`	`+ resourcesPath = Path.Combine(Directory.GetParent(typeof(BaseFixture).GetTypeInfo().Assembly.Location).FullName, "Resources");`
	`71`	`+#endif`
`69`	`72`	`}`
`70`	`73`
`71`	`74`	`ResourcesDirectory = new DirectoryInfo(resourcesPath);`
`@@ -273,11 +276,11 @@ public virtual void Dispose()`
`273`	`276`	`GC.Collect();`
`274`	`277`	`GC.WaitForPendingFinalizers();`
`275`	`278`
`276`		`- if (LeaksContainer.TypeNames.Any())`
	`279`	`+ if (Core.LeaksContainer.TypeNames.Any())`
`277`	`280`	`{`
`278`	`281`	`Assert.False(true, string.Format("Some handles of the following types haven't been properly released: {0}.{1}"`
`279`	`282`	`+ "In order to get some help fixing those leaks, uncomment the define LEAKS_TRACKING in Libgit2Object.cs{1}"`
`280`		`- + "and run the tests locally.", string.Join(", ", LeaksContainer.TypeNames), Environment.NewLine));`
	`283`	`+ + "and run the tests locally.", string.Join(", ", Core.LeaksContainer.TypeNames), Environment.NewLine));`
`281`	`284`	`}`
`282`	`285`	`#endif`
`283`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "3.1.201"`
	`3`	`+ "version": "5.0.301"`
`4`	`4`	`}`
`5`	`5`	`}`