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

[pull] master from unoplatform:master #142

Merged
merged 38 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
a59e39f
perf: Avoid LOH allocations in RenderTargetBitmap
Youssef1313 Jan 4, 2024
ee7b543
chore: Adjust for Android
Youssef1313 Jan 5, 2024
a937936
chore: Address review comment
Youssef1313 Jan 12, 2024
1fcd30e
fix: Fix RadialGradientBrush on Skia
Youssef1313 Jan 26, 2024
e34b703
fix: Swallow Style setter exceptions as in WinUI
Youssef1313 Jan 28, 2024
508119e
chore: Address review comment
Youssef1313 Jan 31, 2024
4d83ce6
chore: Adjust from WinUI code
Youssef1313 Jan 31, 2024
40aa49e
fix(textbox): stop infinite invalidations in TextBox on WPF
ramezgerges Feb 1, 2024
4708a10
chore: make TextBox.UpdateDisplaySelection private
ramezgerges Feb 1, 2024
fb17f4e
test: InlinesCollection.FireDrawingEventsOnEveryRedraw is false insid…
ramezgerges Feb 1, 2024
0b552d9
fix: Include netstdref for net7.0 and net8.0 builds
Youssef1313 Feb 1, 2024
2351284
fix: Build Maps and Foldable with NetPrevious (net7.0) only
Youssef1313 Feb 1, 2024
0589667
fix: Fix navigation view back button styles
Youssef1313 Feb 1, 2024
79dc6e1
docs: Refresh progessring docs
jeromelaban Feb 1, 2024
ee59ded
perf(samplesapp): Make sure RefreshContainerPage timers are stopped
Youssef1313 Feb 1, 2024
85064af
docs: Apply suggestions from code review
jeromelaban Feb 1, 2024
f744f51
Merge pull request #15233 from Youssef1313/issues/7266
jeromelaban Feb 1, 2024
c69f07c
Merge pull request #14959 from Youssef1313/rendertargetbitmap-unmanag…
jeromelaban Feb 1, 2024
dbe41bc
ci: Rework templates validation after migrating to Uno.Templates
Youssef1313 Jan 17, 2024
ae8dbbf
chore: Address review comments
Youssef1313 Feb 1, 2024
085548d
chore: Fix build error
Youssef1313 Feb 1, 2024
27f0ca3
chore: Adjust condition
Youssef1313 Feb 1, 2024
008a9eb
chore: Skip Foldable and Maps completely on net8.0
Youssef1313 Feb 1, 2024
7dfb90f
fix: Adjust IDE Channel message serialization
jeromelaban Feb 1, 2024
6d6b8d7
Merge pull request #15310 from Youssef1313/issues/14032
jeromelaban Feb 1, 2024
28b2cde
Merge pull request #15105 from Youssef1313/rework-sol-templates
jeromelaban Feb 2, 2024
0018f51
Merge pull request #15304 from Youssef1313/netstdref-condition-xaml
jeromelaban Feb 2, 2024
35ec3bc
Merge pull request #15324 from unoplatform/dev/jela/devchannel-fix
jeromelaban Feb 2, 2024
4809bc2
chore: Adjust formatting
jeromelaban Feb 2, 2024
872b836
Merge pull request #15306 from Youssef1313/foldable-maps-build
jeromelaban Feb 2, 2024
ef39ae9
Merge pull request #15302 from ramezgerges/wpf_textbox_freeze
jeromelaban Feb 2, 2024
ffe4fd3
Merge pull request #15312 from unoplatform/dev/jela/progressring-docs
jeromelaban Feb 2, 2024
120bfea
chore: Address comment
Youssef1313 Feb 2, 2024
f8ccae1
Merge pull request #15313 from Youssef1313/issues/15062
jeromelaban Feb 2, 2024
3bb6494
fix: [Catalyst] Ensure LottieVisualSource is transparent
jeromelaban Feb 2, 2024
57b519b
fix: Adjust invariant mode for catalyst samples app
jeromelaban Feb 2, 2024
6a22670
Merge pull request #15240 from Youssef1313/issues/15131
jeromelaban Feb 2, 2024
4632296
Merge pull request #15335 from unoplatform/dev/jela/catalyst-lottie-o…
jeromelaban Feb 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
134 changes: 6 additions & 128 deletions build/Uno.UI.Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,126 +38,10 @@
<Target Name="PrepareBuildAssets" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">
<Message Text="Building for $(Configuration) and $(Platform) BuildReason:$(BUILD_REASON) Version:$(GitVersion_SemVer) UNO_UWP_BUILD:$(UNO_UWP_BUILD)" />

