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.

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

Use .NET 7 SDK #10122

Merged
merged 46 commits into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
b5d9e36
build: Use .NET 7 RC2 SDK
Youssef1313 Oct 11, 2022
2c4f96b
chore: Adjust for CI
Youssef1313 Oct 11, 2022
9071eab
chore: Some more changes
Youssef1313 Oct 11, 2022
c2b8a8e
chore: Update gitversion
Youssef1313 Oct 11, 2022
bd043b6
chore: Fix solution template global.json
Youssef1313 Oct 11, 2022
c055e74
chore: Small fix
Youssef1313 Oct 12, 2022
38445c3
chore: Small fix
Youssef1313 Oct 12, 2022
6cbcf2a
chore: Fix typo
Youssef1313 Oct 13, 2022
92fc7ca
chore: Try fix
Youssef1313 Oct 13, 2022
2a7e8bc
chore: Fix
Youssef1313 Oct 13, 2022
0eedf91
chore: Simplify
Youssef1313 Oct 13, 2022
db5901e
Merge branch 'master' into pin-sdk
Youssef1313 Oct 14, 2022
493e05a
chore: Use RC1 for now
Youssef1313 Oct 14, 2022
4d26423
Merge branch 'master' into pin-sdk
Youssef1313 Oct 14, 2022
0a2e573
Merge branch 'master' into pin-sdk
Youssef1313 Nov 4, 2022
43d772d
chore: Cleanup
Youssef1313 Nov 4, 2022
71c77d3
chore: Adjustments
Youssef1313 Nov 4, 2022
bd2ca41
chore: Small changes
Youssef1313 Nov 4, 2022
09c5254
chore: More cleanup
Youssef1313 Nov 4, 2022
37d0b9c
Merge branch 'unoplatform:master' into pin-sdk
Youssef1313 Nov 14, 2022
27d926a
chore: .NET 7 SDK stable
Youssef1313 Nov 15, 2022
1d9b9a7
chore: Some fixes
Youssef1313 Nov 15, 2022
18466a5
chore: More simplification
Youssef1313 Nov 15, 2022
3184f0a
Merge remote-tracking branch 'upstream' into pin-sdk
Youssef1313 Nov 16, 2022
7724651
Merge remote-tracking branch 'upstream' into pin-sdk
Youssef1313 Nov 16, 2022
3485d41
Merge branch 'master' into pin-sdk
Youssef1313 Dec 1, 2022
36f4ca6
chore: Fix yml template
Youssef1313 Dec 1, 2022
616b80f
chore: Fix
Youssef1313 Dec 24, 2022
ddbb14b
chore: Fix build
Youssef1313 Dec 25, 2022
bc6817e
chore: Fix
Youssef1313 Dec 25, 2022
82a5215
chore: Install for templates
Youssef1313 Dec 25, 2022
98fcc6f
Merge branch 'master' into pin-sdk
Youssef1313 Jan 27, 2023
5fb94bd
chore: Apply suggestions from code review
Youssef1313 Jan 27, 2023
618c18f
chore: Have additional global.json with .NET 6 to use for some mobile…
Youssef1313 Feb 6, 2023
b3d9b44
chore: Adjust uno check version
Youssef1313 Feb 6, 2023
ee71670
chore: Fix global.json replacement
Youssef1313 Feb 7, 2023
4cc5d1d
chore: Adjust
Youssef1313 Feb 7, 2023
2885595
chore: Cleanup
Youssef1313 Feb 7, 2023
d3dedb5
chore: Fix
Youssef1313 Feb 7, 2023
1eba7bf
chore: Fix
Youssef1313 Feb 7, 2023
35c1613
chore: Fix
Youssef1313 Feb 7, 2023
481b358
chore: Fix
Youssef1313 Feb 7, 2023
d322c9a
chore: Fix
Youssef1313 Feb 7, 2023
fdba47d
chore: Fix
Youssef1313 Feb 7, 2023
853bbd1
chore: Adjust
Youssef1313 Feb 7, 2023
34c6f31
chore: Does this work?
Youssef1313 Feb 8, 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: 0 additions & 4 deletions build/Uno.UI.Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
<UpdateAssemblyInfo>false</UpdateAssemblyInfo>
</PropertyGroup>

