Bump sdk and move .NET tool to LTS (coverlet-coverage#1022)

Bump sdk and move .NET tool to LTS
Bertk · Dec 27, 2020 · bc58ae0 · bc58ae0
1 parent fcb2ec0
commit bc58ae0
Show file tree

Hide file tree

Showing 19 changed files with 75 additions and 75 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.28" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/eng/azure-pipelines-nightly.yml b/eng/azure-pipelines-nightly.yml
@@ -4,13 +4,13 @@ pool:
 steps:
 - task: UseDotNet@2
   inputs:
-    version: 2.2.402
-  displayName: Install .NET Core SDK 2.2.402
+    version: 3.1.404
+  displayName: Install .NET Core SDK 3.1.404
 
 - task: UseDotNet@2
   inputs:
-    version: 3.1.401
-  displayName: Install .NET Core SDK 3.1.401
+    version: 5.0.101
+  displayName: Install .NET Core SDK 5.0.101
 
 - task: NuGetAuthenticate@0
   displayName: Authenticate with NuGet feeds

diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml
@@ -7,7 +7,7 @@ trigger:
 jobs:
 - job: Windows
   displayName: Windows
-  continueOnError: true
+  continueOnError: 'true'
   strategy:
     matrix:
       Debug:
@@ -37,7 +37,7 @@ jobs:
 
 - job: macOS
   displayName: macOS
-  continueOnError: true
+  continueOnError: 'true'
   strategy:
     matrix:
       Debug:
@@ -51,7 +51,7 @@ jobs:
 
 - job: Linux
   displayName: Linux
-  continueOnError: true
+  continueOnError: 'true'
   strategy:
     matrix:
       Debug:

diff --git a/eng/build.yml b/eng/build.yml
@@ -1,13 +1,13 @@
 steps:
 - task: UseDotNet@2
   inputs:
-    version: 2.2.402
-  displayName: Install .NET Core SDK 2.2.402
+    version: 3.1.404
+  displayName: Install .NET Core SDK 3.1.404
 
 - task: UseDotNet@2
   inputs:
-    version: 3.1.401
-  displayName: Install .NET Core SDK 3.1.401
+    version: 5.0.101
+  displayName: Install .NET Core SDK 5.0.101
 
 - script: dotnet restore
   displayName: Restore packages

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.1.401"
+    "version": "5.0.101"
   }
 }
diff --git a/src/coverlet.console/coverlet.console.csproj b/src/coverlet.console/coverlet.console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <ToolCommandName>coverlet</ToolCommandName>
     <PackAsTool>true</PackAsTool>
     <AssemblyTitle>coverlet.console</AssemblyTitle>

diff --git a/test/coverlet.collector.tests/coverlet.collector.tests.csproj b/test/coverlet.collector.tests/coverlet.collector.tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/test/coverlet.core.performancetest/coverlet.core.performancetest.csproj b/test/coverlet.core.performancetest/coverlet.core.performancetest.csproj
@@ -2,7 +2,7 @@
   <Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/test/coverlet.core.tests/coverlet.core.tests.csproj b/test/coverlet.core.tests/coverlet.core.tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);CS8002</NoWarn>
     <!--For test TestInstrument_NetstandardAwareAssemblyResolver_PreserveCompilationContext-->
@@ -54,8 +54,8 @@
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Condition="$([MSBuild]::IsOSPlatform('Windows'))" Command="copy $(ProjectDir)..\coverlet.tests.projectsample.excludedbyattribute\$(OutDir) $(TargetDir)TestAssets /Y" />
-    <Exec Condition="$([MSBuild]::IsOSPlatform('OSX')) OR $([MSBuild]::IsOSPlatform('Linux'))" Command="cp -r $(ProjectDir)..\coverlet.tests.projectsample.excludedbyattribute\$(OutDir). $(TargetDir)TestAssets" />
+    <Exec Condition="$([MSBuild]::IsOSPlatform('Windows'))" Command="copy $(RepoRoot)test\coverlet.tests.projectsample.excludedbyattribute\$(OutDir) $(TargetDir)TestAssets /Y" />
+    <Exec Condition="$([MSBuild]::IsOSPlatform('OSX')) OR $([MSBuild]::IsOSPlatform('Linux'))" Command="cp -r $(RepoRoot)test/coverlet.tests.projectsample.excludedbyattribute/$(OutDir). $(TargetDir)TestAssets" />
   </Target>
 
   <Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.targets" />