<CallTarget Targets="UpdateFileVersions;UpdateTasksSHA" Condition="$(_isWindows)" />
<CallTarget Targets="UpdateTasksSHA" Condition="$(_isWindows)" />
<CallTarget Targets="PrepareNuGetPackage" />
</Target>

<Target Name="UpdateFileVersions">
<PropertyGroup>
<MSBuildDeveloperNamespace>
<Namespace Prefix="x" Uri="http://schemas.microsoft.com/developer/msbuild/2003"/>
</MSBuildDeveloperNamespace>
</PropertyGroup>

<ItemGroup>

<_legacyProject Include="..\src\SolutionTemplate\**\*.Uwp.csproj" Exclude="**\bin\**;**\obj\**"/>

<_sdkProject Include="..\src\SolutionTemplate\**\*.Mobile.csproj" Exclude="**\bin\**;**\obj\**"/>
<_sdkProject Include="..\src\SolutionTemplate\**\*.Wasm.csproj" Exclude="**\bin\**;**\obj\**"/>
<_sdkProject Include="..\src\SolutionTemplate\**\*.Skia.*.csproj" Exclude="**\bin\**;**\obj\**"/>
<_sdkProject Include="..\src\SolutionTemplate\**\*.Windows.csproj" Exclude="**\bin\**;**\obj\**"/>
<_sdkProject Include="..\src\SolutionTemplate\**\UnoQuickStart.csproj" />
<_sdkProject Include="..\src\SolutionTemplate\UnoLibraryTemplate.netcore\CrossTargetedLibrary.csproj"/>
<_sdkProject Include="..\src\SolutionTemplate\UnoLibraryTemplate.netcore\CrossTargetedLibrary.csproj"/>
<_sdkProject Include="..\src\SolutionTemplate\UnoUITestTemplate\UnoUITestTemplate.csproj"/>
<_sdkProject Include="..\src\SolutionTemplate\Uno.ProjectTemplates.Dotnet\content\unolib-crossruntime\UnoCrossRuntimeLib\*.csproj"/>
</ItemGroup>

<XmlPoke XmlInputPath="%(_legacyProject.Identity)"
Query="//x:PackageReference[@Include='Uno.UI.RemoteControl']/@Version"
Value="$(GitVersion_SemVer)"
Namespaces="$(MSBuildDeveloperNamespace)"
/>

<XmlPoke XmlInputPath="%(_legacyProject.Identity)"
Query="//x:PackageReference[@Include='Uno.UI.DevServer']/@Version"
Value="$(GitVersion_SemVer)"
Namespaces="$(MSBuildDeveloperNamespace)"
/>

<XmlPoke XmlInputPath="%(_legacyProject.Identity)"
Query="//x:PackageReference[@Include='Uno.UI']/@Version"
Value="$(GitVersion_SemVer)"
Namespaces="$(MSBuildDeveloperNamespace)"
/>

<XmlPoke XmlInputPath="%(_legacyProject.Identity)"
Query="//x:PackageReference[@Include='Uno.UI.Adapter.Microsoft.Extensions.Logging']/@Version"
Value="$(GitVersion_SemVer)"
Namespaces="$(MSBuildDeveloperNamespace)"
/>

<!-- Update templates for Uno.UI -->
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.RemoteControl']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.DevServer']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.DevServer.Messaging']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.WebAssembly']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.Skia.Gtk']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.Skia.Linux.FrameBuffer']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.Skia.Wpf']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.Runtime.WebAssembly']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.Lottie']/@Version"
Value="$(GitVersion_SemVer)" />

<!-- Update templates for Uno.WinUI -->
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.WinUI']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.WinUI.RemoteControl']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.WinUI.DevServer']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.WinUI.DevServer.Messaging']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.WinUI.WebAssembly']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.WinUI.Skia.Gtk']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.WinUI.Skia.Linux.FrameBuffer']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.WinUI.Skia.Wpf']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.WinUI.Runtime.WebAssembly']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.WinUI.Lottie']/@Version"
Value="$(GitVersion_SemVer)" />


<!-- Update templates for generic packages -->
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.Adapter.Microsoft.Extensions.Logging']/@Version"
Value="$(GitVersion_SemVer)" /> </Target>

<Target Name="UpdateTasksSHA">

<ItemGroup>
Expand All @@ -183,8 +67,12 @@

<Target Name="BuildCIMobile">

