Bump version to 2.0.1 and update build scripts, tools, and dependencies for 2.0.x

.gitignore

@@ -30,3 +30,7 @@ project.lock.json
 .testPublish/
 samples/**/temp-keys/
 global.json
+
+korebuild-lock.txt
+*.g.targets
+

Directory.Build.targets

@@ -0,0 +1,4 @@
+<Project>
+  <Import Project="build\dependencies.targets" />
+  <Import Project="build\dependencies.g.targets" Condition="Exists('build\dependencies.g.targets') AND '$(DesignTimeBuild)' != 'true'" />
+</Project>

NuGet.config

@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
+    <add key="AspNetCorePatch" value="https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch/api/v3/index.json" />
     <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
     <add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />

build.cmd

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

build.ps1

@@ -1,67 +1,186 @@
-$ErrorActionPreference = "Stop"
+#!/usr/bin/env powershell
+#requires -version 4
 
-function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
+<#
+.SYNOPSIS
+Build this repository
+
+.DESCRIPTION
+Downloads korebuild if required. Then builds the repository.
+
+.PARAMETER Path
+The folder to build. Defaults to the folder containing this script.
+
+.PARAMETER Channel
+The channel of KoreBuild to download. Overrides the value from the config file.
+
+.PARAMETER DotNetHome
+The directory where .NET Core tools will be stored.
+
+.PARAMETER ToolsSource
+The base url where build tools can be downloaded. Overrides the value from the config file.
+
+.PARAMETER Update
+Updates KoreBuild to the latest version even if a lock file is present.
+
+.PARAMETER ConfigFile
+The path to the configuration file that stores values. Defaults to version.props.
+
+.PARAMETER MSBuildArgs
+Arguments to be passed to MSBuild
+
+.NOTES
+This function will create a file $PSScriptRoot/korebuild-lock.txt. This lock file can be committed to source, but does not have to be.
+When the lockfile is not present, KoreBuild will create one using latest available version from $Channel.
+
+The $ConfigFile is expected to be an JSON file. It is optional, and the configuration values in it are optional as well. Any options set
+in the file are overridden by command line parameters.
+
+.EXAMPLE
+Example config file:
+```json
 {
-    while($true)
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
-    {
+  "channel": "dev",
-        try
+  "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
-        {
+}
-            Invoke-WebRequest $url -OutFile $downloadLocation
+```
-            break
+#>
-        }
+[CmdletBinding(PositionalBinding = $false)]
-        catch
+param(
-        {
+    [string]$Path = $PSScriptRoot,
-            $exceptionMessage = $_.Exception.Message
+    [Alias('c')]
-            Write-Host "Failed to download '$url': $exceptionMessage"
+    [string]$Channel,
-            if ($retries -gt 0) {
+    [Alias('d')]
-                $retries--
+    [string]$DotNetHome,
-                Write-Host "Waiting 10 seconds before retrying. Retries left: $retries"
+    [Alias('s')]
-                Start-Sleep -Seconds 10
+    [string]$ToolsSource,
+    [Alias('u')]
+    [switch]$Update,
+    [string]$ConfigFile = $null,
+    [Parameter(ValueFromRemainingArguments = $true)]
+    [string[]]$MSBuildArgs
+)
 
+Set-StrictMode -Version 2
+$ErrorActionPreference = 'Stop'
+
+#
+# Functions
+#
+
+function Get-KoreBuild {
+
+    $lockFile = Join-Path $Path 'korebuild-lock.txt'
+
+    if (!(Test-Path $lockFile) -or $Update) {
+        Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile
+    }
+
+    $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1
+    if (!$version) {
+        Write-Error "Failed to parse version from $lockFile. Expected a line that begins with 'version:'"
+    }
+    $version = $version.TrimStart('version:').Trim()
+    $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version)
+
+    if (!(Test-Path $korebuildPath)) {
+        Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version"
+        New-Item -ItemType Directory -Path $korebuildPath | Out-Null
+        $remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip"
+
+        try {
+            $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip"
+            Get-RemoteFile $remotePath $tmpfile
+            if (Get-Command -Name 'Expand-Archive' -ErrorAction Ignore) {
+                # Use built-in commands where possible as they are cross-plat compatible
+                Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath
             }
-            else
+            else {
-            {
+                # Fallback to old approach for old installations of PowerShell
-                $exception = $_.Exception
+                Add-Type -AssemblyName System.IO.Compression.FileSystem
-                throw $exception
+                [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpfile, $korebuildPath)
             }
         }
+        catch {
+            remove-item -Recurse -Force $korebuildPath -ErrorAction Ignore
+            throw
+        }
+        finally {
+            remove-item $tmpfile -ErrorAction Ignore
+        }
+    }
+
+    return $korebuildPath
+}
+
+function Join-Paths([string]$path, [string[]]$childPaths) {
+    $childPaths | ForEach-Object { $path = Join-Path $path $_ }
+    return $path
+}
+
+function Get-RemoteFile([string]$RemotePath, [string]$LocalPath) {
+    if ($RemotePath -notlike 'http*') {
+        Copy-Item $RemotePath $LocalPath
+        return
+    }
+
+    $retries = 10
+    while ($retries -gt 0) {
+        $retries -= 1
+        try {
+            Invoke-WebRequest -UseBasicParsing -Uri $RemotePath -OutFile $LocalPath
+            return
+        }
+        catch {
+            Write-Verbose "Request failed. $retries retries remaining"
+        }
+    }
+
+    Write-Error "Download failed: '$RemotePath'."
+}
+
+#
+# Main
+#
+
+# Load configuration or set defaults
+
+$Path = Resolve-Path $Path
+if (!$ConfigFile) { $ConfigFile = Join-Path $Path 'korebuild.json' }
+
+if (Test-Path $ConfigFile) {
+    try {
+        $config = Get-Content -Raw -Encoding UTF8 -Path $ConfigFile | ConvertFrom-Json
+        if ($config) {
+            if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel }
+            if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource}
+        }
+    } catch {
+        Write-Warning "$ConfigFile could not be read. Its settings will be ignored."
+        Write-Warning $Error[0]
     }
 }
 