<ItemGroup>
<Content Include="..\src\global.json" Link="global.json" />
</ItemGroup>

<PropertyGroup Condition="'$(BuildingInsideVisualStudio)'==''">
<AppVersion>$(GITVERSION_SemVer)</AppVersion>

Expand Down
2 changes: 0 additions & 2 deletions build/ci/.azure-devops-android-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,6 @@ jobs:
artifactName: uitests-failure-results
downloadPath: '$(build.sourcesdirectory)/build'

- template: templates/optimize-roslyn-mono.yml

- template: templates/dotnet-install.yml

- template: templates/ios-build-select-version.yml
Expand Down
1 change: 0 additions & 1 deletion build/ci/.azure-devops-ios-tests-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ jobs:
downloadPath: '$(build.sourcesdirectory)/build'

- template: templates/dotnet-install.yml
- template: templates/optimize-roslyn-mono.yml

- template: templates/nuget-cache.yml
parameters:
Expand Down
1 change: 0 additions & 1 deletion build/ci/.azure-devops-ios-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
nugetPackages: $(NUGET_PACKAGES)

- template: templates/dotnet-install.yml
- template: templates/optimize-roslyn-mono.yml

- template: templates/ios-build-select-version.yml
parameters:
Expand Down
25 changes: 9 additions & 16 deletions build/ci/.azure-devops-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
SourceLinkEnabled: false
NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
XCODE_ROOT: /Applications/Xcode_10.3.app

dependsOn: Pipeline_Validations

pool:
Expand All @@ -22,9 +22,8 @@ jobs:
steps:
- checkout: self
clean: true

- template: templates/dotnet-install.yml
- template: templates/optimize-roslyn-mono.yml

- template: templates/nuget-cache.yml
parameters:
Expand Down Expand Up @@ -79,7 +78,7 @@ jobs:
CI_Build: true
SourceLinkEnabled: false
NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget

dependsOn: macOS

pool:
Expand All @@ -88,9 +87,6 @@ jobs:
steps:
- checkout: none
clean: true

- template: templates/dotnet-install.yml
- template: templates/optimize-roslyn-mono.yml

- task: DownloadBuildArtifacts@0
inputs:
Expand All @@ -103,18 +99,18 @@ jobs:
targetType: inline
script: |
brew install coreutils

- script: |
cd $(build.sourcesdirectory)/build/uno-macos-artifacts
installer -pkg SamplesApp.macOS-1.0.pkg -target CurrentUserHomeDirectory

displayName: Install SamplesApp

- script: |
timeout 70m /Applications/SamplesApp.macOS.app/Contents/MacOS/SamplesApp.macOS --runtime-tests=$(build.sourcesdirectory)/build/macOS-runtime-tests-results.xml

displayName: Run macOS Runtime Tests

- task: PublishTestResults@2
displayName: Publish macOS Runtime Tests
condition: always()
Expand All @@ -132,7 +128,7 @@ jobs:
CI_Build: true
SourceLinkEnabled: false
NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget

dependsOn: macOS

pool:
Expand All @@ -141,15 +137,12 @@ jobs:
steps:
- checkout: none
clean: true

- template: templates/dotnet-install.yml
- template: templates/optimize-roslyn-mono.yml

- task: DownloadBuildArtifacts@0
inputs:
artifactName: uno-macos-artifacts
downloadPath: '$(build.sourcesdirectory)/build'

- task: PowerShell@2
displayName: 'Install coreutils'
inputs:
Expand All @@ -160,7 +153,7 @@ jobs:
- script: |
cd $(build.sourcesdirectory)/build/uno-macos-artifacts
installer -pkg SamplesApp.macOS-1.0.pkg -target CurrentUserHomeDirectory

displayName: Install SamplesApp

- script: |
Expand Down
19 changes: 6 additions & 13 deletions build/ci/.azure-devops-package-generic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
- job: generic_win_build
displayName: 'Build Generic Binaries'
timeoutInMinutes: 90

dependsOn: winui_convert_tree

pool: ${{ parameters.poolName }}
Expand All @@ -14,11 +14,11 @@ jobs:
matrix:
UWP:
UNO_UWP_BUILD: true
XAML_FLAVOR_BUILD: UWP
XAML_FLAVOR_BUILD: UWP

