Skip to content

Commit

Permalink
feat!: Move to uno 5
Browse files Browse the repository at this point in the history
Xamarin and .NET 6 targets are now removed.
  • Loading branch information
jeromelaban committed Jun 27, 2023
1 parent 9dd918f commit 9d59625
Show file tree
Hide file tree
Showing 198 changed files with 125 additions and 4,606 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/azure-static-webapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
build_and_deploy_job:
env:
DIST_PATH: samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm/bin/Release/net5.0/dist
DIST_PATH: samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm/bin/Release/net7.0/dist

if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
Expand All @@ -38,14 +38,14 @@ jobs:
useConfigFile: true
configFilePath: gitversion.yml

- name: Setup dotnet 6.0.200
- name: Setup dotnet
uses: actions/setup-dotnet@v1.7.2
with:
dotnet-version: '6.0.200'
dotnet-version: '7.0.302'

- run: |
cd samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm
dotnet build -c Release "/p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }}" /p:DisableNet6MobileTargets=true
dotnet build -c Release "/p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }}" /p:DisableNet7MobileTargets=true
- uses: actions/upload-artifact@v2
with:
name: wasm-site
Expand Down
9 changes: 5 additions & 4 deletions build/workflow/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ variables:

jobs:
- template: stage-build-packages.yml
- template: stage-build-ios-xamarin.yml
- template: stage-build-android-xamarin.yml
- template: stage-uitests-build.yml
- template: stage-uitests-wasm.yml
- template: stage-uitests-ios.yml
- template: stage-uitests-android.yml
# disabled until mobile targets are added back
#- template: stage-build-ios-xamarin.yml
#- template: stage-build-android-xamarin.yml
#- template: stage-uitests-ios.yml
#- template: stage-uitests-android.yml
6 changes: 3 additions & 3 deletions build/workflow/stage-build-android-xamarin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:
GeneratePackageOnBuild: false
ApplicationBuildNumberOffset: 50
VersionCodeOffset: 1
DisableNet6MobileTargets: true
DisableNet7MobileTargets: true
UWP:
ArtifactName: android-uwp-xamarin
ProjectName: Uno.Toolkit.Samples
GeneratePackageOnBuild: false
ApplicationBuildNumberOffset: 50
VersionCodeOffset: 1
DisableNet6MobileTargets: true
DisableNet7MobileTargets: true

pool:
vmImage: windows-2022
Expand Down Expand Up @@ -70,4 +70,4 @@ jobs:
inputs:
PathtoPublish: $(build.artifactstagingdirectory)
ArtifactName: $(ArtifactName)
ArtifactType: Container
ArtifactType: Container
4 changes: 2 additions & 2 deletions build/workflow/stage-build-ios-xamarin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ jobs:
GeneratePackageOnBuild: false
ApplicationBuildNumberOffset: 50
VersionCodeOffset: 50
DisableNet6MobileTargets: true
DisableNet7MobileTargets: true
CI_Build: true
UWP:
ArtifactName: ios-uwp-xamarin
ProjectName: Uno.Toolkit.Samples
GeneratePackageOnBuild: false
ApplicationBuildNumberOffset: 50
VersionCodeOffset: 50
DisableNet6MobileTargets: true
DisableNet7MobileTargets: true
CI_Build: true
pool:
vmImage: 'macOS-12'
Expand Down
8 changes: 4 additions & 4 deletions build/workflow/stage-build-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
- template: templates/dotnet-workload-install-windows.yml

# This SDK version is needed as long as `uap10.0` will be supported in Uno.Core
- powershell: .\build\Install-WindowsSdkISO.ps1 18362
displayName: Install Windows SDK 18362
- powershell: .\build\Install-WindowsSdkISO.ps1 19041
displayName: Install Windows SDK 19041

- task: MSBuild@1
displayName: 'Build solution'
Expand All @@ -20,7 +20,7 @@ jobs:
msbuildLocationMethod: version
msbuildVersion: latest
maximumCpuCount: true
msbuildArguments: /m /r /p:GeneratePackageOnBuild=true "/p:PackageVersion=%GITVERSION_FullSemVer%" "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /detailedsummary /bl:$(build.artifactstagingdirectory)/toolkit-build-packages.binlog
msbuildArguments: /m /v:m /r /p:GeneratePackageOnBuild=true /p:UseDotNetNativeToolchain=false /p:AotAssemblies=false "/p:PackageVersion=%GITVERSION_FullSemVer%" "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /detailedsummary /bl:$(build.artifactstagingdirectory)/toolkit-build-packages.binlog