diff --git a/test/coverlet.integration.determisticbuild/coverlet.integration.determisticbuild.csproj b/test/coverlet.integration.determisticbuild/coverlet.integration.determisticbuild.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildThisFileDirectory)\DeterministicTest.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <AssemblyName>coverletsample.integration.determisticbuild</AssemblyName>
     <RestoreSources>

diff --git a/test/coverlet.integration.template/coverlet.integration.template.csproj b/test/coverlet.integration.template/coverlet.integration.template.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <AssemblyName>coverletsamplelib.integration.template</AssemblyName>
     <IsTestProject>false</IsTestProject>

diff --git a/test/coverlet.integration.tests/BaseTest.cs b/test/coverlet.integration.tests/BaseTest.cs
@@ -85,7 +85,7 @@ private protected bool RunCommand(string command, string arguments, out string s
             psi.WorkingDirectory = workingDirectory;
             psi.RedirectStandardError = true;
             psi.RedirectStandardOutput = true;
-            Process commandProcess = Process.Start(psi);
+            Process commandProcess = Process.Start(psi)!;
             if (!commandProcess.WaitForExit((int)TimeSpan.FromMinutes(5).TotalMilliseconds))
             {
                 throw new XunitException($"Command 'dotnet {arguments}' didn't end after 5 minute");
@@ -114,8 +114,8 @@ private protected void UpdateNugeConfigtWithLocalPackageFolder(string projectPat
             }
 
             string localPackageFolder = Path.GetFullPath($"../../../../../bin/{GetAssemblyBuildConfiguration()}/Packages");
-            xml.Element("configuration")
-               .Element("packageSources")
+            xml.Element("configuration")!
+               .Element("packageSources")!
                .Elements()
                .ElementAt(0)
                .AddAfterSelf(new XElement("add", new XAttribute("key", "localCoverletPackages"), new XAttribute("value", localPackageFolder)));
@@ -135,9 +135,9 @@ private void SetIsTestProjectTrue(string projectPath)
                 xml = XDocument.Load(csprojStream);
             }
 
-            xml.Element("Project")
-               .Element("PropertyGroup")
-               .Element("IsTestProject").Value = "true";
+            xml.Element("Project")!
+               .Element("PropertyGroup")!
+               .Element("IsTestProject")!.Value = "true";
 
             xml.Save(csproj);
         }
@@ -155,8 +155,8 @@ private protected void AddMicrosoftNETTestSdkRef(string projectPath, string vers
                 xml = XDocument.Load(csprojStream);
             }
 
-            xml.Element("Project")
-               .Element("ItemGroup")
+            xml.Element("Project")!
+               .Element("ItemGroup")!
                .Add(new XElement("PackageReference", new XAttribute("Include", "Microsoft.NET.Test.Sdk"),
                new XAttribute("Version", version)));
             xml.Save(csproj);
@@ -175,8 +175,8 @@ private protected void AddCoverletMsbuildRef(string projectPath)
                 xml = XDocument.Load(csprojStream);
             }
             string msbuildPkgVersion = GetPackageVersion("*msbuild*.nupkg");
-            xml.Element("Project")
-               .Element("ItemGroup")
+            xml.Element("Project")!
+               .Element("ItemGroup")!
                .Add(new XElement("PackageReference", new XAttribute("Include", "coverlet.msbuild"), new XAttribute("Version", msbuildPkgVersion)));
             xml.Save(csproj);
         }
@@ -194,8 +194,8 @@ private protected void AddCoverletCollectosRef(string projectPath)
                 xml = XDocument.Load(csprojStream);
             }
             string msbuildPkgVersion = GetPackageVersion("*collector*.nupkg");
-            xml.Element("Project")
-               .Element("ItemGroup")
+            xml.Element("Project")!
+               .Element("ItemGroup")!
                .Add(new XElement("PackageReference", new XAttribute("Include", "coverlet.collector"), new XAttribute("Version", msbuildPkgVersion)));
             xml.Save(csproj);
         }
@@ -261,9 +261,9 @@ private protected void UpdateProjectTargetFramework(ClonedTemplateProject projec
                 xml = XDocument.Load(csprojStream);
             }
 