<PropertyGroup>
<NetCoreMobileFilter>filters\Uno.UI-packages-netcoremobile-net8.slnf</NetCoreMobileFilter>
<NetCoreMobileFilter Condition="'$(UnoDisableNetCurrentMobile)'=='true'">filters\Uno.UI-packages-netcoremobile.slnf</NetCoreMobileFilter>
</PropertyGroup>
<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-netcoremobile;PackageVersion=$(GITVERSION_SemVer)"
Projects="filters\Uno.UI-packages-netcoremobile.slnf"
Projects="$(NetCoreMobileFilter)"
Targets="Restore;Build"
RebaseOutputs="false"
BuildInParallel="true" />
Expand Down Expand Up @@ -221,16 +109,6 @@

</Target>

<Target Name="BuildTemplatePackages">

<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET7_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-skia;PackageVersion=$(GITVERSION_SemVer)"
Projects="filters\Uno.UI-internal-templates.slnf"
Targets="Restore;Build"
RebaseOutputs="false"
BuildInParallel="true" />

</Target>

<Target Name="BuildSyncGenerator">
<!-- Restore the nuget packages for packages-* solution filters -->
<!-- These filters contain Uno.UI project and its dependencies, which are what needs to be restored -->
Expand Down
23 changes: 0 additions & 23 deletions build/ci/.azure-devops-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ jobs:

pool: ${{ parameters.poolName }}

dependsOn:
- templates_package_build

strategy:
matrix:
UWP:
Expand Down Expand Up @@ -117,23 +114,3 @@ jobs:
PathtoPublish: $(build.artifactstagingdirectory)
ArtifactName: NugetPackages
ArtifactType: Container

- task: CopyFiles@2
displayName: Copy private templates package
condition: eq(variables['UNO_UWP_BUILD'], 'true')
inputs:
SourceFolder: $(Agent.WorkFolder)/
Contents: |
NugetPackages-Artifacts*/vslatest*/Uno.ProjectTemplates.Dotnet*.nupkg
TargetFolder: $(build.sourcesdirectory)/Build/private-templates
CleanTargetFolder: false
OverWrite: false
flattenFolders: true

- task: PublishBuildArtifacts@1
condition: eq(variables['UNO_UWP_BUILD'], 'true')
retryCountOnTaskFailure: 3
inputs:
PathtoPublish: $(build.sourcesdirectory)/Build/private-templates
ArtifactName: private-templates
ArtifactType: Container
69 changes: 0 additions & 69 deletions build/ci/.azure-devops-project-template-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,85 +4,27 @@ parameters:
vmImageLinux: ''

jobs:
- job: templates_package_build
displayName: 'Build Template Package'

pool:
vmImage: ${{ parameters.vmImageWindows }}

variables:
CombinedConfiguration: Release|Any CPU
CI_Build: true
NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
UNO_UWP_BUILD: true
XAML_FLAVOR_BUILD: UWP

steps:
- checkout: self
clean: true

- template: templates/download-winui-converted-tree.yml

- template: templates/nuget-cache.yml
parameters:
nugetPackages: $(NUGET_PACKAGES)

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

# This task is required to run in separately to avoid hitting targets file
# caching issues with msbuild 17.3 or later
- powershell: |
Set-PSDebug -Trace 1
dotnet build build/Uno.UI.Build.csproj /nr:false /m /t:PrepareBuildAssets "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-Reference-prepare-$(XAML_FLAVOR_BUILD).binlog
displayName: Adjust versions

- powershell: |
Set-PSDebug -Trace 1
dotnet build build/Uno.UI.Build.csproj /m /t:BuildTemplatePackages "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-Reference-$(XAML_FLAVOR_BUILD).binlog
displayName: Building Template Packages

- template: templates/copy-package-assets.yml

- task: PublishBuildArtifacts@1
condition: always()
retryCountOnTaskFailure: 3
inputs:
PathtoPublish: $(build.artifactstagingdirectory)
ArtifactName: NugetPackages-Artifacts-reference-$(XAML_FLAVOR_BUILD)
ArtifactType: Container

- job: Dotnet_Template_Tests_NetCoreMobile
displayName: 'Run .NET Mobile Templates Tests'

pool: ${{ parameters.poolName }}

dependsOn:
- templates_package_build
- Generate_Packages

steps:
- task: DownloadBuildArtifacts@0
inputs:
artifactName: NugetPackages

- task: DownloadBuildArtifacts@0
inputs:
artifactName: private-templates

