Skip to content
Open
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
3 changes: 3 additions & 0 deletions test/TestApps/StoragePickersTestApp/App.xaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. -->

<?xml version="1.0" encoding="utf-8"?>
<Application
x:Class="StoragePickersTestApp.App"
Expand Down
33 changes: 18 additions & 15 deletions test/TestApps/StoragePickersTestApp/StoragePickersTestApp.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@
<OutDir>$(BaseOutputPath)</OutDir>
</PropertyGroup>

<!-- Import version properties so package paths stay in sync with eng\Version.Dependencies.xml -->
<Import Project="$(RepoRoot)eng\Version.Dependencies.props" />

<!-- Import NuGet props BEFORE other imports -->
<Import Project="$(PackagesDir)Microsoft.Windows.SDK.BuildTools.10.0.26100.1742\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('$(PackagesDir)Microsoft.Windows.SDK.BuildTools.10.0.26100.1742\build\Microsoft.Windows.SDK.BuildTools.props')" />
<Import Project="$(PackagesDir)Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(PackagesDir)Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" />
<Import Project="$(PackagesDir)Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(PackagesDir)Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.props')" />
<Import Project="$(PackagesDir)Microsoft.Windows.SDK.BuildTools.$(MicrosoftWindowsSDKBuildToolsVersion)\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('$(PackagesDir)Microsoft.Windows.SDK.BuildTools.$(MicrosoftWindowsSDKBuildToolsVersion)\build\Microsoft.Windows.SDK.BuildTools.props')" />
<Import Project="$(PackagesDir)Microsoft.Windows.CppWinRT.$(MicrosoftWindowsCppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(PackagesDir)Microsoft.Windows.CppWinRT.$(MicrosoftWindowsCppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.props')" />
<Import Project="$(PackagesDir)Microsoft.WindowsAppSDK.$(MicrosoftWindowsAppSDKVersion)\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(PackagesDir)Microsoft.WindowsAppSDK.$(MicrosoftWindowsAppSDKVersion)\build\native\Microsoft.WindowsAppSDK.props')" />

<PropertyGroup Label="Globals">
<CppWinRTOptimized>true</CppWinRTOptimized>
Expand Down Expand Up @@ -215,24 +218,24 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

<ImportGroup Label="ExtensionTargets">
<Import Project="$(PackagesDir)Microsoft.Web.WebView2.1.0.2651.64\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(PackagesDir)Microsoft.Web.WebView2.1.0.2651.64\build\native\Microsoft.Web.WebView2.targets')" />
<Import Project="$(PackagesDir)Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(PackagesDir)Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.targets')" />
<Import Project="$(PackagesDir)Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(PackagesDir)Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="$(PackagesDir)Microsoft.Windows.SDK.BuildTools.10.0.26100.1742\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('$(PackagesDir)Microsoft.Windows.SDK.BuildTools.10.0.26100.1742\build\Microsoft.Windows.SDK.BuildTools.targets')" />
<Import Project="$(PackagesDir)Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(PackagesDir)Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
<Import Project="$(PackagesDir)Microsoft.Web.WebView2.$(MicrosoftWebWebView2Version)\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(PackagesDir)Microsoft.Web.WebView2.$(MicrosoftWebWebView2Version)\build\native\Microsoft.Web.WebView2.targets')" />
<Import Project="$(PackagesDir)Microsoft.WindowsAppSDK.$(MicrosoftWindowsAppSDKVersion)\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(PackagesDir)Microsoft.WindowsAppSDK.$(MicrosoftWindowsAppSDKVersion)\build\native\Microsoft.WindowsAppSDK.targets')" />
<Import Project="$(PackagesDir)Microsoft.Windows.CppWinRT.$(MicrosoftWindowsCppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(PackagesDir)Microsoft.Windows.CppWinRT.$(MicrosoftWindowsCppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="$(PackagesDir)Microsoft.Windows.SDK.BuildTools.$(MicrosoftWindowsSDKBuildToolsVersion)\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('$(PackagesDir)Microsoft.Windows.SDK.BuildTools.$(MicrosoftWindowsSDKBuildToolsVersion)\build\Microsoft.Windows.SDK.BuildTools.targets')" />
<Import Project="$(PackagesDir)Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(PackagesDir)Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
</ImportGroup>

<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(PackagesDir)Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.WindowsAppSDK.1.6.241114003'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.WindowsAppSDK.1.6.241114003'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.CppWinRT.2.0.230706.1'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.CppWinRT.2.0.230706.1'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.SDK.BuildTools.10.0.26100.1742\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.SDK.BuildTools.10.0.26100.1742'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.SDK.BuildTools.10.0.26100.1742\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.SDK.BuildTools.10.0.26100.1742'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.ImplementationLibrary.1.0.240803.1'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.WindowsAppSDK.$(MicrosoftWindowsAppSDKVersion)\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.WindowsAppSDK.$(MicrosoftWindowsAppSDKVersion)'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.WindowsAppSDK.$(MicrosoftWindowsAppSDKVersion)\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.WindowsAppSDK.$(MicrosoftWindowsAppSDKVersion)'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.CppWinRT.$(MicrosoftWindowsCppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.CppWinRT.$(MicrosoftWindowsCppWinRTVersion)'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.CppWinRT.$(MicrosoftWindowsCppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.CppWinRT.$(MicrosoftWindowsCppWinRTVersion)'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.SDK.BuildTools.$(MicrosoftWindowsSDKBuildToolsVersion)\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.SDK.BuildTools.$(MicrosoftWindowsSDKBuildToolsVersion)'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.SDK.BuildTools.$(MicrosoftWindowsSDKBuildToolsVersion)\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.SDK.BuildTools.$(MicrosoftWindowsSDKBuildToolsVersion)'))" />
<Error Condition="!Exists('$(PackagesDir)Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)'))" />
</Target>

<!-- Copy Windows App Runtime DLL and PRI from repo build output for runtime -->
Expand Down
6 changes: 3 additions & 3 deletions test/TestApps/StoragePickersTestApp/packages.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Web.WebView2" version="1.0.2651.64" targetFramework="native" />
<package id="Microsoft.Web.WebView2" version="1.0.961.33" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.230706.1" targetFramework="native" />
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.240803.1" targetFramework="native" />
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.26100.1742" targetFramework="native" />
<package id="Microsoft.WindowsAppSDK" version="1.6.241114003" targetFramework="native" />
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.26100.4654" targetFramework="native" />
<package id="Microsoft.WindowsAppSDK" version="1.6.250408002" targetFramework="native" />
</packages>
Loading