-            xml.Element("Project")
-              .Element("PropertyGroup")
-              .Element("TargetFramework")
+            xml.Element("Project")!
+              .Element("PropertyGroup")!
+              .Element("TargetFramework")!
               .Remove();
 
             XElement targetFrameworkElement;
@@ -277,7 +277,7 @@ private protected void UpdateProjectTargetFramework(ClonedTemplateProject projec
                 targetFrameworkElement = new XElement("TargetFrameworks", string.Join(';', targetFrameworks));
             }
 
-            xml.Element("Project").Element("PropertyGroup").Add(targetFrameworkElement);
+            xml.Element("Project")!.Element("PropertyGroup")!.Add(targetFrameworkElement);
             xml.Save(project.ProjectFileNamePath);
         }
 
@@ -328,14 +328,14 @@ public bool IsMultipleTargetFramework()
         {
             using var csprojStream = File.OpenRead(ProjectFileNamePath);
             XDocument xml = XDocument.Load(csprojStream);
-            return xml.Element("Project").Element("PropertyGroup").Element("TargetFramework") == null;
+            return xml.Element("Project")!.Element("PropertyGroup")!.Element("TargetFramework") == null;
         }
 
         public string[] GetTargetFrameworks()
         {
             using var csprojStream = File.OpenRead(ProjectFileNamePath);
             XDocument xml = XDocument.Load(csprojStream);
-            XElement element = xml.Element("Project").Element("PropertyGroup").Element("TargetFramework") ?? xml.Element("Project").Element("PropertyGroup").Element("TargetFrameworks");
+            XElement element = xml.Element("Project")!.Element("PropertyGroup")!.Element("TargetFramework") ?? xml.Element("Project")!.Element("PropertyGroup")!.Element("TargetFrameworks")!;
             if (element is null)
             {
                 throw new ArgumentNullException("No 'TargetFramework' neither 'TargetFrameworks' found in csproj file");
@@ -354,7 +354,7 @@ public void Dispose()
             {
                 try
                 {
-                    Directory.Delete(ProjectRootPath, true);
+                    // Directory.Delete(ProjectRootPath, true);
                 }
                 catch (UnauthorizedAccessException)
                 {

diff --git a/test/coverlet.integration.tests/Collectors.cs b/test/coverlet.integration.tests/Collectors.cs
@@ -78,7 +78,7 @@ public void TestVsTest_Test()
             Assert.True(DotnetCli($"test -c {_buildConfiguration} \"{clonedTemplateProject.ProjectRootPath}\" --collect:\"XPlat Code Coverage\" --diag:{Path.Combine(clonedTemplateProject.ProjectRootPath, "log.txt")}", out string standardOutput, out string standardError, clonedTemplateProject.ProjectRootPath!), standardOutput);
             // We don't have any result to check because tests and code to instrument are in same assembly so we need to pass
             // IncludeTestAssembly=true we do it in other test
-            Assert.Contains("Test Run Successful.", standardOutput);
+            Assert.Contains("Passed!", standardOutput);
             AssertCollectorsInjection(clonedTemplateProject);
         }
 
@@ -88,7 +88,7 @@ public void TestVsTest_Test_Settings()
             using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
             string runSettingsPath = AddCollectorRunsettingsFile(clonedTemplateProject.ProjectRootPath!);
             Assert.True(DotnetCli($"test -c {_buildConfiguration} \"{clonedTemplateProject.ProjectRootPath}\" --collect:\"XPlat Code Coverage\" --settings \"{runSettingsPath}\" --diag:{Path.Combine(clonedTemplateProject.ProjectRootPath, "log.txt")}", out string standardOutput, out string standardError), standardOutput);
-            Assert.Contains("Test Run Successful.", standardOutput);
+            Assert.Contains("Passed!", standardOutput);
             AssertCoverage(clonedTemplateProject);
             AssertCollectorsInjection(clonedTemplateProject);
         }
@@ -104,7 +104,7 @@ public void TestVsTest_VsTest()
             Assert.True(DotnetCli($"vstest \"{publishedTestFile}\" --collect:\"XPlat Code Coverage\" --diag:{Path.Combine(clonedTemplateProject.ProjectRootPath, "log.txt")}", out standardOutput, out standardError), standardOutput);
             // We don't have any result to check because tests and code to instrument are in same assembly so we need to pass
             // IncludeTestAssembly=true we do it in other test
-            Assert.Contains("Test Run Successful.", standardOutput);
+            Assert.Contains("Passed!", standardOutput);
             AssertCollectorsInjection(clonedTemplateProject);
         }
 
@@ -117,7 +117,7 @@ public void TestVsTest_VsTest_Settings()
             string publishedTestFile = clonedTemplateProject.GetFiles("*" + ClonedTemplateProject.AssemblyName + ".dll").Single(f => f.Contains("publish"));
             Assert.NotNull(publishedTestFile);
             Assert.True(DotnetCli($"vstest \"{publishedTestFile}\" --collect:\"XPlat Code Coverage\" --ResultsDirectory:\"{clonedTemplateProject.ProjectRootPath}\" /settings:\"{runSettingsPath}\" --diag:{Path.Combine(clonedTemplateProject.ProjectRootPath, "log.txt")}", out standardOutput, out standardError), standardOutput);
-            Assert.Contains("Test Run Successful.", standardOutput);
+            Assert.Contains("Passed!", standardOutput);
             AssertCoverage(clonedTemplateProject);
             AssertCollectorsInjection(clonedTemplateProject);
         }

