Merge pull request #2 from joncloud/netcoreapp31

Upgrades to .NET Core 3.1.

Author: joncloud

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.1.2-*
+dotnet tool install --global https --version 0.2.0-*
 ```
 
 ## Usage

TestReadmeVersion.ps1

@@ -0,0 +1,30 @@
+$ReadmePath = Join-Path $PSScriptRoot 'README.md'
+If (-not (Test-Path $ReadmePath)) {
+    Write-Error 'Unable to find README.md'
+    Exit 1
+}
+
+$ReadmeContents = Get-Content $ReadmePath -Raw
+[regex]$Regex = 'dotnet tool install --global https --version (.+)-\*'
+$Match = $Regex.Match($ReadmeContents)
+If (-not $Match.Success) {
+    Write-Error 'Unable to find version information in README.md'
+    Exit 1
+}
+
+$HttpsCsprojPath = Join-Path $PSScriptRoot 'src/https/https.csproj'
+If (-not (Test-Path $HttpsCsprojPath)) {
+    Write-Error 'Unable to find https.csproj'
+    Exit 1
+}
+
+[xml]$HttpsCsproj = Get-Content $HttpsCsprojPath
+
+$Expected = $HttpsCsproj.Project.PropertyGroup.VersionPrefix |
+    Where-Object { $null -ne $_ } |
+    ForEach-Object { $_.ToString().Trim() }
+$Actual = $Match.Groups[1].ToString().Trim()
+If ($Expected -ne $Actual) {
+    Write-Error "Expected to have ${Expected} version in README.md, but found ${Actual}"
+    Exit 1
+}

azure-pipelines.yml

@@ -10,12 +10,11 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
-- task: DotNetCoreInstaller@1
-  displayName: Install .NET Core 3.0 Preview
+- task: PowerShell@2
+  displayName: Test Readme
   inputs:
-    includePreviewVersions: true
-    packageType: sdk
-    version: 3.0.100-preview7-012821
+    filePath: 'TestReadmeVersion.ps1'
+    failOnStderr: true
 
 - task: DotNetCoreCLI@2
   displayName: Pack https
@@ -27,8 +26,8 @@ steps:
     packDirectory: $(build.ArtifactStagingDirectory)
     versioningScheme: byPrereleaseNumber
     majorVersion: 0
-    minorVersion: 1
-    patchVersion: 2
+    minorVersion: 2
+    patchVersion: 0
 
 - task: DotNetCoreCLI@2
   displayName: Test https
@@ -37,6 +36,7 @@ steps:
     projects: '**/https.Tests.csproj'
 
 - task: PublishBuildArtifacts@1
+  displayName: Upload Artifacts
   inputs:
     PathtoPublish: '$(build.ArtifactStagingDirectory)'
     ArtifactName: 'https'

src/https/https.csproj

@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>0.1.2</VersionPrefix>
+    <VersionPrefix>0.2.0</VersionPrefix>
     <VersionSuffix>local</VersionSuffix>
   </PropertyGroup>
 
@@ -25,7 +25,7 @@
     <PackageReleaseNotes>https://github.com/joncloud/https/releases</PackageReleaseNotes>
     <!--<PackageIconUrl>https://raw.githubusercontent.com/joncloud/https/master/nuget.png</PackageIconUrl>-->
     <PackageProjectUrl>https://github.com/joncloud/https</PackageProjectUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/joncloud/https/master/LICENSE.md</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/joncloud/https</RepositoryUrl>
   </PropertyGroup>

tests/https.Tests/Startup.cs

@@ -6,7 +6,7 @@ namespace Https.Tests
 {
     public class Startup
     {   
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app)
         {
             app.UseMiddleware<RedirectMiddleware>();
             app.UseMiddleware<MirrorMiddleware>();

tests/https.Tests/https.Tests.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Https.Tests</RootNamespace>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.6" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>