Support ASP.NET Core 3.0

AspNet.Security.OAuth.Providers.sln

@@ -129,8 +129,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		build.sh = build.sh
 		CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
 		global.json = global.json
-		korebuild-lock.txt = korebuild-lock.txt
-		korebuild.json = korebuild.json
 		LICENSE = LICENSE
 		NuGet.config = NuGet.config
 		README.md = README.md

build.cmd

@@ -1,2 +1,2 @@
 @ECHO OFF
-PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' default-build %*; exit $LASTEXITCODE"
+PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' %*; exit $LASTEXITCODE"

build.ps1

@@ -1,67 +1,6 @@
 $ErrorActionPreference = "Stop"
 
-function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
-{
-    while($true)
-    {
-        try
-        {
-            Invoke-WebRequest $url -OutFile $downloadLocation
-            break
-        }
-        catch
-        {
-            $exceptionMessage = $_.Exception.Message
-            Write-Host "Failed to download '$url': $exceptionMessage"
-            if ($retries -gt 0) {
-                $retries--
-                Write-Host "Waiting 10 seconds before retrying. Retries left: $retries"
-                Start-Sleep -Seconds 10
-
-            }
-            else
-            {
-                $exception = $_.Exception
-                throw $exception
-            }
-        }
-    }
-}
-
-cd $PSScriptRoot
-
-$repoFolder = $PSScriptRoot
-$env:REPO_FOLDER = $repoFolder
-
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
-if ($env:KOREBUILD_ZIP)
-{
-    $koreBuildZip=$env:KOREBUILD_ZIP
-}
-
-$buildFolder = ".build"
-$buildFile="$buildFolder\KoreBuild.ps1"
-
-if (!(Test-Path $buildFolder)) {
-    Write-Host "Downloading KoreBuild from $koreBuildZip"
-
-    $tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid()
-    New-Item -Path "$tempFolder" -Type directory | Out-Null
-
-    $localZipFile="$tempFolder\korebuild.zip"
-
-    DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6
-
-    Add-Type -AssemblyName System.IO.Compression.FileSystem
-    [System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder)
-
-    New-Item -Path "$buildFolder" -Type directory | Out-Null
-    copy-item "$tempFolder\**\build\*" $buildFolder -Recurse
-
-    # Cleanup
-    if (Test-Path $tempFolder) {
-        Remove-Item -Recurse -Force $tempFolder
-    }
-}
+Set-Location $PSScriptRoot
+$buildFile = Join-Path "$PSScriptRoot" "Run.ps1"
 
 &"$buildFile" @args

build.sh

@@ -5,4 +5,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs)
 chmod +x "$DIR/run.sh"; sync
-"$DIR/run.sh" default-build "$@"
+"$DIR/run.sh" "$@"

build/common.props

@@ -4,10 +4,19 @@
   <Import Project="version.props" />
 
   <PropertyGroup>
+    <LangVersion>preview</LangVersion>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <CollectCoverage>true</CollectCoverage>
+    <CoverletOutput>$(OutputPath)/</CoverletOutput>
+    <CoverletOutputFormat>cobertura,json</CoverletOutputFormat>
+    <Exclude>[Mvc.Client*]*,[xunit.*]*</Exclude>
+    <ExcludeByAttribute>System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute</ExcludeByAttribute>
+  </PropertyGroup>
+
 </Project>

build/dependencies.props

@@ -1,16 +1,23 @@
 <Project>
 
   <PropertyGroup Label="Package Versions">
-    <AspNetCoreVersion>2.0.0</AspNetCoreVersion>
-    <DotNetTestSdkVersion>16.1.0</DotNetTestSdkVersion>
-    <GoogleProviderVersion>2.2.2</GoogleProviderVersion>
+    <AspNetCoreVersion>3.0.0-preview6.19307.2</AspNetCoreVersion>
+    <CoverletVersion>2.6.2</CoverletVersion>
+    <DotNetTestSdkVersion>16.2.0-preview-20190606-02</DotNetTestSdkVersion>
+    <GoogleProviderVersion>3.0.0-preview6.19307.2</GoogleProviderVersion>
     <JetBrainsVersion>2019.1.1</JetBrainsVersion>
     <JustEatHttpClientInterceptionVersion>2.0.1</JustEatHttpClientInterceptionVersion>
     <MartinCostelloLoggingXUnitVersion>0.1.0</MartinCostelloLoggingXUnitVersion>
     <MicrosoftSourceLinkGitHubVersion>1.0.0-beta2-19270-01</MicrosoftSourceLinkGitHubVersion>
+    <ReportGeneratorVersion>4.2.2</ReportGeneratorVersion>
     <ShouldlyVersion>3.0.2</ShouldlyVersion>
-    <TwitterProviderVersion>2.2.0</TwitterProviderVersion>
+    <TwitterProviderVersion>3.0.0-preview6.19307.2</TwitterProviderVersion>
     <XunitVersion>2.4.1</XunitVersion>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="$(CoverletVersion)" PrivateAssets="All" />
+    <PackageReference Include="ReportGenerator" Version="$(ReportGeneratorVersion)" PrivateAssets="All" />
+  </ItemGroup>
+
 </Project>

build/version.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>2.1.1</VersionPrefix>
+    <VersionPrefix>3.0.0</VersionPrefix>
     <VersionSuffix>preview</VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

global.json

@@ -1,8 +1,5 @@
 {
-    "sdk": {
-        "version": "2.2.106"
-    },
-    "msbuild-sdks": {
-        "Internal.AspNetCore.Sdk": "2.2.1-build-20190508.1"
-    }
+  "sdk": {
+    "version": "3.0.100-preview6-012264"
+  }
 }