diff --git a/test/coverlet.integration.tests/DeterministicBuild.cs b/test/coverlet.integration.tests/DeterministicBuild.cs
@@ -29,8 +29,8 @@ private void CreateDeterministicTestPropsFile()
                         new XElement("PropertyGroup",
                             new XElement("coverletMsbuilVersion", GetPackageVersion("*msbuild*.nupkg")),
                             new XElement("coverletCollectorsVersion", GetPackageVersion("*collector*.nupkg")))));
-            _testProjectTfm = XElement.Load(Path.Combine(_testProjectPath, "coverlet.integration.determisticbuild.csproj")).
-                             Descendants("PropertyGroup").Single().Element("TargetFramework").Value;
+            _testProjectTfm = XElement.Load(Path.Combine(_testProjectPath, "coverlet.integration.determisticbuild.csproj"))!.
+                             Descendants("PropertyGroup")!.Single().Element("TargetFramework")!.Value;
 
             deterministicTestProps.Save(Path.Combine(_testProjectPath, PropsFileName));
         }
@@ -69,7 +69,7 @@ public void Msbuild()
             Assert.Contains("=/_/", File.ReadAllText(sourceRootMappingFilePath));
 
             DotnetCli($"test -c {_buildConfiguration} --no-build /p:CollectCoverage=true /p:Include=\"[coverletsample.integration.determisticbuild]*DeepThought\" /p:IncludeTestAssembly=true", out standardOutput, out _, _testProjectPath);
-            Assert.Contains("Test Run Successful.", standardOutput);
+            Assert.Contains("Passed!", standardOutput);
             Assert.Contains("| coverletsample.integration.determisticbuild | 100% | 100%   | 100%   |", standardOutput);
             Assert.True(File.Exists(Path.Combine(_testProjectPath, "coverage.json")));
             AssertCoverage(standardOutput);
@@ -92,7 +92,7 @@ public void Msbuild_SourceLink()
             Assert.Contains("=/_/", File.ReadAllText(sourceRootMappingFilePath));
 
             DotnetCli($"test -c {_buildConfiguration} --no-build /p:CollectCoverage=true /p:UseSourceLink=true /p:Include=\"[coverletsample.integration.determisticbuild]*DeepThought\" /p:IncludeTestAssembly=true", out standardOutput, out _, _testProjectPath);
-            Assert.Contains("Test Run Successful.", standardOutput);
+            Assert.Contains("Passed!", standardOutput);
             Assert.Contains("| coverletsample.integration.determisticbuild | 100% | 100%   | 100%   |", standardOutput);
             Assert.True(File.Exists(Path.Combine(_testProjectPath, "coverage.json")));
             Assert.Contains("raw.githubusercontent.com", File.ReadAllText(Path.Combine(_testProjectPath, "coverage.json")));
