Skip to content
This repository was archived by the owner on Feb 23, 2021. It is now read-only.

Commit 57d6bfe

Browse files
ryanbrandenburgryanbrandenburg
committed
Update entropy
1 parent 7c02706 commit 57d6bfe

File tree

70 files changed

+210
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+210
-152
lines changed

‎Directory.Build.props‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<Project>
2-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props" Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
3-
2+
<Import
3+
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
4+
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
5+
46
<Import Project="version.props" />
57
<Import Project="build\dependencies.props" />
68
<Import Project="build\sources.props" />

‎Directory.Build.targets‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
<PropertyGroup>
3+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
4+
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
5+
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
6+
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
7+
</PropertyGroup>
8+
</Project>

‎build/dependencies.props‎

Lines changed: 51 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -4,59 +4,61 @@
44
</PropertyGroup>
55
<PropertyGroup Label="Package Versions">
66
<AutoMapperPackageVersion>5.2.0</AutoMapperPackageVersion>
7-
<InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15569</InternalAspNetCoreSdkPackageVersion>
8-
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
9-
<MicrosoftAspNetCoreDataProtectionPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreDataProtectionPackageVersion>
10-
<MicrosoftAspNetCoreDiagnosticsElmPackageVersion>0.4.0-preview1-27602</MicrosoftAspNetCoreDiagnosticsElmPackageVersion>
11-
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
12-
<MicrosoftAspNetCoreDiagnosticsPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreDiagnosticsPackageVersion>
13-
<MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreHostingPackageVersion>
14-
<MicrosoftAspNetCoreHttpPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreHttpPackageVersion>
15-
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
16-
<MicrosoftAspNetCoreIdentityPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreIdentityPackageVersion>
17-
<MicrosoftAspNetCoreLocalizationPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreLocalizationPackageVersion>
18-
<MicrosoftAspNetCoreMvcFormattersXmlPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreMvcFormattersXmlPackageVersion>
19-
<MicrosoftAspNetCoreMvcLocalizationPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreMvcLocalizationPackageVersion>
20-
<MicrosoftAspNetCoreMvcPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreMvcPackageVersion>
21-
<MicrosoftAspNetCoreMvcRazorPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreMvcRazorPackageVersion>
22-
<MicrosoftAspNetCoreOwinPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreOwinPackageVersion>
23-
<MicrosoftAspNetCorePackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCorePackageVersion>
24-
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
25-
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.0-preview1-27602</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
26-
<MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreServerKestrelPackageVersion>
27-
<MicrosoftAspNetCoreSessionPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreSessionPackageVersion>
28-
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreStaticFilesPackageVersion>
29-
<MicrosoftAspNetCoreTestHostPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreTestHostPackageVersion>
30-
<MicrosoftAspNetCoreTestingPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreTestingPackageVersion>
31-
<MicrosoftAspNetCoreWebUtilitiesPackageVersion>2.1.0-preview1-27602</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
7+
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17063</InternalAspNetCoreSdkPackageVersion>
8+
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
9+
<MicrosoftAspNetCoreDataProtectionPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreDataProtectionPackageVersion>
10+
<MicrosoftAspNetCoreDiagnosticsElmPackageVersion>0.5.0-preview1-34316</MicrosoftAspNetCoreDiagnosticsElmPackageVersion>
11+
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
12+
<MicrosoftAspNetCoreDiagnosticsPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreDiagnosticsPackageVersion>
13+
<MicrosoftAspNetCoreHostingPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreHostingPackageVersion>
14+
<MicrosoftAspNetCoreHttpPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreHttpPackageVersion>
15+
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
16+
<MicrosoftAspNetCoreIdentityPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreIdentityPackageVersion>
17+
<MicrosoftAspNetCoreLocalizationPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreLocalizationPackageVersion>
18+
<MicrosoftAspNetCoreMvcFormattersXmlPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreMvcFormattersXmlPackageVersion>
19+
<MicrosoftAspNetCoreMvcLocalizationPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreMvcLocalizationPackageVersion>
20+
<MicrosoftAspNetCoreMvcPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreMvcPackageVersion>
21+
<MicrosoftAspNetCoreMvcRazorPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreMvcRazorPackageVersion>
22+
<MicrosoftAspNetCoreOwinPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreOwinPackageVersion>
23+
<MicrosoftAspNetCorePackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCorePackageVersion>
24+
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
25+
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.6.0-preview1-34316</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
26+
<MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreServerKestrelPackageVersion>
27+
<MicrosoftAspNetCoreSessionPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreSessionPackageVersion>
28+
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreStaticFilesPackageVersion>
29+
<MicrosoftAspNetCoreTestHostPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreTestHostPackageVersion>
30+
<MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreTestingPackageVersion>
31+
<MicrosoftAspNetCoreWebUtilitiesPackageVersion>2.2.0-preview1-34316</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
3232
<MicrosoftDotNetWatcherToolsPackageVersion>2.1.0-preview1-27602</MicrosoftDotNetWatcherToolsPackageVersion>
33-
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.1.0-preview1-27602</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
34-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.0-preview1-27602</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
35-
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.0-preview1-27602</MicrosoftEntityFrameworkCoreToolsPackageVersion>
33+
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.2.0-preview1-34316</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
34+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.2.0-preview1-34316</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
3635
<MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion>2.1.0-preview1-27602</MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion>
37-
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
38-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
39-
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
40-
<MicrosoftExtensionsConfigurationIniPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsConfigurationIniPackageVersion>
41-
<MicrosoftExtensionsConfigurationJsonPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsConfigurationJsonPackageVersion>
42-
<MicrosoftExtensionsConfigurationPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsConfigurationPackageVersion>
43-
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
44-
<MicrosoftExtensionsDependencyInjectionPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsDependencyInjectionPackageVersion>
45-
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
46-
<MicrosoftExtensionsLocalizationPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsLocalizationPackageVersion>
47-
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
48-
<MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsLoggingConsolePackageVersion>
49-
<MicrosoftExtensionsLoggingDebugPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsLoggingDebugPackageVersion>
50-
<MicrosoftExtensionsLoggingPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsLoggingPackageVersion>
51-
<MicrosoftExtensionsLoggingTestingPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsLoggingTestingPackageVersion>
52-
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
53-
<MicrosoftExtensionsOptionsPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsOptionsPackageVersion>
36+
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.2.0-preview1-34316</MicrosoftEntityFrameworkCoreToolsPackageVersion>
37+
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
38+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
39+
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
40+
<MicrosoftExtensionsConfigurationIniPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsConfigurationIniPackageVersion>
41+
<MicrosoftExtensionsConfigurationJsonPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsConfigurationJsonPackageVersion>
42+
<MicrosoftExtensionsConfigurationPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsConfigurationPackageVersion>
43+
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
44+
<MicrosoftExtensionsDependencyInjectionPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsDependencyInjectionPackageVersion>
45+
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
46+
<MicrosoftExtensionsLocalizationPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsLocalizationPackageVersion>
47+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
48+
<MicrosoftExtensionsLoggingConsolePackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsLoggingConsolePackageVersion>
49+
<MicrosoftExtensionsLoggingDebugPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsLoggingDebugPackageVersion>
50+
<MicrosoftExtensionsLoggingPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsLoggingPackageVersion>
51+
<MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsLoggingTestingPackageVersion>
52+
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
53+
<MicrosoftExtensionsOptionsPackageVersion>2.2.0-preview1-34316</MicrosoftExtensionsOptionsPackageVersion>
5454
<MicrosoftExtensionsSecretManagerToosPackageVersion>2.1.0-preview1-27602</MicrosoftExtensionsSecretManagerToosPackageVersion>
55-
<MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
55+
<MicrosoftNETCoreApp22PackageVersion>2.2.0-preview1-26525-04</MicrosoftNETCoreApp22PackageVersion>
56+
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
5657
<MicrosoftOwinPackageVersion>3.0.1</MicrosoftOwinPackageVersion>
5758
<NowinPackageVersion>0.11.0</NowinPackageVersion>
58-
<SystemCollectionsImmutablePackageVersion>1.4.0</SystemCollectionsImmutablePackageVersion>
59-
<XunitPackageVersion>2.3.0</XunitPackageVersion>
60-
<XunitRunnerVisualstudioPackageVersion>2.3.0</XunitRunnerVisualstudioPackageVersion>
59+
<SystemCollectionsImmutablePackageVersion>1.6.0-preview1-26525-01</SystemCollectionsImmutablePackageVersion>
60+
<XunitPackageVersion>2.3.1</XunitPackageVersion>
61+
<XunitRunnerVisualStudioPackageVersion>2.4.0-beta.1.build3945</XunitRunnerVisualStudioPackageVersion>
6162
</PropertyGroup>
63+
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
6264
</Project>

