Skip to content

Commit e122c92

Browse files
Update providers to ASP.NET Core 3.0
Update all providers to ASP.NET Core 3.0, using preview 6. Remove KoreBuild as it is obsolete.
1 parent 4b8b01c commit e122c92

File tree

11 files changed

+208
-467
lines changed

11 files changed

+208
-467
lines changed

build.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@ECHO OFF
2-
PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' default-build %*; exit $LASTEXITCODE"
2+
PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' %*; exit $LASTEXITCODE"

build.ps1

Lines changed: 2 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,6 @@
11
$ErrorActionPreference = "Stop"
22

3-
function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
4-
{
5-
while($true)
6-
{
7-
try
8-
{
9-
Invoke-WebRequest $url -OutFile $downloadLocation
10-
break
11-
}
12-
catch
13-
{
14-
$exceptionMessage = $_.Exception.Message
15-
Write-Host "Failed to download '$url': $exceptionMessage"
16-
if ($retries -gt 0) {
17-
$retries--
18-
Write-Host "Waiting 10 seconds before retrying. Retries left: $retries"
19-
Start-Sleep -Seconds 10
20-
21-
}
22-
else
23-
{
24-
$exception = $_.Exception
25-
throw $exception
26-
}
27-
}
28-
}
29-
}
30-
31-
cd $PSScriptRoot
32-
33-
$repoFolder = $PSScriptRoot
34-
$env:REPO_FOLDER = $repoFolder
35-
36-
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
37-
if ($env:KOREBUILD_ZIP)
38-
{
39-
$koreBuildZip=$env:KOREBUILD_ZIP
40-
}
41-
42-
$buildFolder = ".build"
43-
$buildFile="$buildFolder\KoreBuild.ps1"
44-
45-
if (!(Test-Path $buildFolder)) {
46-
Write-Host "Downloading KoreBuild from $koreBuildZip"
47-
48-
$tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid()
49-
New-Item -Path "$tempFolder" -Type directory | Out-Null
50-
51-
$localZipFile="$tempFolder\korebuild.zip"
52-
53-
DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6
54-
55-
Add-Type -AssemblyName System.IO.Compression.FileSystem
56-
[System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder)
57-
58-
New-Item -Path "$buildFolder" -Type directory | Out-Null
59-
copy-item "$tempFolder\**\build\*" $buildFolder -Recurse
60-
61-
# Cleanup
62-
if (Test-Path $tempFolder) {
63-
Remove-Item -Recurse -Force $tempFolder
64-
}
65-
}
3+
Set-Location $PSScriptRoot
4+
$buildFile = Join-Path "$PSScriptRoot" "Run.ps1"
665

676
&"$buildFile" @args

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
55

66
# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs)
77
chmod +x "$DIR/run.sh"; sync
8-
"$DIR/run.sh" default-build "$@"
8+
"$DIR/run.sh" "$@"

build/dependencies.props

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
<Project>
22

33
<PropertyGroup Label="Package Versions">
4-
<AspNetCoreVersion>3.0.0-preview5-19227-01</AspNetCoreVersion>
5-
<DotNetTestSdkVersion>16.1.0</DotNetTestSdkVersion>
6-
<GoogleProviderVersion>3.0.0-preview5-19227-01</GoogleProviderVersion>
4+
<AspNetCoreVersion>3.0.0-preview6.19307.2</AspNetCoreVersion>
5+
<DotNetTestSdkVersion>16.2.0-preview-20190606-02</DotNetTestSdkVersion>
6+
<GoogleProviderVersion>3.0.0-preview6.19307.2</GoogleProviderVersion>
77
<JetBrainsVersion>2019.1.1</JetBrainsVersion>
88
<JustEatHttpClientInterceptionVersion>2.0.1</JustEatHttpClientInterceptionVersion>
99
<MartinCostelloLoggingXUnitVersion>0.1.0</MartinCostelloLoggingXUnitVersion>
1010
<MicrosoftSourceLinkGitHubVersion>1.0.0-beta2-19270-01</MicrosoftSourceLinkGitHubVersion>
11+
<OpenCoverVersion>4.7.922</OpenCoverVersion>
12+
<ReportGeneratorVersion>4.1.10</ReportGeneratorVersion>
1113
<ShouldlyVersion>3.0.2</ShouldlyVersion>
12-
<TwitterProviderVersion>3.0.0-preview5-19227-01</TwitterProviderVersion>
14+
<TwitterProviderVersion>3.0.0-preview6.19307.2</TwitterProviderVersion>
1315
<XunitVersion>2.4.1</XunitVersion>
1416
</PropertyGroup>
1517

18+
<ItemGroup>
19+
<PackageReference Include="OpenCover" Version="$(OpenCoverVersion)" PrivateAssets="All" />
20+
<PackageReference Include="ReportGenerator" Version="$(ReportGeneratorVersion)" PrivateAssets="All" />
21+
</ItemGroup>
22+
1623
</Project>

global.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"sdk": {
3-
"version": "3.0.100-preview5-011568"
4-
},
5-
"msbuild-sdks": {
6-
"Internal.AspNetCore.Sdk": "3.0.0-build-20190504.3"
3+
"version": "3.0.100-preview6-012264"
74
}
85
}

korebuild-lock.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

korebuild.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)