From 59b3934c839371df5b1bad70718071116da7887d Mon Sep 17 00:00:00 2001 From: hanzhang54 Date: Mon, 7 Nov 2022 13:34:45 +0800 Subject: [PATCH 01/10] Update release package manifest (#1880) * Check whether graphing API is supported * Update release package manifest * Update minversion --- src/Calculator/Package.Release.appxmanifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Calculator/Package.Release.appxmanifest b/src/Calculator/Package.Release.appxmanifest index 65a46315..c71a8cbe 100644 --- a/src/Calculator/Package.Release.appxmanifest +++ b/src/Calculator/Package.Release.appxmanifest @@ -8,7 +8,7 @@ Assets\CalculatorStoreLogo.png - + From 1796cd08ab13792cc957c03e4b02d922b4f176e5 Mon Sep 17 00:00:00 2001 From: Cory Volk <57420088+volkcor@users.noreply.github.com> Date: Tue, 8 Nov 2022 08:25:17 -0800 Subject: [PATCH 02/10] Update azure-pipelines.release.yaml (#1943) --- build/pipelines/azure-pipelines.release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml index 9667387d..5118307d 100644 --- a/build/pipelines/azure-pipelines.release.yaml +++ b/build/pipelines/azure-pipelines.release.yaml @@ -9,7 +9,7 @@ pr: none variables: versionMajor: 11 - versionMinor: 2210 + versionMinor: 2211 versionBuild: $[counter(format('{0}.{1}.*', variables['versionMajor'], variables['versionMinor']), 0)] versionPatch: 0 From 8f276f44fcb7b3e92234ec84d65c5f2ada85b990 Mon Sep 17 00:00:00 2001 From: Cory Volk <57420088+volkcor@users.noreply.github.com> Date: Thu, 1 Dec 2022 08:43:21 -0800 Subject: [PATCH 03/10] Update package-msixbundle.yaml (#1954) --- build/pipelines/templates/package-msixbundle.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pipelines/templates/package-msixbundle.yaml b/build/pipelines/templates/package-msixbundle.yaml index 683c5b2d..0ca7509e 100644 --- a/build/pipelines/templates/package-msixbundle.yaml +++ b/build/pipelines/templates/package-msixbundle.yaml @@ -81,7 +81,7 @@ jobs: pathToPublish: $(Build.ArtifactStagingDirectory)\msixBundle - ${{ if eq(parameters.signBundle, true) }}: - - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 + - task: EsrpCodeSigning@2 displayName: Send msixbundle to code signing service inputs: ConnectedServiceName: Essential Experiences Codesign From 44820e910da28d8ca2ecccd9b02b438d1cfd73e2 Mon Sep 17 00:00:00 2001 From: Cory Volk <57420088+volkcor@users.noreply.github.com> Date: Thu, 1 Dec 2022 08:44:02 -0800 Subject: [PATCH 04/10] Update azure-pipelines.release.yaml (#1953) --- build/pipelines/azure-pipelines.release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml index 5118307d..92c9b88d 100644 --- a/build/pipelines/azure-pipelines.release.yaml +++ b/build/pipelines/azure-pipelines.release.yaml @@ -9,7 +9,7 @@ pr: none variables: versionMajor: 11 - versionMinor: 2211 + versionMinor: 2212 versionBuild: $[counter(format('{0}.{1}.*', variables['versionMajor'], variables['versionMinor']), 0)] versionPatch: 0 From 93a700d2a22a1cc4ddddfc70860ef26420809fb9 Mon Sep 17 00:00:00 2001 From: Cory Volk <57420088+volkcor@users.noreply.github.com> Date: Thu, 5 Jan 2023 08:26:55 -0800 Subject: [PATCH 05/10] Update azure-pipelines.release.yaml (#1965) --- build/pipelines/azure-pipelines.release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml index 92c9b88d..53d1c981 100644 --- a/build/pipelines/azure-pipelines.release.yaml +++ b/build/pipelines/azure-pipelines.release.yaml @@ -9,7 +9,7 @@ pr: none variables: versionMajor: 11 - versionMinor: 2212 + versionMinor: 2301 versionBuild: $[counter(format('{0}.{1}.*', variables['versionMajor'], variables['versionMinor']), 0)] versionPatch: 0 From a7a163ce78d874152c00d233a1e2026acb8175cf Mon Sep 17 00:00:00 2001 From: Matt Cooley Date: Sat, 28 Jan 2023 08:13:42 -0800 Subject: [PATCH 06/10] Update BUILD_YEAR to 2023 (#1972) --- src/Calculator/Views/Settings.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Calculator/Views/Settings.xaml.cs b/src/Calculator/Views/Settings.xaml.cs index 866c1732..0889b09a 100644 --- a/src/Calculator/Views/Settings.xaml.cs +++ b/src/Calculator/Views/Settings.xaml.cs @@ -20,7 +20,7 @@ namespace CalculatorApp { public sealed partial class Settings : UserControl { - private const string BUILD_YEAR = "2022"; + private const string BUILD_YEAR = "2023"; public event Windows.UI.Xaml.RoutedEventHandler BackButtonClick; From 17bde05575a4b43a923c1ae50723e3fdc0a8327b Mon Sep 17 00:00:00 2001 From: Cory Volk <57420088+volkcor@users.noreply.github.com> Date: Mon, 6 Feb 2023 09:03:41 -0800 Subject: [PATCH 07/10] Update azure-pipelines.release.yaml (#1973) --- build/pipelines/azure-pipelines.release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml index 53d1c981..c9c80616 100644 --- a/build/pipelines/azure-pipelines.release.yaml +++ b/build/pipelines/azure-pipelines.release.yaml @@ -9,7 +9,7 @@ pr: none variables: versionMajor: 11 - versionMinor: 2301 + versionMinor: 2302 versionBuild: $[counter(format('{0}.{1}.*', variables['versionMajor'], variables['versionMinor']), 0)] versionPatch: 0 From 47f314bb102cf99d2596a6a3cde0e6c293c5f0b9 Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Thu, 16 Mar 2023 11:06:40 +0100 Subject: [PATCH 08/10] [Settings] Using SettingsControls (#1964) * Adding SettingsControls package * Using new SettingsControls * Tweaks * Version bump * Replacing Button with HyperlinkButton per design spec * Update Settings.xaml * Fix top spacing --- nuget.config | 3 +- src/Calculator/Calculator.csproj | 3 + src/Calculator/Resources/en-US/Resources.resw | 6 +- src/Calculator/Views/Settings.xaml | 289 +++++++----------- src/Calculator/Views/Settings.xaml.cs | 6 +- 5 files changed, 123 insertions(+), 184 deletions(-) diff --git a/nuget.config b/nuget.config index 14471ade..0b8604f4 100644 --- a/nuget.config +++ b/nuget.config @@ -1,8 +1,9 @@ - + + diff --git a/src/Calculator/Calculator.csproj b/src/Calculator/Calculator.csproj index aa7e1f17..f24e94ad 100644 --- a/src/Calculator/Calculator.csproj +++ b/src/Calculator/Calculator.csproj @@ -791,6 +791,9 @@ + + 0.0.16 + 6.2.14 diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw index d4bf7270..5670daa9 100644 --- a/src/Calculator/Resources/en-US/Resources.resw +++ b/src/Calculator/Resources/en-US/Resources.resw @@ -4706,11 +4706,11 @@ Appearance Subtitle of appearance setting on Settings page - + App theme Title of App theme expander - + Select which app theme to display Description of App theme expander @@ -4738,4 +4738,4 @@ App theme setting Screen reader prompt for the App theme Setting radio buttons group - \ No newline at end of file + diff --git a/src/Calculator/Views/Settings.xaml b/src/Calculator/Views/Settings.xaml index e25dc4de..089e0797 100644 --- a/src/Calculator/Views/Settings.xaml +++ b/src/Calculator/Views/Settings.xaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" Loaded="OnLoaded" @@ -13,7 +14,7 @@ + + + + 3 @@ -43,42 +52,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -