Skip to content
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

Jump to bottom

ci: restore build with net6.0 to keep compatibility with 6.0.XX SDKs #488

Merged
merged 8 commits into from
Mar 1, 2023
Merged

ci: restore build with net6.0 to keep compatibility with 6.0.XX SDKs #488

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8ae8627
ci: restore build with net6.0 to keep compatibility with 6.0.XX SDKs
jeromelaban Feb 28, 2023
416f388
chore: Apply suggestions from code review
jeromelaban Feb 28, 2023
4e84d7c
chore: Fix mac dotnet install
jeromelaban Feb 28, 2023
d4e80a1
chore: Adjust for 6.0.400
jeromelaban Feb 28, 2023
35d5ca9
chore: Update Windows .NET SDK
jeromelaban Feb 28, 2023
9c32ad4
chore: Adjust for samples
jeromelaban Feb 28, 2023
3061426
ci: Adjust revision version to align with existing builds
jeromelaban Mar 1, 2023
b0b7bfd
chore: Restore .28 for all targets
jeromelaban Mar 1, 2023
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 build/workflow/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:

steps:
- template: templates/gitversion.yml
- template: templates/dotnet7-install-windows.yml
- template: templates/dotnet-workloads-install-windows.yml
jeromelaban marked this conversation as resolved.
Show resolved Hide resolved

# This SDK version is needed as long as `uap10.0` will be supported in Uno.Core
- powershell: .\build\Install-WindowsSdkISO.ps1 18362
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
provProfileSecureFile: Uno_Toolkit_iOS.mobileprovision

- template: templates/gitversion.yml
- template: templates/dotnet7-install-mac.yml
- template: templates/dotnet-workloads-install-mac.yml
jeromelaban marked this conversation as resolved.
Show resolved Hide resolved

- bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(XamarinSDKVersion)"
displayName: Select Xamarin Version
Expand Down
4 changes: 2 additions & 2 deletions build/workflow/stage-uitests-android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
- checkout: self
clean: true

- template: templates/dotnet7-install-mac.yml
- template: templates/dotnet-workloads-install-mac.yml
jeromelaban marked this conversation as resolved.
Show resolved Hide resolved
- template: templates/jdk-setup.yml

- bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(XamarinSDKVersion)"
Expand Down Expand Up @@ -120,7 +120,7 @@
artifactName: toolkit-uitest-binaries
downloadPath: '$(build.sourcesdirectory)/build'

- template: templates/dotnet7-install-mac.yml
- template: templates/dotnet-workloads-install-mac.yml
jeromelaban marked this conversation as resolved.
Show resolved Hide resolved
- template: templates/jdk-setup.yml

- bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(XamarinSDKVersion)"
Expand Down
4 changes: 2 additions & 2 deletions build/workflow/stage-uitests-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
- checkout: self
clean: true

- template: templates/dotnet7-install-mac.yml
- template: templates/dotnet-workloads-install-mac.yml
jeromelaban marked this conversation as resolved.
Show resolved Hide resolved
- template: templates/jdk-setup.yml

- bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(XamarinSDKVersion)"
Expand Down Expand Up @@ -125,7 +125,7 @@
artifactName: toolkit-uitest-binaries
downloadPath: '$(build.sourcesdirectory)/build'

- template: templates/dotnet7-install-mac.yml
- template: templates/dotnet-workloads-install-mac.yml
jeromelaban marked this conversation as resolved.
Show resolved Hide resolved

- bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(XamarinSDKVersion)"
displayName: Select Xamarin Version
Expand Down
96 changes: 48 additions & 48 deletions ...orkflow/templates/dotnet7-install-mac.yml → ...templates/dotnet-workload-install-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
parameters:
DotNetVersion: '7.0.102'
UnoCheck_Version: '1.11.0-dev.2'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json'
Dotnet_Root: '/usr/local/share/dotnet/'
Dotnet_Tools: '~/.dotnet/tools'

steps:
- task: UseDotNet@2
displayName: install .NET 5
retryCountOnTaskFailure: 3
inputs:
version: 5.x
installationPath: ${{ parameters.Dotnet_Root }}

- task: UseDotNet@2
displayName: install .NET 3.1
retryCountOnTaskFailure: 3
inputs:
version: 3.1.x
installationPath: ${{ parameters.Dotnet_Root }}

# Required until .NET 6 installs properly using UseDotnet
# using preview builds
#- bash: |
# export PATH="${{ parameters.Dotnet_Root }}:${{ parameters.Dotnet_Tools }}:$PATH"
# curl -L https://raw.githubusercontent.com/dotnet/install-scripts/11b4eebe23d871c074364940d301c3eb53e7c7ec/src/dotnet-install.sh > dotnet-install.sh
# sh dotnet-install.sh --version ${{ parameters.DotNetVersion }} --install-dir $DOTNET_ROOT --verbose
# dotnet --list-sdks
# echo "##vso[task.setvariable variable=PATH]$PATH"
# displayName: install .NET ${{ parameters.DotNetVersion }}
# retryCountOnTaskFailure: 3