-cd $PSScriptRoot
+if (!$DotNetHome) {
-
+    $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } `
-$repoFolder = $PSScriptRoot
+        elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} `
-$env:REPO_FOLDER = $repoFolder
+        elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}`
-
+        else { Join-Path $PSScriptRoot '.dotnet'}
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0.zip"
-if ($env:KOREBUILD_ZIP)
-{
-    $koreBuildZip=$env:KOREBUILD_ZIP
 }
 
-$buildFolder = ".build"
+if (!$Channel) { $Channel = 'dev' }
-$buildFile="$buildFolder\KoreBuild.ps1"
+if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
 
-if (!(Test-Path $buildFolder)) {
+# Execute
-    Write-Host "Downloading KoreBuild from $koreBuildZip"
 
-    $tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid()
+$korebuildPath = Get-KoreBuild
-    New-Item -Path "$tempFolder" -Type directory | Out-Null
+Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1')
 
-    $localZipFile="$tempFolder\korebuild.zip"
+try {
-
+    Install-Tools $ToolsSource $DotNetHome
-    DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6
+    Invoke-RepositoryBuild $Path @MSBuildArgs
-
+}
-    Add-Type -AssemblyName System.IO.Compression.FileSystem
+finally {
-    [System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder)
+    Remove-Module 'KoreBuild' -ErrorAction Ignore
-
-    New-Item -Path "$buildFolder" -Type directory | Out-Null
-    copy-item "$tempFolder\**\build\*" $buildFolder -Recurse
-
-    # Cleanup
-    if (Test-Path $tempFolder) {
-        Remove-Item -Recurse -Force $tempFolder
-    }
 }
-
-&"$buildFile" @args

build.sh

@@ -1,46 +1,220 @@
 #!/usr/bin/env bash
-repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $repoFolder
 
-koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0.zip"
+set -euo pipefail
-if [ ! -z $KOREBUILD_ZIP ]; then
-    koreBuildZip=$KOREBUILD_ZIP
-fi
 
-buildFolder=".build"
+#
-buildFile="$buildFolder/KoreBuild.sh"
+# variables
+#
 
-if test ! -d $buildFolder; then
+RESET="\033[0m"
-    echo "Downloading KoreBuild from $koreBuildZip"
+RED="\033[0;31m"
+YELLOW="\033[0;33m"
+MAGENTA="\033[0;95m"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+[ -z "${DOTNET_HOME:-}"] && DOTNET_HOME="$HOME/.dotnet"
+config_file="$DIR/korebuild.json"
+verbose=false
+update=false
+repo_path="$DIR"
+channel=''
+tools_source=''
 
-    tempFolder="/tmp/KoreBuild-$(uuidgen)"
+#
-    mkdir $tempFolder
+# Functions
+#
+__usage() {
+    echo "Usage: $(basename "${BASH_SOURCE[0]}") [options] [[--] <MSBUILD_ARG>...]"
+    echo ""
+    echo "Arguments:"
+    echo "    <MSBUILD_ARG>...         Arguments passed to MSBuild. Variable number of arguments allowed."
+    echo ""
+    echo "Options:"
+    echo "    --verbose                Show verbose output."
+    echo "    -c|--channel <CHANNEL>   The channel of KoreBuild to download. Overrides the value from the config file.."
+    echo "    --config-file <FILE>     The path to the configuration file that stores values. Defaults to korebuild.json."
+    echo "    -d|--dotnet-home <DIR>   The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet."
+    echo "    --path <PATH>            The directory to build. Defaults to the directory containing the script."
+    echo "    -s|--tools-source <URL>  The base url where build tools can be downloaded. Overrides the value from the config file."
+    echo "    -u|--update              Update to the latest KoreBuild even if the lock file is present."
+    echo ""
+    echo "Description:"
+    echo "    This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be."
+    echo "    When the lockfile is not present, KoreBuild will create one using latest available version from \$channel."
 
-    localZipFile="$tempFolder/korebuild.zip"
+    if [[ "${1:-}" != '--no-exit' ]]; then
-
+        exit 2
-    retries=6
-    until (wget -O $localZipFile $koreBuildZip 2>/dev/null || curl -o $localZipFile --location $koreBuildZip 2>/dev/null)
-    do
-        echo "Failed to download '$koreBuildZip'"
-        if [ "$retries" -le 0 ]; then
-            exit 1
-        fi
-        retries=$((retries - 1))
-        echo "Waiting 10 seconds before retrying. Retries left: $retries"
-        sleep 10s
-    done
-
-    unzip -q -d $tempFolder $localZipFile
-
-    mkdir $buildFolder
-    cp -r $tempFolder/**/build/** $buildFolder
-
-    chmod +x $buildFile
-
-    # Cleanup
-    if test -d $tempFolder; then
-        rm -rf $tempFolder
     fi
+}
+
+get_korebuild() {
+    local version
+    local lock_file="$repo_path/korebuild-lock.txt"
+    if [ ! -f "$lock_file" ] || [ "$update" = true ]; then
+        __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file"
+    fi
+    version="$(grep 'version:*' -m 1 "$lock_file")"
+    if [[ "$version" == '' ]]; then
+        __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'"
+        return 1
+    fi
+    version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
+    local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version"
+
+    {
+        if [ ! -d "$korebuild_path" ]; then
+            mkdir -p "$korebuild_path"
+            local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip"
+            tmpfile="$(mktemp)"
+            echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}"
+            if __get_remote_file "$remote_path" "$tmpfile"; then
+                unzip -q -d "$korebuild_path" "$tmpfile"
+            fi
+            rm "$tmpfile" || true
+        fi
+
+        source "$korebuild_path/KoreBuild.sh"
+    } || {
+        if [ -d "$korebuild_path" ]; then
+            echo "Cleaning up after failed installation"
+            rm -rf "$korebuild_path" || true
+        fi
+        return 1
+    }
+}
+
+__error() {
+    echo -e "${RED}error: $*${RESET}" 1>&2
+}
+
+__warn() {
+    echo -e "${YELLOW}warning: $*${RESET}"
+}
+
+__machine_has() {
+    hash "$1" > /dev/null 2>&1
+    return $?
+}
+
+__get_remote_file() {
+    local remote_path=$1
+    local local_path=$2
+
+    if [[ "$remote_path" != 'http'* ]]; then
+        cp "$remote_path" "$local_path"
+        return 0
+    fi
+
+    local failed=false
+    if __machine_has wget; then
+        wget --tries 10 --quiet -O "$local_path" "$remote_path" || failed=true
+    else
+        failed=true
+    fi
+
+    if [ "$failed" = true ] && __machine_has curl; then
+        failed=false
+        curl --retry 10 -sSL -f --create-dirs -o "$local_path" "$remote_path" || failed=true
+    fi
+
+    if [ "$failed" = true ]; then
+        __error "Download failed: $remote_path" 1>&2
+        return 1
+    fi
+}
+
+#
+# main
+#
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        -\?|-h|--help)
+            __usage --no-exit
+            exit 0
+            ;;
+        -c|--channel|-Channel)
+            shift
+            channel="${1:-}"
+            [ -z "$channel" ] && __usage
+            ;;
+        --config-file|-ConfigFile)
+            shift
+            config_file="${1:-}"
+            [ -z "$config_file" ] && __usage
+            if [ ! -f "$config_file" ]; then
+                __error "Invalid value for --config-file. $config_file does not exist."
+                exit 1
+            fi
+            ;;
+        -d|--dotnet-home|-DotNetHome)
+            shift
+            DOTNET_HOME="${1:-}"
+            [ -z "$DOTNET_HOME" ] && __usage
+            ;;
+        --path|-Path)
+            shift
+            repo_path="${1:-}"
+            [ -z "$repo_path" ] && __usage
+            ;;
+        -s|--tools-source|-ToolsSource)
+            shift
+            tools_source="${1:-}"
+            [ -z "$tools_source" ] && __usage
+            ;;
+        -u|--update|-Update)
+            update=true
+            ;;
+        --verbose|-Verbose)
+            verbose=true
+            ;;
+        --)
+            shift
+            break
+            ;;
+        *)
+            break
+            ;;
+    esac
+    shift
+done
+
+if ! __machine_has unzip; then
+    __error 'Missing required command: unzip'
+    exit 1
 fi
 
-$buildFile -r $repoFolder "$@"
+if ! __machine_has curl && ! __machine_has wget; then
+    __error 'Missing required command. Either wget or curl is required.'
+    exit 1
+fi
+
+[ -z "${config_file:-}" ] && config_file="$repo_path/korebuild.json"
+if [ -f "$config_file" ]; then
+    if __machine_has jq ; then
+        if jq '.' "$config_file" >/dev/null ; then
+            config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")"
+            config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")"
+        else
+            __warn "$config_file is invalid JSON. Its settings will be ignored."
+        fi
+    elif __machine_has python ; then
+        if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
+            config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
+            config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
+        else
+            __warn "$config_file is invalid JSON. Its settings will be ignored."
+        fi
+    else
+        __warn 'Missing required command: jq or pyton. Could not parse the JSON file. Its settings will be ignored.'
+    fi
+
+    [ ! -z "${config_channel:-}" ] && channel="$config_channel"
+    [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
+fi
+
+[ -z "$channel" ] && channel='dev'
+[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
+
+get_korebuild
+install_tools "$tools_source" "$DOTNET_HOME"
+invoke_repository_build "$repo_path" "$@"

build/common.props

@@ -9,7 +9,6 @@
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 

build/dependencies.targets

@@ -0,0 +1,142 @@
+<Project>
+  <PropertyGroup />
+  <ItemGroup>
+    <PackageReference Update="Microsoft.AspNet.Identity.AspNetCoreCompat" Version="0.3.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.All" Version="2.0.2-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Antiforgery" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.Core" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.Facebook" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.Google" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.OAuth" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.Twitter" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authorization" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Authorization.Policy" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Buffering" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Certificates.Configuration.Sources" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.CookiePolicy" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Cors" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Diagnostics" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Diagnostics.Elm" Version="0.3.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Diagnostics.Identity.Service" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Hosting" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Http" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Http.Extensions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Http.Features" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.HttpOverrides" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.Service" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.Abstractions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.AzureKeyVault" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.Core" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.IntegratedWebClient" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.Mvc" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.Specification.Tests" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.Specification.Tests" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Localization" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Localization.Routing" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Core" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Cors" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Formatters.Xml" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Localization" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Razor" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="2.0.1-alpha1-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.NodeServices" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.NodeServices.Sockets" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Owin" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Proxy" Version="0.3.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.RangeHelper.Sources" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Razor" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Razor.Language" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Razor.Runtime" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.ResponseCaching" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.ResponseCompression" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Rewrite" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Routing" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Routing.Abstractions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Server.HttpSys" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Server.IntegrationTesting" Version="0.4.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.Session" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.SpaServices" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.StaticFiles" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.WebSockets" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.AspNetCore.WebUtilities" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.CodeAnalysis.Razor" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.CodeAnalysis.Razor.Workspaces" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.CodeAnalysis.Remote.Razor" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Specification.Tests" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1-rtm-*" />
+    <DotNetCliToolReference Update="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.Extensions.Identity.Core" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.Extensions.Identity.Stores" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.Extensions.Localization" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.Extensions.Localization.Abstractions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.Net.Http.Headers" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.Owin.Security.Interop" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.VisualStudio.LanguageServices.Razor" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Core" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Templating" Version="2.0.1-rtm-*" />
+    <DotNetCliToolReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Utils" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Version="2.0.1-rtm-*" />
+    <PackageReference Update="Microsoft.Web.Xdt.Extensions" Version="2.0.1-rtm-*" />
+    <PackageReference Update="RazorPageGenerator" Version="2.0.1-rtm-*" />
+  </ItemGroup>
+</Project>

korebuild.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/rel/2.0.2/tools/korebuild.schema.json",
+  "channel": "rel/2.0.2"
+}

src/Microsoft.AspNetCore.DataProtection.Redis/Microsoft.AspNetCore.DataProtection.Redis.csproj

@@ -3,8 +3,8 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
+    <VersionPrefix Condition="'$(ExperimentalProjectVersionPrefix)' != ''">$(ExperimentalProjectVersionPrefix)</VersionPrefix>
     <Description>Redis storage support as key store.</Description>
-    <VersionPrefix>0.3.0</VersionPrefix>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

version.props

@@ -1,6 +1,10 @@
-<!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix.  -->
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.0.0</VersionPrefix>
+    <VersionPrefix>2.0.1</VersionPrefix>
+    <ExperimentalProjectVersionPrefix>0.3.1</ExperimentalProjectVersionPrefix>
+    <VersionSuffix>rtm</VersionSuffix>
+    <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
+    <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
+    <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>
 </Project>