WinUI:
UNO_UWP_BUILD: false
XAML_FLAVOR_BUILD: WinUI
XAML_FLAVOR_BUILD: WinUI

variables:
CombinedConfiguration: Release|Any CPU
Expand All @@ -42,24 +42,17 @@ jobs:
nugetPackages: $(NUGET_PACKAGES)

- template: templates/gitversion.yml

- task: NuGetToolInstaller@0
inputs:
versionSpec: 4.9.1
checkLatest: false

# Required to run the api comparison tool
- task: UseDotNet@2
displayName: 'Use .Net Core runtime 2.2.x'
inputs:
packageType: runtime
version: 2.2.x

- template: templates/dotnet-install.yml

- powershell: .\build\Install-WindowsSdkISO.ps1 18362
displayName: Insider SDK

# Required for the Wasm uitests project
- task: NodeTool@0

Expand Down Expand Up @@ -117,7 +110,7 @@ jobs:
PathtoPublish: $(build.artifactstagingdirectory)
ArtifactName: NugetPackages-Artifacts-generic
ArtifactType: Container

# - task: PublishBuildArtifacts@1
# displayName: Publish Tizen Artifacts
# retryCountOnTaskFailure: 3
Expand Down
19 changes: 10 additions & 9 deletions build/ci/.azure-devops-package-net6-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
timeoutInMinutes: 90

pool: ${{ parameters.poolName }}

dependsOn: winui_convert_tree

strategy:
Expand All @@ -20,7 +20,7 @@ jobs:

WinUI_NET6:
UNO_UWP_BUILD: false
XAML_FLAVOR_BUILD: WinUI
XAML_FLAVOR_BUILD: WinUI
UnoDisableNet7Mobile: true
ZipFileTargetFramework: net6

Expand All @@ -32,7 +32,7 @@ jobs:

WinUI_NET7:
UNO_UWP_BUILD: false
XAML_FLAVOR_BUILD: WinUI
XAML_FLAVOR_BUILD: WinUI
UnoDisableNet6Mobile: true
ZipFileTargetFramework: net7

Expand Down Expand Up @@ -65,14 +65,15 @@ jobs:

- template: templates/gitversion.yml

- template: templates/dotnet6-mobile-install-windows.yml
- template: templates/dotnet7-mobile-install-windows.yml
- script: |
cp global.json global-net7.json
cp global-net6.json global.json
displayName: Replace global.json with .NET 6
condition: and(succeeded(), eq(variables.UnoDisableNet7Mobile, 'true'))

- template: templates/install-windows-sdk.yml
- template: templates/dotnet-mobile-install-windows.yml

- powershell: |
cp $(build.sourcesdirectory)\src\global-netcoremobile.json $(build.sourcesdirectory)\src\global.json
displayName: Change active .NET SDK
- template: templates/install-windows-sdk.yml

# This task is required to run in separately to avoid hitting targets file
# caching issues with msbuild 17.3 or later
Expand Down
2 changes: 2 additions & 0 deletions build/ci/.azure-devops-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ jobs:
cleanDestinationFolder: false
overwriteExistingFiles: true

- template: templates/dotnet-install.yml

- task: MSBuild@1
inputs:
solution: Build/Uno.UI.Build.csproj
Expand Down
12 changes: 3 additions & 9 deletions build/ci/.azure-devops-project-template-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
artifactName: NugetPackages

- template: templates/gitversion.yml
- template: templates/dotnet-install.yml
- template: templates/jdk-setup.yml

- template: templates/install-windows-sdk.yml
Expand Down Expand Up @@ -51,11 +52,7 @@ jobs:

- template: templates/gitversion.yml

# required to get the WinAppSdk build running, as it depends on
# msbuild (and not `dotnet`), and VS 17.3 only supports building for .NET 6.
- template: templates/dotnet-install.yml

- template: templates/dotnet7-mobile-install-windows.yml
- template: templates/dotnet-mobile-install-windows.yml

