Skip to content

Commit

Permalink
Update to WinUI 2.6 (#1618)
Browse files Browse the repository at this point in the history
* Update to WinUI 2.6

Co-authored-by: Han Zhang <[email protected]>
Co-authored-by: Kenny Guo <[email protected]>

**Description of the changes:**
1. Update to WinUI 2.6 styles and controls #1606.
2. Add Mica Material #1611.
3. Add Settings page #596.
4. Fix Ctrl+E shortcuts in AoT mode #1590.

**How changes were validated:**
Passed build, UT/UI test and manually tested.

* Fixed the display issue in AOT mode (#1615)

* Fixed the display issue in AOT mode

* Get the OpenPaneLength from the resource

* Fix CalendarView style in DateCalculation of dark mode (#1616)

* Fix a style problem of Date Calculator, and clean some unused codes

* Remove some unused codes

* Disable Mica before close the window to resolve a crash (#1619)

* Bump internal package build number (#1621)
  • Loading branch information
hanzhang54 authored Jul 27, 2021
1 parent 8301156 commit e06355c
Show file tree
Hide file tree
Showing 39 changed files with 3,779 additions and 1,896 deletions.
5 changes: 5 additions & 0 deletions build/pipelines/azure-pipelines.ci-internal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ jobs:
platform: x64
runsettingsFileName: CalculatorUITests.release.runsettings

- template: ./templates/run-ui-tests.yaml
parameters:
platform: x86
runsettingsFileName: CalculatorUITests.release.runsettings

- template: ./templates/run-unit-tests.yaml
parameters:
platform: x64
Expand Down
24 changes: 5 additions & 19 deletions build/pipelines/azure-pipelines.release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,13 @@
# Store and the Windows image. This pipeline relies on Microsoft-internal resources to run.
#

schedules:
- cron: "0 7 * * *"
displayName: Daily midnight build
branches:
include:
- master

trigger: none
pr: none

variables:
versionMajor: 10
versionMinor: 2108
versionBuild: $[counter('10.2108.*', 0)]
versionMinor: 2109
versionBuild: $[counter('10.2109.*', 0)]
versionPatch: 0

name: '$(versionMajor).$(versionMinor).$(versionBuild).$(versionPatch)'
Expand All @@ -26,27 +19,20 @@ jobs:
- template: ./templates/build-app-internal.yaml
parameters:
platform: x64
isPublicRelease: true

- template: ./templates/build-app-internal.yaml
parameters:
platform: x86
isPublicRelease: true
condition: not(eq(variables['Build.Reason'], 'PullRequest'))

- template: ./templates/build-app-internal.yaml
parameters:
platform: ARM
isPublicRelease: true
condition: not(eq(variables['Build.Reason'], 'PullRequest'))

- template: ./templates/run-ui-tests.yaml
parameters:
platform: x64
runsettingsFileName: CalculatorUITests.release.runsettings

- template: ./templates/run-ui-tests.yaml
parameters:
platform: x86
runsettingsFileName: CalculatorUITests.release.runsettings

- template: ./templates/run-unit-tests.yaml
parameters:
platform: x64
Expand Down
6 changes: 5 additions & 1 deletion build/pipelines/templates/build-app-internal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
parameters:
platform: ''
condition: ''
isPublicRelease: false

jobs:
- job: Build${{ parameters.platform }}
Expand All @@ -27,7 +28,10 @@ jobs:
downloadDirectory: $(Build.SourcesDirectory)
vstsFeed: WindowsInboxApps
vstsFeedPackage: calculator-internals
vstsPackageVersion: 0.0.54
${{ if eq(parameters.isPublicRelease, true) }}:
vstsPackageVersion: 0.0.66
${{ if eq(parameters.isPublicRelease, false) }}:
vstsPackageVersion: 0.0.65

- template: ./build-single-architecture.yaml
parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
downloadDirectory: $(Build.SourcesDirectory)
vstsFeed: WindowsInboxApps
vstsFeedPackage: calculator-internals
vstsPackageVersion: 0.0.54
vstsPackageVersion: 0.0.66

- powershell: |
# Just modify this line to indicate where your en-us PDP file is. Leave the other lines alone.
Expand Down
95 changes: 0 additions & 95 deletions src/Calculator/AboutFlyout.xaml

This file was deleted.

Loading

0 comments on commit e06355c

Please sign in to comment.