Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions WindowsAppRuntime.sln
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Deployment.WindowsAppRuntim
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Deployment.WindowsAppRuntime.Test.SingletonLowerVersion", "test\Deployment\data\WindowsAppRuntime.Test.SingletonLowerVersion\WindowsAppRuntime.Test.SingletonLowerVersion.vcxproj", "{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StoragePickersTestApp", "test\TestApps\StoragePickersTestApp\StoragePickersTestApp.vcxproj", "{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -2665,6 +2667,30 @@ Global
{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|x64.Build.0 = Release|x64
{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|x86.ActiveCfg = Release|Win32
{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|x86.Build.0 = Release|Win32
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|Any CPU.ActiveCfg = Debug|x64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|Any CPU.Build.0 = Debug|x64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|Any CPU.Deploy.0 = Debug|x64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|ARM64.ActiveCfg = Debug|ARM64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|ARM64.Build.0 = Debug|ARM64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|ARM64.Deploy.0 = Debug|ARM64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|x64.ActiveCfg = Debug|x64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|x64.Build.0 = Debug|x64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|x64.Deploy.0 = Debug|x64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|x86.ActiveCfg = Debug|Win32
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|x86.Build.0 = Debug|Win32
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Debug|x86.Deploy.0 = Debug|Win32
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|Any CPU.ActiveCfg = Release|x64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|Any CPU.Build.0 = Release|x64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|Any CPU.Deploy.0 = Release|x64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|ARM64.ActiveCfg = Release|ARM64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|ARM64.Build.0 = Release|ARM64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|ARM64.Deploy.0 = Release|ARM64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|x64.ActiveCfg = Release|x64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|x64.Build.0 = Release|x64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|x64.Deploy.0 = Release|x64
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|x86.ActiveCfg = Release|Win32
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|x86.Build.0 = Release|Win32
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F}.Release|x86.Deploy.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2893,6 +2919,7 @@ Global
{06AA7FD7-36BE-41AC-9008-56919D1612C6} = {3B706C5C-55E0-4B76-BF59-89E20FE46795}
{462CF10A-E6B5-4005-8E25-132D1DE589B7} = {2B653A15-2482-40E5-9509-C531E69D0749}
{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D} = {2B653A15-2482-40E5-9509-C531E69D0749}
{D1310DE7-70EC-4B6A-8A78-2A31BCFA037F} = {AC5FFC80-92FE-4933-BED2-EC5519AC4440}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}
Expand Down
16 changes: 16 additions & 0 deletions test/TestApps/StoragePickersTestApp/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Application
x:Class="StoragePickersTestApp.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:StoragePickersTestApp">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
<!-- Other merged dictionaries here -->
</ResourceDictionary.MergedDictionaries>
<!-- Other app resources here -->
</ResourceDictionary>
</Application.Resources>
</Application>
42 changes: 42 additions & 0 deletions test/TestApps/StoragePickersTestApp/App.xaml.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#include "pch.h"
#include "App.xaml.h"
#include "MainWindow.xaml.h"

#include <winrt/Microsoft.UI.Windowing.h>
#include <winrt/Windows.Graphics.h>

using namespace winrt;
using namespace Microsoft::UI::Xaml;

namespace winrt::StoragePickersTestApp::implementation
{
App::App()
{
#if defined _DEBUG && !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION
UnhandledException([](IInspectable const&, UnhandledExceptionEventArgs const& e)
{
if (IsDebuggerPresent())
{
auto errorMessage = e.Message();
__debugbreak();
}
});
#endif
}

void App::OnLaunched([[maybe_unused]] LaunchActivatedEventArgs const& e)
{
window = make<MainWindow>();
window.as<MainWindow>()->InitializeDefaults();

if (auto appWindow = window.AppWindow())
{
appWindow.Resize(winrt::Windows::Graphics::SizeInt32{ 1800, 1220 });
}

window.Activate();
}
}
19 changes: 19 additions & 0 deletions test/TestApps/StoragePickersTestApp/App.xaml.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

#pragma once

#include "App.xaml.g.h"

namespace winrt::StoragePickersTestApp::implementation
{
struct App : AppT<App>
{
App();

void OnLaunched(Microsoft::UI::Xaml::LaunchActivatedEventArgs const&);

private:
winrt::Microsoft::UI::Xaml::Window window{ nullptr };
};
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions test/TestApps/StoragePickersTestApp/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. -->
<!--
This file stops MSBuild from searching for and importing parent Directory.Build.props files.
This is necessary because the WindowsAppSDK repo's build system conflicts with consuming
the shipped WindowsAppSDK NuGet package that this WinUI test app requires.
-->
<Project>
<!-- Empty file - stops inheritance from parent Directory.Build.props -->
</Project>
8 changes: 8 additions & 0 deletions test/TestApps/StoragePickersTestApp/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. -->
<!--
This file stops MSBuild from searching for and importing parent Directory.Build.targets files.
-->
<Project>
<!-- Empty file - stops inheritance from parent Directory.Build.targets -->
</Project>
11 changes: 11 additions & 0 deletions test/TestApps/StoragePickersTestApp/MainWindow.idl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Copyright (c) Microsoft Corporation and Contributors. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

namespace StoragePickersTestApp
{
[default_interface]
runtimeclass MainWindow : Microsoft.UI.Xaml.Window
{
MainWindow();
}
}
Loading
Loading