- template: templates/install-windows-sdk.yml
parameters:
Expand Down Expand Up @@ -92,10 +89,7 @@ jobs:
- script: cp $(System.ArtifactsDirectory)/NugetPackages/vslatest/*.nupkg $(Build.SourcesDirectory)/src/PackageCache
displayName: Copy Artifacts to PackageCache

- task: UseDotNet@2
inputs:
packageType: sdk
version: 5.0.102
- template: templates/dotnet-install.yml

- script: dotnet new -i $(System.ArtifactsDirectory)/NugetPackages/vslatest/Uno.ProjectTemplates.Dotnet*.nupkg
displayName: Install Project Templates
Expand Down
1 change: 1 addition & 0 deletions build/ci/.azure-devops-uap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
nugetPackages: $(NUGET_PACKAGES)

- template: templates/gitversion.yml
- template: templates/dotnet-install.yml

# Required until Uno.Xaml can build without all targets enabled
- template: templates/jdk-setup.yml
Expand Down
2 changes: 2 additions & 0 deletions build/ci/.azure-devops-vs2022-vsix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:

- template: templates/gitversion.yml

- template: templates/dotnet-install.yml

- template: templates/nuget-cache.yml
parameters:
nugetPackages: $(NUGET_PACKAGES)
Expand Down
5 changes: 1 addition & 4 deletions build/ci/.azure-devops-wasm-uitests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ jobs:
- template: templates/nuget-cache.yml
parameters:
nugetPackages: $(NUGET_PACKAGES)

- template: templates/optimize-roslyn-mono.yml

- template: templates/dotnet-install.yml

- bash: |
Expand Down Expand Up @@ -97,7 +96,6 @@ jobs:
downloadPath: '$(build.sourcesdirectory)/build'

- template: templates/dotnet-install.yml
- template: templates/optimize-roslyn-mono.yml

- bash: |
set -euo pipefail
Expand Down Expand Up @@ -209,7 +207,6 @@ jobs:
clean: true

- template: templates/dotnet-install.yml
- template: templates/optimize-roslyn-mono.yml

- template: templates/nuget-cache.yml
parameters:
Expand Down
7 changes: 3 additions & 4 deletions build/ci/.azure-devops-winui-convert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
displayName: 'WinUI Converted Tree Generation'

pool: ${{ parameters.poolName }}

dependsOn: Pipeline_Validations

variables:
Expand All @@ -17,7 +17,7 @@ jobs:
NUGET_PACKAGES: $(Agent.WorkFolder)\.nuget

UNO_UWP_BUILD: false
XAML_FLAVOR_BUILD: WinUI
XAML_FLAVOR_BUILD: WinUI

steps:
- checkout: self
Expand All @@ -27,8 +27,7 @@ jobs:
parameters:
nugetPackages: $(NUGET_PACKAGES)

- template: templates/dotnet7-mobile-install-windows.yml
- template: templates/dotnet-install.yml
- template: templates/dotnet-mobile-install-windows.yml
- template: templates/install-windows-sdk.yml

- powershell: |
Expand Down
11 changes: 2 additions & 9 deletions build/ci/templates/dotnet-install.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
steps:

- task: UseDotNet@2
displayName: 'Use .NET Core SDK 6.0.401'
retryCountOnTaskFailure: 3
inputs:
packageType: sdk
version: 6.0.401

- task: UseDotNet@2
displayName: 'Use .NET Core SDK 7.0.102'
displayName: 'Use .NET SDK'
retryCountOnTaskFailure: 3
inputs:
packageType: sdk
useGlobalJson: true
includePreviewVersions: true
version: 7.0.102
23 changes: 23 additions & 0 deletions build/ci/templates/dotnet-mobile-install-windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
steps:

- template: dotnet-install.yml

- template: jdk-setup.yml

- powershell: |
& dotnet tool update --global uno.check --version 1.5.4 --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 https://raw.githubusercontent.com/unoplatform/uno.check/34b1a60f5c1c51604b47362781969dde46979fd5/manifests/uno.ui.manifest.json
displayName: Install .NET Workloads
errorActionPreference: continue
ignoreLASTEXITCODE: true
retryCountOnTaskFailure: 3
condition: and(succeeded(), eq(variables.UnoDisableNet7Mobile, 'true'))

- powershell: |
& dotnet tool update --global uno.check --version 1.11.0-dev.2 --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 https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json
displayName: Install .NET Workloads
errorActionPreference: continue
ignoreLASTEXITCODE: true
retryCountOnTaskFailure: 3
condition: and(succeeded(), ne(variables.UnoDisableNet7Mobile, 'true'))
Loading