Merge pull request #3 from joncloud/net50

Upgrades to .NET 5.0
joncloud · Nov 10, 2020 · e8db377 · e8db377
2 parents 56b1cf4 + 9f2dfa2
commit e8db377
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Released under the MIT License. See the [LICENSE][] File for further details.
 ## Installation
 Install `https` as a global .NET tool using
 ```bash
-dotnet tool install --global https --version 0.2.0-*
+dotnet tool install --global https --version 0.3.0-*
 ```
 
 ## Usage

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,6 +11,12 @@ variables:
   shouldPublish: $[eq(variables['Build.SourceBranch'], 'refs/heads/publish')]
 
 steps:
+- task: UseDotNet@2
+  displayName: Use .NET (global.json)
+  inputs:
+    packageType: 'sdk'
+    useGlobalJson: true
+
 - task: DotNetCoreCLI@2
   displayName: Pack https
   condition: eq(variables.shouldPublish, true)

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "5.0.100"
+  }
+}
diff --git a/src/https/https.csproj b/src/https/https.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>0.2.0</VersionPrefix>
+    <VersionPrefix>0.3.0</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/tests/https.Tests/CertificateTests.cs b/tests/https.Tests/CertificateTests.cs
@@ -4,7 +4,8 @@
 
 namespace Https.Tests
 {
-    public class CertificateTests : IClassFixture<WebHostFixture>
+    [Collection(nameof(WebHostFixture))]
+    public class CertificateTests
     {
         readonly WebHostFixture _fixture;
         public CertificateTests(WebHostFixture fixture) =>

diff --git a/tests/https.Tests/ContentTypeTests.cs b/tests/https.Tests/ContentTypeTests.cs
@@ -5,7 +5,8 @@
 
 namespace Https.Tests
 {
-    public class ContentTypeTests : IClassFixture<WebHostFixture>
+    [Collection(nameof(WebHostFixture))]
+    public class ContentTypeTests
     {
         readonly WebHostFixture _fixture;
         public ContentTypeTests(WebHostFixture fixture) =>

diff --git a/tests/https.Tests/RedirectTests.cs b/tests/https.Tests/RedirectTests.cs
@@ -3,7 +3,8 @@
 
 namespace Https.Tests
 {
-    public class RedirectTests : IClassFixture<WebHostFixture>
+    [Collection(nameof(WebHostFixture))]
+    public class RedirectTests
     {
         readonly WebHostFixture _fixture;
         public RedirectTests(WebHostFixture fixture) =>

diff --git a/tests/https.Tests/WebHostFixture.cs b/tests/https.Tests/WebHostFixture.cs
@@ -3,9 +3,13 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Xunit;
 
 namespace Https.Tests
 {
+    [CollectionDefinition(nameof(WebHostFixture))]
+    public class WebHostCollection : ICollectionFixture<WebHostFixture> { }
+
     public class WebHostFixture : IDisposable
     {
         readonly IWebHost _webHost;

diff --git a/tests/https.Tests/https.Tests.csproj b/tests/https.Tests/https.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Https.Tests</RootNamespace>
     <LangVersion>preview</LangVersion>
@@ -17,8 +17,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>