diff --git a/.pipelines/ci/ci.yml b/.pipelines/ci/ci.yml index 85b915c48c..47999a29db 100644 --- a/.pipelines/ci/ci.yml +++ b/.pipelines/ci/ci.yml @@ -3,6 +3,7 @@ trigger: branches: include: - master + - dev/build-features paths: exclude: - doc/* @@ -13,6 +14,7 @@ pr: branches: include: - master + - dev/build-features # 0.0.yyMM.dd## # 0.0.1904.0900 diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml index a06cb6514a..9568e38af3 100644 --- a/.pipelines/ci/templates/build-powertoys-steps.yml +++ b/.pipelines/ci/templates/build-powertoys-steps.yml @@ -7,9 +7,9 @@ steps: clean: true - task: NuGetToolInstaller@0 - displayName: Ensure NuGet 4.8.1 + displayName: Ensure NuGet 5.5.0 inputs: - versionSpec: 4.8.1 + versionSpec: 5.5.0 - task: VisualStudioTestPlatformInstaller@1 displayName: Ensure VSTest Platform diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/LockScreenLogo.scale-200.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/LockScreenLogo.scale-200.png new file mode 100644 index 0000000000..735f57adb5 Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/LockScreenLogo.scale-200.png differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Logo.scale-200.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Logo.scale-200.png new file mode 100644 index 0000000000..288995b397 Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Logo.scale-200.png differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/SplashScreen.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/SplashScreen.png new file mode 100644 index 0000000000..ddb349a3d9 Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/SplashScreen.png differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/SplashScreen.scale-200.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/SplashScreen.scale-200.png new file mode 100644 index 0000000000..023e7f1fed Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/SplashScreen.scale-200.png differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Square150x150Logo.scale-200.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000..af49fec1a5 Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Square150x150Logo.scale-200.png differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Square44x44Logo.scale-200.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000..ce342a2ec8 Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Square44x44Logo.scale-200.png differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000000..f6c02ce97e Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/StoreLogo.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/StoreLogo.png new file mode 100644 index 0000000000..7385b56c0e Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/StoreLogo.png differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/StoreLogo.scale-100.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/StoreLogo.scale-100.png new file mode 100644 index 0000000000..7385b56c0e Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/StoreLogo.scale-100.png differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Wide310x150Logo.scale-200.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000..288995b397 Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Wide310x150Logo.scale-200.png differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/logo.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/logo.png deleted file mode 100644 index 8495aaf09d..0000000000 Binary files a/src/core/Microsoft.PowerToys.Settings.UI/Assets/logo.png and /dev/null differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/logo150.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/logo150.png deleted file mode 100644 index 3186a72996..0000000000 Binary files a/src/core/Microsoft.PowerToys.Settings.UI/Assets/logo150.png and /dev/null differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/logo44.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/logo44.png deleted file mode 100644 index cbc9822292..0000000000 Binary files a/src/core/Microsoft.PowerToys.Settings.UI/Assets/logo44.png and /dev/null differ diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj index 85ff2c2c10..a6735c9ca9 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj +++ b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj @@ -112,8 +112,13 @@ - - + + + + + + + diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Package.appxmanifest b/src/core/Microsoft.PowerToys.Settings.UI/Package.appxmanifest index 1debcb290e..17bb4b4236 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Package.appxmanifest +++ b/src/core/Microsoft.PowerToys.Settings.UI/Package.appxmanifest @@ -34,13 +34,14 @@ - + BackgroundColor="transparent" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png"> + + + + + - - - - +