Skip to content

Try build without manually installing .NET Core #1956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattleibow merged 7 commits into from
Feb 16, 2022
Merged

Try build without manually installing .NET Core #1956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0da3ba1
Use the published build
mattleibow Feb 15, 2022
8416309
Try no manual .NET Core Preview
mattleibow Feb 15, 2022
8ba5fa1
no core again
mattleibow Feb 15, 2022
c18fa77
trying this now
mattleibow Feb 16, 2022
0492729
Try using the azdo task
mattleibow Feb 16, 2022
aa234eb
build all
mattleibow Feb 16, 2022
c9bbfde
revert
mattleibow Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions scripts/azure-templates-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions scripts/install-dotnet.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Param(
[string] $Version,
[string] $InstallDir
[string] $InstallDir,
[string] $FeedUrl = "https://dotnetbuilds.blob.core.windows.net/public"
)

$ErrorActionPreference = 'Stop'
Expand All @@ -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:"
Expand Down