- task: DotNetCoreInstaller@0
inputs:
Expand All @@ -44,4 +44,4 @@ jobs:
inputs:
PathtoPublish: $(build.artifactstagingdirectory)
ArtifactName: uno-ui-toolkit-drop
ArtifactType: Container
ArtifactType: Container
2 changes: 1 addition & 1 deletion build/workflow/stage-uitests-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
retryCountOnTaskFailure: 3
inputs:
solution: "$(BUILD.SOURCESDIRECTORY)/samples/$(SAMPLE_PROJECT_NAME)/$(SAMPLE_PROJECT_NAME).Droid/$(SAMPLE_PROJECT_NAME).Droid.csproj"
msbuildArguments: /m /r /t:SignAndroidPackage /p:Configuration=Release /p:UnoUIUseRoslynSourceGenerators=False /p:DisableNet6MobileTargets=true /p:IsUiAutomationMappingEnabled=true /bl:$(build.artifactstagingdirectory)/$(SAMPLEAPP_ARTIFACT_NAME).binlog
msbuildArguments: /m /r /t:SignAndroidPackage /p:Configuration=Release /p:UnoUIUseRoslynSourceGenerators=False /p:DisableNet7MobileTargets=true /p:IsUiAutomationMappingEnabled=true /bl:$(build.artifactstagingdirectory)/$(SAMPLEAPP_ARTIFACT_NAME).binlog

- task: CopyFiles@2
inputs:
Expand Down
2 changes: 1 addition & 1 deletion build/workflow/stage-uitests-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
retryCountOnTaskFailure: 3
inputs:
solution: "$(build.sourcesdirectory)/samples/$(ProjectName)/$(ProjectName).iOS/$(ProjectName).iOS.csproj"
msbuildArguments: /m /r /p:Configuration=Release /p:Platform=iPhoneSimulator /p:UnoUIUseRoslynSourceGenerators=False /p:DisableNet6MobileTargets=true /p:IsUiAutomationMappingEnabled=true /bl:$(BUILD.ARTIFACTSTAGINGDIRECTORY)/$(ArtifactName).binlog
msbuildArguments: /m /r /p:Configuration=Release /p:Platform=iPhoneSimulator /p:UnoUIUseRoslynSourceGenerators=False /p:DisableNet7MobileTargets=true /p:IsUiAutomationMappingEnabled=true /bl:$(BUILD.ARTIFACTSTAGINGDIRECTORY)/$(ArtifactName).binlog

- task: CopyFiles@2
displayName: 'Publish Binaries'
Expand Down
22 changes: 4 additions & 18 deletions build/workflow/stage-uitests-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,23 @@
steps:
- checkout: self
clean: true

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

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

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

- bash: |
dotnet build /r /p:Configuration=Release '$(BUILD.SOURCESDIRECTORY)/samples/$(SAMPLE_PROJECT_NAME)/$(SAMPLE_PROJECT_NAME).Wasm/$(SAMPLE_PROJECT_NAME).Wasm.csproj' /p:IsUiAutomationMappingEnabled=True /p:DisableNet6MobileTargets=True /bl:$(build.artifactstagingdirectory)/wasm-sampleapp.binlog
dotnet build /r /p:Configuration=Release '$(BUILD.SOURCESDIRECTORY)/samples/$(SAMPLE_PROJECT_NAME)/$(SAMPLE_PROJECT_NAME).Wasm/$(SAMPLE_PROJECT_NAME).Wasm.csproj' /p:IsUiAutomationMappingEnabled=True /p:DisableNet7MobileTargets=True /bl:$(build.artifactstagingdirectory)/wasm-sampleapp.binlog
displayName: Build WASM Samples App ($(XAML_FLAVOR_BUILD))
- task: CopyFiles@2
displayName: 'Publish Wasm Site (net5.0)'
inputs:
SourceFolder: $(build.sourcesdirectory)/samples/$(SAMPLE_PROJECT_NAME)/$(SAMPLE_PROJECT_NAME).Wasm/bin/Release/net5.0/dist
SourceFolder: $(build.sourcesdirectory)/samples/$(SAMPLE_PROJECT_NAME)/$(SAMPLE_PROJECT_NAME).Wasm/bin/Release/net7.0/dist
Contents: '**/*.*'
TargetFolder: $(build.artifactstagingdirectory)/site
CleanTargetFolder: false
Expand Down
6 changes: 3 additions & 3 deletions build/workflow/templates/dotnet-workload-install-mac.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
DotNetVersion: '6.0.401'
UnoCheck_Version: '1.5.4'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/34b1a60f5c1c51604b47362781969dde46979fd5/manifests/uno.ui.manifest.json'
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'

