Skip to content

Commit

Permalink
Update to ASP.NET Core 3.0 preview 6
Browse files Browse the repository at this point in the history
Update to preview 6 of ASP.NET Core 3.0.
Remove KoreBuild.
  • Loading branch information
martincostello committed Jun 13, 2019
1 parent f1cbc9f commit fd2df11
Show file tree
Hide file tree
Showing 10 changed files with 188 additions and 450 deletions.
2 changes: 0 additions & 2 deletions AspNet.Security.OpenId.Providers.sln
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,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
Expand Down
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
@@ -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"
65 changes: 2 additions & 63 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" "$@"
12 changes: 10 additions & 2 deletions build/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,23 @@

<PropertyGroup Label="Package Versions">
<AngleSharpVersion>0.9.9</AngleSharpVersion>
<AspNetCoreVersion>3.0.0-preview5-19227-01</AspNetCoreVersion>
<DotNetTestSdkVersion>16.1.0</DotNetTestSdkVersion>
<AspNetCoreVersion>3.0.0-preview6.19307.2</AspNetCoreVersion>
<DotNetTestSdkVersion>16.2.0-preview-20190606-02</DotNetTestSdkVersion>
<IdentityModelCoreVersion>2.1.4</IdentityModelCoreVersion>
<JetBrainsVersion>2019.1.1</JetBrainsVersion>
<JsonNetVersion>10.0.3</JsonNetVersion>
<JustEatHttpClientInterceptionVersion>2.0.1</JustEatHttpClientInterceptionVersion>
<MartinCostelloLoggingXUnitVersion>0.1.0</MartinCostelloLoggingXUnitVersion>
<MicrosoftSourceLinkGitHubVersion>1.0.0-beta2-19270-01</MicrosoftSourceLinkGitHubVersion>
<OpenCoverVersion>4.7.922</OpenCoverVersion>
<ReportGeneratorVersion>4.1.10</ReportGeneratorVersion>
<ShouldlyVersion>3.0.2</ShouldlyVersion>
<XunitVersion>2.4.1</XunitVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenCover" Version="$(OpenCoverVersion)" PrivateAssets="All" />
<PackageReference Include="ReportGenerator" Version="$(ReportGeneratorVersion)" PrivateAssets="All" />
</ItemGroup>

</Project>
5 changes: 1 addition & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"sdk": {
"version": "3.0.100-preview5-011568"
},
"msbuild-sdks": {
"Internal.AspNetCore.Sdk": "3.0.0-build-20190504.3"
"version": "3.0.100-preview6-012264"
}
}
2 changes: 0 additions & 2 deletions korebuild-lock.txt

This file was deleted.

4 changes: 0 additions & 4 deletions korebuild.json

This file was deleted.

Loading

0 comments on commit fd2df11

Please sign in to comment.