Try build without manually installing .NET Core (#1956)
This commit is contained in:
Родитель
0b69f880e3
Коммит
44f3c84e0d
|
@ -42,8 +42,8 @@ variables:
|
|||
MONO_VERSION_LINUX: ''
|
||||
XCODE_VERSION: 12.4
|
||||
DOTNET_VERSION_PREVIOUS: 3.1.413
|
||||
DOTNET_VERSION: 5.0.401
|
||||
DOTNET_VERSION_PREVIEW: 6.0.200-preview.22063.5
|
||||
DOTNET_VERSION: 6.0.200
|
||||
DOTNET_VERSION_PREVIEW: ''
|
||||
DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.13.json'
|
||||
VS_VERSION_PREVIEW: 17/pre
|
||||
CONFIGURATION: 'Release'
|
||||
|
|
|
@ -115,6 +115,7 @@ jobs:
|
|||
# install the bits needed for .NET 6 builds
|
||||
- pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet"
|
||||
displayName: Install the preview version of .NET Core
|
||||
condition: ne(variables.DOTNET_VERSION_PREVIEW, '')
|
||||
- ${{ if endsWith(parameters.name, '_windows') }}:
|
||||
- ${{ if eq(parameters.installPreviewVs, 'true') }}:
|
||||
- pwsh: .\scripts\install-vs.ps1 -Version $env:VS_VERSION_PREVIEW
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
Param(
|
||||
[string] $Version,
|
||||
[string] $InstallDir
|
||||
[string] $InstallDir,
|
||||
[string] $FeedUrl = "https://dotnetbuilds.blob.core.windows.net/public"
|
||||
)
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
|
@ -18,11 +19,11 @@ Invoke-WebRequest `
|
|||
|
||||
Write-Host "Installing .NET $Version..."
|
||||
if ($IsMacOS) {
|
||||
& sh dotnet-install.sh --version "$Version" --install-dir "$InstallDir" --verbose
|
||||
& sh dotnet-install.sh --version "$Version" --install-dir "$InstallDir" --azure-feed "$FeedUrl" --verbose
|
||||
} elseif ($IsLinux) {
|
||||
& bash dotnet-install.sh --version "$Version" --install-dir "$InstallDir" --verbose
|
||||
& bash dotnet-install.sh --version "$Version" --install-dir "$InstallDir" --azure-feed "$FeedUrl" --verbose
|
||||
} else {
|
||||
.\dotnet-install.ps1 -Version "$Version" -InstallDir "$InstallDir" -Verbose
|
||||
.\dotnet-install.ps1 -Version "$Version" -InstallDir "$InstallDir" -AzureFeed "$FeedUrl" -Verbose
|
||||
}
|
||||
|
||||
Write-Host "Installed .NET Versions:"
|
||||
|
|
Загрузка…
Ссылка в новой задаче