Expand Down
6 changes: 3 additions & 3 deletions build/workflow/templates/dotnet-workload-install-windows.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
DotNetVersion: '6.0.401'
UnoCheck_Version: '1.5.4'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/34b1a60f5c1c51604b47362781969dde46979fd5/manifests/uno.ui.manifest.json'
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:

Expand Down
2 changes: 1 addition & 1 deletion samples/.vsconfig
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"Microsoft.VisualStudio.Component.PortableLibrary",
"Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
"Microsoft.VisualStudio.Workload.ManagedDesktop",
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
"Microsoft.VisualStudio.Component.Windows10SDK.19041",
"Microsoft.VisualStudio.Component.Windows10SDK.17763",
"Microsoft.Component.NetFX.Native",
"Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",
Expand Down
31 changes: 15 additions & 16 deletions samples/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,25 @@
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.2" />
<PackageVersion Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageVersion Include="Uno.Cupertino" Version="2.6.0" />
<PackageVersion Include="Uno.Cupertino.WinUI" Version="2.6.0" />
<PackageVersion Include="Uno.Cupertino" Version="3.0.0-dev.252" />
<PackageVersion Include="Uno.Cupertino.WinUI" Version="3.0.0-dev.252" />
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.3.0" />
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
<PackageVersion Include="Uno.Material" Version="2.6.0" />
<PackageVersion Include="Uno.Material.WinUI" Version="2.6.0" />
<PackageVersion Include="Uno.UI" Version="4.10.0-dev.85" />
<PackageVersion Include="Uno.Material" Version="3.0.0-dev.252" />
<PackageVersion Include="Uno.Material.WinUI" Version="3.0.0-dev.252" />
<PackageVersion Include="Uno.UI" Version="5.0.0-dev.1148" />
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.9" />
<PackageVersion Include="Uno.UI.RemoteControl" Version="4.10.0-dev.85" />
<PackageVersion Include="Uno.UI.Skia.Gtk" Version="4.10.0-dev.85" />
<PackageVersion Include="Uno.UI.Skia.Tizen" Version="4.10.0-dev.85" />
<PackageVersion Include="Uno.UI.Skia.Wpf" Version="4.10.0-dev.85" />
<PackageVersion Include="Uno.UI.WebAssembly" Version="4.10.0-dev.85" />
<PackageVersion Include="Uno.UI.RemoteControl" Version="5.0.0-dev.1148" />
<PackageVersion Include="Uno.UI.Skia.Gtk" Version="5.0.0-dev.1148" />
<PackageVersion Include="Uno.UI.Skia.Wpf" Version="5.0.0-dev.1148" />
<PackageVersion Include="Uno.UI.WebAssembly" Version="5.0.0-dev.1148" />
<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.35" />
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.3" />
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.3" />
<PackageVersion Include="Uno.WinUI" Version="4.10.0-dev.85" />
<PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.10.0-dev.85" />
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.10.0-dev.85" />
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.10.0-dev.85" />
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.20" />
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.20" />
<PackageVersion Include="Uno.WinUI" Version="5.0.0-dev.1148" />
<PackageVersion Include="Uno.WinUI.RemoteControl" Version="5.0.0-dev.1148" />
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.0.0-dev.1148" />
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.0.0-dev.1148" />
<PackageVersion Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
<PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.4.0.2" />
<PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
Expand Down

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
43 changes: 0 additions & 43 deletions samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Droid/Main.cs

This file was deleted.

This file was deleted.

Loading

0 comments on commit 9d59625

Please sign in to comment.