- task: UseDotNet@2
displayName: 'Use .NET Core SDK ${{ parameters.DotNetVersion }}'
retryCountOnTaskFailure: 3
inputs:
packageType: sdk
version: ${{ parameters.DotNetVersion }}
includePreviewVersions: true

- template: jdk-setup.yml

- bash: |
dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
uno-check --ci --non-interactive --fix --skip androidsdk --skip gtk3 --skip xcode --skip vswin --skip vsmac --manifest ${{ parameters.UnoCheck_Manifest }}
displayName: Install .NET Workloads
retryCountOnTaskFailure: 3
parameters:
DotNetVersion: '7.0.102'
jeromelaban marked this conversation as resolved.
Show resolved Hide resolved
UnoCheck_Version: '1.11.0-dev.2'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json'
Dotnet_Root: '/usr/local/share/dotnet/'
Dotnet_Tools: '~/.dotnet/tools'
steps:
- task: UseDotNet@2
displayName: install .NET 5
retryCountOnTaskFailure: 3
inputs:
version: 5.x
installationPath: ${{ parameters.Dotnet_Root }}
- task: UseDotNet@2
displayName: install .NET 3.1
retryCountOnTaskFailure: 3
inputs:
version: 3.1.x
installationPath: ${{ parameters.Dotnet_Root }}
# Required until .NET 6 installs properly using UseDotnet
# using preview builds
#- bash: |
# export PATH="${{ parameters.Dotnet_Root }}:${{ parameters.Dotnet_Tools }}:$PATH"
# curl -L https://raw.githubusercontent.com/dotnet/install-scripts/11b4eebe23d871c074364940d301c3eb53e7c7ec/src/dotnet-install.sh > dotnet-install.sh
# sh dotnet-install.sh --version ${{ parameters.DotNetVersion }} --install-dir $DOTNET_ROOT --verbose
# dotnet --list-sdks
# echo "##vso[task.setvariable variable=PATH]$PATH"
# displayName: install .NET ${{ parameters.DotNetVersion }}
# retryCountOnTaskFailure: 3
- task: UseDotNet@2
displayName: 'Use .NET Core SDK ${{ parameters.DotNetVersion }}'
retryCountOnTaskFailure: 3
inputs:
packageType: sdk
version: ${{ parameters.DotNetVersion }}
includePreviewVersions: true
- template: jdk-setup.yml
- bash: |
dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
uno-check --ci --non-interactive --fix --skip androidsdk --skip gtk3 --skip xcode --skip vswin --skip vsmac --manifest ${{ parameters.UnoCheck_Manifest }}
displayName: Install .NET Workloads
retryCountOnTaskFailure: 3
68 changes: 34 additions & 34 deletions ...low/templates/dotnet7-install-windows.yml → ...lates/dotnet-workload-install-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
parameters:
DotNetVersion: '7.0.102'
UnoCheck_Version: '1.11.0-dev.2'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json'

steps:

# Required until .NET 6 installs properly on Windows using UseDotnet
# using preview builds
#- powershell: |
# $ProgressPreference = 'SilentlyContinue'
# Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
# & .\dotnet-install.ps1 -Version ${{ parameters.DotNetVersion }} -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
# & dotnet --list-sdks
# displayName: Install .NET ${{ parameters.DotNetVersion }}
# errorActionPreference: stop
# retryCountOnTaskFailure: 3
- task: UseDotNet@2
displayName: 'Use .NET Core SDK ${{ parameters.DotNetVersion }}'
retryCountOnTaskFailure: 3
inputs:
packageType: sdk
version: ${{ parameters.DotNetVersion }}
includePreviewVersions: true

- template: jdk-setup.yml

- powershell: |
& dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
& uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --manifest ${{ parameters.UnoCheck_Manifest }}
displayName: Install .NET Workloads
errorActionPreference: continue
ignoreLASTEXITCODE: true
retryCountOnTaskFailure: 3
parameters:
DotNetVersion: '6.0.300'
UnoCheck_Version: '1.5.0-dev.9'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/57a1ec121506a4e96baf5327135b4b1ca464634f/manifests/uno.ui-preview.manifest.json'
steps:
# Required until .NET 6 installs properly on Windows using UseDotnet
# using preview builds
#- powershell: |
# $ProgressPreference = 'SilentlyContinue'
# Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
# & .\dotnet-install.ps1 -Version ${{ parameters.DotNetVersion }} -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
# & dotnet --list-sdks
# displayName: Install .NET ${{ parameters.DotNetVersion }}
# errorActionPreference: stop
# retryCountOnTaskFailure: 3
- task: UseDotNet@2
displayName: 'Use .NET Core SDK ${{ parameters.DotNetVersion }}'
retryCountOnTaskFailure: 3
inputs:
packageType: sdk
version: ${{ parameters.DotNetVersion }}
includePreviewVersions: true
- template: jdk-setup.yml
- powershell: |
& dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
& uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --manifest ${{ parameters.UnoCheck_Manifest }}
displayName: Install .NET Workloads
errorActionPreference: continue
ignoreLASTEXITCODE: true
retryCountOnTaskFailure: 3