Skip to content

Commit

Permalink
Merge branch 'master' into dev/lebo/lightweight-refactor-slider
Browse files Browse the repository at this point in the history
  • Loading branch information
@lesterbotello
lesterbotello committed Sep 21, 2023
2 parents 1e9de25 + d19569b commit 5238cc3
Show file tree
Hide file tree
Showing 116 changed files with 8,025 additions and 3,279 deletions.
16 changes: 11 additions & 5 deletions .github/pull_request_template.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,17 @@ What kind of change does this PR introduce?
Please check if your PR fulfills the following requirements:

- Commits must be following the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/#summary)
- [ ] Tested UWP
- [ ] Tested iOS
- [ ] Tested Android
- [ ] Tested WASM
- [ ] Tested MacOS
- [ ] Tested the changes where applicable:
- [ ] UWP
- [ ] iOS
- [ ] Android
- [ ] WASM
- [ ] MacOS
- [ ] Updated the documentation as needed:
- [ ] [General Doc Update](https://github.com/unoplatform/Uno.Themes/tree/master/doc)
- [ ] [material-controls-styles.md](https://github.com/unoplatform/Uno.Themes/blob/master/doc/material-controls-styles.md)
- [ ] [cupertino-controls-styles.md](https://github.com/unoplatform/Uno.Themes/blob/master/doc/cupertino-controls-styles.md)
- [ ] [lightweight-styling.md (LightWeight Styling Resource Keys)](https://github.com/unoplatform/Uno.Themes/blob/master/doc/lightweight-styling.md)
- [ ] Contains **No** breaking changes
> If the pull request contains breaking changes, commit message must contain a detailed description of the action to take for the consumer of this library. As explained by the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/#summary)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/azure-static-webapp.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install GitVersion
uses: gittools/actions/gitversion/[email protected]
with:
versionSpec: '5.x'
versionSpec: '5.10.3'

- name: Determine Version
id: gitversion
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,3 +340,4 @@ src/library/Uno.Material/Generated/mergedpages.v2.xaml

crosstargeting_override.props

.vscode/
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<!-- Required until xamarin targets are used (defined by MSBuild.SDK.Extras)-->
<DisableImplicitFrameworkDefines>false</DisableImplicitFrameworkDefines>
<UnoEnableXamlFuzzyMatching>false</UnoEnableXamlFuzzyMatching>
</PropertyGroup>

<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
Expand Down
4 changes: 4 additions & 0 deletions PlatformItemGroups.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,23 @@
<PropertyGroup Condition="$(_IsIOS)">
<DefineConstants>$(DefineConstants);IOS1_0;XAMARIN;XAMARIN_IOS;XAMARIN_IOS_UNIFIED</DefineConstants>
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
<TargetPlatformVersion>15.4</TargetPlatformVersion>
</PropertyGroup>

<PropertyGroup Condition="$(_IsMacOS)">
<DefineConstants>$(DefineConstants);XAMARIN</DefineConstants>
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
<TargetPlatformVersion>12.3</TargetPlatformVersion>
</PropertyGroup>

<PropertyGroup Condition="$(_IsCatalyst)">
<SupportedOSPlatformVersion>13.1</SupportedOSPlatformVersion>
<TargetPlatformVersion>15.4</TargetPlatformVersion>
</PropertyGroup>

<PropertyGroup Condition="$(_IsAndroid)">
<DefineConstants>$(DefineConstants);__ANDROID__;XAMARIN;MONOANDROID5_0;XAMARIN_ANDROID</DefineConstants>
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
<TargetPlatformVersion>33.0</TargetPlatformVersion>
</PropertyGroup>
</Project>
62 changes: 62 additions & 0 deletions Uno.Themes.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Uno.Themes.Samples.UWP", "s
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Themes.Samples.Wasm", "src\samples\UWP\Uno.Themes.Samples.Wasm\Uno.Themes.Samples.Wasm.csproj", "{5D0F3763-F3BF-4478-B2D3-B47AB74205C9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Themes.Samples.Mobile", "src\samples\UWP\Uno.Themes.Samples.Mobile\Uno.Themes.Samples.Mobile.csproj", "{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F42C65EA-6E6A-43B9-9D9F-D8C6063AD309}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "library", "library", "{EB41D6CC-AEBE-40A8-B42C-D3F7FBA7001E}"
Expand Down Expand Up @@ -191,6 +193,64 @@ Global
{5D0F3763-F3BF-4478-B2D3-B47AB74205C9}.Release|WASM.Build.0 = Release|Any CPU
{5D0F3763-F3BF-4478-B2D3-B47AB74205C9}.Release|x64.ActiveCfg = Release|Any CPU
{5D0F3763-F3BF-4478-B2D3-B47AB74205C9}.Release|x64.Build.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Android.ActiveCfg = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Android.Build.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Android.Deploy.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhone.Build.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhone.Deploy.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|macOS.ActiveCfg = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|macOS.Build.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|macOS.Deploy.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Packages_UWP.ActiveCfg = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Packages_WinUI.ActiveCfg = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Tests.ActiveCfg = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Tests.Build.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Tests.Deploy.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|UWP_x64.ActiveCfg = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|UWP_x64.Build.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|UWP_x64.Deploy.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|WASM.ActiveCfg = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|WASM.Build.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|WASM.Deploy.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|x64.ActiveCfg = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|x64.Build.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|x64.Deploy.0 = Debug|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Android.ActiveCfg = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Android.Build.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Android.Deploy.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Any CPU.Build.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Any CPU.Deploy.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhone.ActiveCfg = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhone.Build.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhone.Deploy.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|macOS.ActiveCfg = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|macOS.Build.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|macOS.Deploy.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Packages_UWP.ActiveCfg = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Packages_WinUI.ActiveCfg = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Tests.ActiveCfg = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Tests.Build.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Tests.Deploy.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|UWP_x64.ActiveCfg = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|UWP_x64.Build.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|UWP_x64.Deploy.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|WASM.ActiveCfg = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|WASM.Build.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|WASM.Deploy.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|x64.ActiveCfg = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|x64.Build.0 = Release|Any CPU
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|x64.Deploy.0 = Release|Any CPU
{290980EF-0A64-43A5-AEB4-E022D82BBF8B}.Debug|Android.ActiveCfg = Debug|Any CPU
{290980EF-0A64-43A5-AEB4-E022D82BBF8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{290980EF-0A64-43A5-AEB4-E022D82BBF8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
Expand Down Expand Up @@ -340,6 +400,7 @@ Global
{6279C845-92F8-4333-AB99-3D213163593C} = {F42C65EA-6E6A-43B9-9D9F-D8C6063AD309}
{265517E4-AB14-453D-92DA-F32AA1D4007D} = {B402BF43-62D6-463C-A71F-941B8EFF463F}
{5D0F3763-F3BF-4478-B2D3-B47AB74205C9} = {B402BF43-62D6-463C-A71F-941B8EFF463F}
{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E} = {B402BF43-62D6-463C-A71F-941B8EFF463F}
{1EB1EA7F-DD48-49C2-97B3-ADB8E86EF28D} = {464D0819-2E75-4DED-9F70-039580314AFA}
{290980EF-0A64-43A5-AEB4-E022D82BBF8B} = {B402BF43-62D6-463C-A71F-941B8EFF463F}
{98C1FDAC-C692-4C65-99E7-70FDD53B8F2E} = {EB41D6CC-AEBE-40A8-B42C-D3F7FBA7001E}
Expand All @@ -356,5 +417,6 @@ Global
src\samples\UWP\Uno.Themes.Samples.Shared\Uno.Themes.Samples.Shared.projitems*{290980ef-0a64-43a5-aeb4-e022d82bbf8b}*SharedItemsImports = 5
src\samples\UWP\Uno.Themes.Samples.Shared\Uno.Themes.Samples.Shared.projitems*{5d0f3763-f3bf-4478-b2d3-b47ab74205c9}*SharedItemsImports = 5
src\samples\UWP\Uno.Themes.Samples.Shared\Uno.Themes.Samples.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13
src\samples\UWP\Uno.Themes.Samples.Shared\Uno.Themes.Samples.Shared.projitems*{d45d0327-b421-48f5-98bc-7c9b1d6abd9e}*SharedItemsImports = 5
EndGlobalSection
EndGlobal
1 change: 1 addition & 0 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ jobs:
# This SDK version is needed as long as `uap10.0` will be supported in Uno.Core
- powershell: ./build/Install-WindowsSdkISO.ps1 19041
displayName: Install Windows SDK 19041
condition: eq(variables['UseWinUI'], false)

- template: build/stage-build.yml

Expand Down
6 changes: 6 additions & 0 deletions build/sign-package.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ $filesToSign = Get-ChildItem -Recurse $Env:ArtifactDirectory\* -Include *.nupkg,
foreach ($fileToSign in $filesToSign) {
Write-Host "Submitting $fileToSign for signing"
.\SignClient 'sign' -c $appSettings -i $fileToSign -r $env:SignClientUser -s $env:SignClientSecret -n "$env:SignPackageName" -d "$env:SignPackageDescription" -u "$env:build_repository_uri"

if($LASTEXITCODE -ne 0)
{
exit 1;
}

Write-Host "Finished signing $fileToSign"
}

Expand Down
2 changes: 1 addition & 1 deletion build/templates/canary-updater.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
mergeBranch: true
branchToMerge: master
nugetUpdaterVersion: 2.3.0-alpha.46
packageAuthor: 'nventive,unoplatform,uno platform'
packageAuthor: 'nventive,Uno Platform'
summaryFile: '$(Build.ArtifactStagingDirectory)/Canary.md'
resultFile: '$(Build.ArtifactStagingDirectory)/Results.json'
2 changes: 1 addition & 1 deletion crosstargeting_override.props.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<!-- <TargetFrameworkOverride Condition="''!='hint: .NET 7.0 macOS AppKit'">net7.0-macos;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->

<!-- DO NOT COMMENT OUT: net7.0 is a required tfm in all cases -->
<TargetFrameworkOverride Condition="'$(TargetFrameworkOverride)'!='' AND !$(TargetFrameworkOverride.Contains('net7.0'))">net7.0;$(TargetFrameworkOverride)</TargetFrameworkOverride>
<TargetFrameworkOverride Condition="'$(TargetFrameworkOverride)'!='' AND !$(TargetFrameworkOverride.Contains('net7.0;'))">net7.0;$(TargetFrameworkOverride)</TargetFrameworkOverride>

<!--

Expand Down
Binary file added doc/assets/lightweight-styling-theme-comparison.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/assets/material-button-pointerover-lightweight-styling.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/assets/material-lightweight-styling-anatomy.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5238cc3

Please sign in to comment.