@@ -117,7 +117,7 @@ public void Collectors()
 
             string runSettingsPath = AddCollectorRunsettingsFile(_testProjectPath, "[coverletsample.integration.determisticbuild]*DeepThought");
             Assert.True(DotnetCli($"test -c {_buildConfiguration} --no-build \"{_testProjectPath}\" --collect:\"XPlat Code Coverage\" --settings \"{runSettingsPath}\" --diag:{Path.Combine(_testProjectPath, "log.txt")}", out standardOutput, out _), standardOutput);
-            Assert.Contains("Test Run Successful.", standardOutput);
+            Assert.Contains("Passed!", standardOutput);
             AssertCoverage(standardOutput);
 
             // Check out/in process collectors injection
@@ -145,7 +145,7 @@ public void Collectors_SourceLink()
 
             string runSettingsPath = AddCollectorRunsettingsFile(_testProjectPath, "[coverletsample.integration.determisticbuild]*DeepThought", sourceLink: true);
             Assert.True(DotnetCli($"test -c {_buildConfiguration} --no-build \"{_testProjectPath}\" --collect:\"XPlat Code Coverage\" --settings \"{runSettingsPath}\" --diag:{Path.Combine(_testProjectPath, "log.txt")}", out standardOutput, out _), standardOutput);
-            Assert.Contains("Test Run Successful.", standardOutput);
+            Assert.Contains("Passed!", standardOutput);
             AssertCoverage(standardOutput);
             Assert.Contains("raw.githubusercontent.com", File.ReadAllText(Directory.GetFiles(_testProjectPath, "coverage.cobertura.xml", SearchOption.AllDirectories).Single()));
 

diff --git a/test/coverlet.integration.tests/DotnetTool.cs b/test/coverlet.integration.tests/DotnetTool.cs
@@ -24,9 +24,9 @@ public void DotnetTool()
             UpdateNugeConfigtWithLocalPackageFolder(clonedTemplateProject.ProjectRootPath!);
             string coverletToolCommandPath = InstallTool(clonedTemplateProject.ProjectRootPath!);
             DotnetCli($"build {clonedTemplateProject.ProjectRootPath}", out string standardOutput, out string standardError);
-            string publishedTestFile = clonedTemplateProject.GetFiles("*" + ClonedTemplateProject.AssemblyName + ".dll").Single(f => !f.Contains("obj"));
+            string publishedTestFile = clonedTemplateProject.GetFiles("*" + ClonedTemplateProject.AssemblyName + ".dll").Single(f => !f.Contains("obj") && !f.Contains("ref"));
             RunCommand(coverletToolCommandPath, $"\"{publishedTestFile}\" --target \"dotnet\" --targetargs \"test {Path.Combine(clonedTemplateProject.ProjectRootPath, ClonedTemplateProject.ProjectFileName)} --no-build\"  --include-test-assembly --output \"{clonedTemplateProject.ProjectRootPath}\"\\", out standardOutput, out standardError);
-            Assert.Contains("Test Run Successful.", standardOutput);
+            Assert.Contains("Passed!", standardOutput);
             AssertCoverage(clonedTemplateProject, standardOutput: standardOutput);
         }
 
@@ -39,7 +39,7 @@ public void StandAlone()
             UpdateNugeConfigtWithLocalPackageFolder(clonedTemplateProject.ProjectRootPath!);
             string coverletToolCommandPath = InstallTool(clonedTemplateProject.ProjectRootPath!);
             DotnetCli($"build {clonedTemplateProject.ProjectRootPath}", out string standardOutput, out string standardError);
-            string publishedTestFile = clonedTemplateProject.GetFiles("*" + ClonedTemplateProject.AssemblyName + ".dll").Single(f => !f.Contains("obj"));
+            string publishedTestFile = clonedTemplateProject.GetFiles("*" + ClonedTemplateProject.AssemblyName + ".dll").Single(f => !f.Contains("obj") && !f.Contains("ref"));
             RunCommand(coverletToolCommandPath, $"\"{Path.GetDirectoryName(publishedTestFile)}\" --target \"dotnet\" --targetargs \"{publishedTestFile}\"  --output \"{clonedTemplateProject.ProjectRootPath}\"\\", out standardOutput, out standardError);
             Assert.Contains("Hello World!", standardOutput);
             AssertCoverage(clonedTemplateProject, standardOutput: standardOutput);