- template: templates/gitversion.yml

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

- script: copy $(System.ArtifactsDirectory)\NugetPackages\vslatest\*.nupkg $(Build.SourcesDirectory)\src\PackageCache
displayName: Copy Artifacts to PackageCache

- script: copy $(System.ArtifactsDirectory)\private-templates\*.nupkg $(Build.SourcesDirectory)\src\PackageCache
displayName: Copy Private Artifacts to PackageCache

- script: dotnet new -i $(System.ArtifactsDirectory)\private-templates\Uno.ProjectTemplates.Dotnet*.nupkg
displayName: Install Project Templates

- powershell: build\test-scripts\run-netcore-mobile-template-tests.ps1
displayName: Run Project Templates Tests
env:
Expand All @@ -92,7 +34,6 @@ jobs:
displayName: 'Run dotnet new Templates Tests - Linux (net7)'

dependsOn:
- templates_package_build
- Generate_Packages

pool: ${{ parameters.vmPoolLinux }}
Expand All @@ -104,22 +45,12 @@ jobs:
inputs:
artifactName: NugetPackages

- task: DownloadBuildArtifacts@0
inputs:
artifactName: private-templates

- template: templates/gitversion.yml

- script: cp $(System.ArtifactsDirectory)/NugetPackages/vslatest/*.nupkg $(Build.SourcesDirectory)/src/PackageCache
displayName: Copy Artifacts to PackageCache

- script: cp $(System.ArtifactsDirectory)/private-templates/*.nupkg $(Build.SourcesDirectory)/src/PackageCache
displayName: Copy Private Artifacts to PackageCache

- template: templates/dotnet-install.yml

- script: dotnet new -i $(Build.SourcesDirectory)/src/PackageCache/Uno.ProjectTemplates.Dotnet*.nupkg
displayName: Install Project Templates

- pwsh: build/test-scripts/run-net7-template-linux.ps1
displayName: Run Project Templates Tests
8 changes: 0 additions & 8 deletions build/filters/Uno.UI-internal-templates.slnf

This file was deleted.

32 changes: 32 additions & 0 deletions build/filters/Uno.UI-packages-netcoremobile-net8.slnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"solution": {
"path": "..\\..\\src\\Uno.UI.sln",
"projects": [
"AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.netcoremobile.csproj",
"AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.netcoremobile.csproj",
"AddIns\\Uno.UI.Svg\\Uno.UI.Svg.netcoremobile.csproj",
"SourceGenerators\\System.Xaml\\Uno.Xaml.csproj",
"SourceGenerators\\Uno.UI.SourceGenerators.Internal\\Uno.UI.SourceGenerators.Internal.csproj",
"SourceGenerators\\Uno.UI.SourceGenerators\\Uno.UI.SourceGenerators.csproj",
"SourceGenerators\\Uno.UI.Tasks\\Uno.UI.Tasks.csproj",
"Uno.Foundation.Logging\\Uno.Foundation.Logging.csproj",
"Uno.Foundation\\Uno.Foundation.netcoremobile.csproj",
"Uno.UI.Adapter.Microsoft.Extensions.Logging\\Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj",
"Uno.UI.BindingHelper.Android\\Uno.UI.BindingHelper.Android.netcoremobile.csproj",
"Uno.UI.Composition\\Uno.UI.Composition.netcoremobile.csproj",
"Uno.UI.Dispatching\\Uno.UI.Dispatching.netcoremobile.csproj",
"Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.netcoremobile.csproj",
"Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.netcoremobile.csproj",
"Uno.UI.FluentTheme\\Uno.UI.FluentTheme.netcoremobile.csproj",
"Uno.UI.RemoteControl.Host\\Uno.UI.RemoteControl.Host.csproj",
"Uno.UI.RemoteControl.Messaging\\Uno.UI.RemoteControl.Messaging.csproj",
"Uno.UI.RemoteControl.Server\\Uno.UI.RemoteControl.Server.csproj",
"Uno.UI.RemoteControl.VS\\Uno.UI.RemoteControl.VS.csproj",
"Uno.UI.RemoteControl\\Uno.UI.RemoteControl.netcoremobile.csproj",
"Uno.UI.Toolkit\\Uno.UI.Toolkit.netcoremobile.csproj",
"Uno.UI.XamlHost\\Uno.UI.XamlHost.netcoremobile.csproj",
"Uno.UI\\Uno.UI.netcoremobile.csproj",
"Uno.UWP\\Uno.netcoremobile.csproj",
]
}
}
Loading
Loading