‎build/repo.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<Project>
2+
<Import Project="dependencies.props" />
3+
24
<PropertyGroup>
35
<!-- These properties are use by the automation that updates dependencies.props -->
46
<LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
57
<LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
68
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
12+
</ItemGroup>
713
</Project>

‎build/sources.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
66
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
77
$(RestoreSources);
8+
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
89
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
910
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
1011
</RestoreSources>

‎korebuild.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
3+
"channel": "dev"
4+
}

‎run.ps1‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,18 @@ The base url where build tools can be downloaded. Overrides the value from the c
2626
.PARAMETER Update
2727
Updates KoreBuild to the latest version even if a lock file is present.
2828
29+
.PARAMETER Reinstall
30+
Re-installs KoreBuild
31+
2932
.PARAMETER ConfigFile
3033
The path to the configuration file that stores values. Defaults to korebuild.json.
3134
35+
.PARAMETER ToolsSourceSuffix
36+
The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores.
37+
38+
.PARAMETER CI
39+
Sets up CI specific settings and variables.
40+
3241
.PARAMETER Arguments
3342
Arguments to be passed to the command
3443
@@ -51,7 +60,7 @@ Example config file:
5160
#>
5261
[CmdletBinding(PositionalBinding = $false)]
5362
param(
54-
[Parameter(Mandatory=$true, Position = 0)]
63+
[Parameter(Mandatory = $true, Position = 0)]
5564
[string]$Command,
5665
[string]$Path = $PSScriptRoot,
5766
[Alias('c')]
@@ -62,7 +71,10 @@ param(
6271
[string]$ToolsSource,
6372
[Alias('u')]
6473
[switch]$Update,
65-
[string]$ConfigFile,
74+
[switch]$Reinstall,
75+
[string]$ToolsSourceSuffix,
76+
[string]$ConfigFile = $null,
77+
[switch]$CI,
6678
[Parameter(ValueFromRemainingArguments = $true)]
6779
[string[]]$Arguments
6880
)
@@ -79,7 +91,7 @@ function Get-KoreBuild {
7991
$lockFile = Join-Path $Path 'korebuild-lock.txt'
8092

8193
if (!(Test-Path $lockFile) -or $Update) {
82-
Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile
94+
Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile $ToolsSourceSuffix
8395
}
8496

8597
$version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1
@@ -89,14 +101,18 @@ function Get-KoreBuild {
89101
$version = $version.TrimStart('version:').Trim()
90102
$korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version)
91103

104+
if ($Reinstall -and (Test-Path $korebuildPath)) {
105+
Remove-Item -Force -Recurse $korebuildPath
106+
}
107+
92108
if (!(Test-Path $korebuildPath)) {
93109
Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version"
94110
New-Item -ItemType Directory -Path $korebuildPath | Out-Null
95111
$remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip"
96112

97113
try {
98114
$tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip"
99-
Get-RemoteFile $remotePath $tmpfile
115+
Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix
100116
if (Get-Command -Name 'Expand-Archive' -ErrorAction Ignore) {
101117
# Use built-in commands where possible as they are cross-plat compatible
102118
Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath
@@ -124,7 +140,7 @@ function Join-Paths([string]$path, [string[]]$childPaths) {
124140
return $path
125141
}
126142

127-
function Get-RemoteFile([string]$RemotePath, [string]$LocalPath) {
143+
function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$RemoteSuffix) {
128144
if ($RemotePath -notlike 'http*') {
129145
Copy-Item $RemotePath $LocalPath
130146
return
@@ -134,7 +150,7 @@ function Get-RemoteFile([string]$RemotePath, [string]$LocalPath) {
134150
while ($retries -gt 0) {
135151
$retries -= 1
136152
try {
137-
Invoke-WebRequest -UseBasicParsing -Uri $RemotePath -OutFile $LocalPath
153+
Invoke-WebRequest -UseBasicParsing -Uri $($RemotePath + $RemoteSuffix) -OutFile $LocalPath
138154
return
139155
}
140156
catch {
@@ -161,7 +177,8 @@ if (Test-Path $ConfigFile) {
161177
if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel }
162178
if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource}
163179
}
164-
} catch {
180+
}
181+
catch {
165182
Write-Warning "$ConfigFile could not be read. Its settings will be ignored."
166183
Write-Warning $Error[0]
167184
}
@@ -183,7 +200,7 @@ $korebuildPath = Get-KoreBuild
183200
Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1')
184201

185202
try {
186-
Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile
203+
Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI
187204
Invoke-KoreBuildCommand $Command @Arguments
188205
}
189206
finally {

0 commit comments

Comments
 (0)