diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 7c4d3b1f..c4d732fe 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -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' diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index 5542662f..3f95e9ae 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -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 diff --git a/scripts/install-dotnet.ps1 b/scripts/install-dotnet.ps1 index f86bc46a..fd2697a0 100644 --- a/scripts/install-dotnet.ps1 +++ b/scripts/install-dotnet.ps1 @@ -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:"