Skip to content

Commit 0fd53eb

Browse files
jeffstallJesseColbpulliammanodasanWScottj1s
authored
User/jstall/build2024on16p2 (#375)
* Add app WinUIDesktopAppWithIsland (#357) * Initial checkin * Add SceneNode Helmet * Add readme.md * Organize usings and remove Reunion nuget feed * Add Lottie * CP of User/manodasanw/cs win rt21 core web view2 into release/experimental (#360) * Create Directory.Build.targets * Update nuget.config * Update Directory.Build.targets * Update Directory.Build.targets * Update WinUIComponentCs.csproj * Update CsUnpackagedAppNotifications.csproj * add CoreWebView2 nuget reference to all samples for WinAppSDK 1.6 compat * Merge additional CoreWebView2 nuget reference fixes (#359) * Fix up .vcxproj apps for WinUI Custom CWV2SDK support * Patch all remaining .vcxproj for 1.6 CWV2 work --------- Co-authored-by: DmitriyKomin <[email protected]> --------- Co-authored-by: Manodasan Wignarajah <[email protected]> Co-authored-by: Scott Jones <[email protected]> Co-authored-by: DmitriyKomin <[email protected]> * Revert "Add app WinUIDesktopAppWithIsland (#357)" (#364) This reverts commit 2a95f69. * Port Build 2024 Drawing samples into WASDK 1.6 exp 2 branch. (#367) * Port DrawingIsland samples into WASDK 1.6 Exp 2 This ports the user/jeffstall/drawingisland Samples shown at Build 2024 into the release/experimental branch for WASDK 1.6 Exp 2. * Delete DrawingIsland.cpp Remove older sample. * Restore the localpackages folder of nuget.config (#369) * [SFI] Avoid download from nuget.org directly in the Agg pipeline (#371) * Update nuget.config * Update nuget.config * Update to released CsWinRT versions (#373) * Update files to WinAppSDK 1.6 Preview 2 --------- Co-authored-by: JesseCol <[email protected]> Co-authored-by: Bob Pulliam <[email protected]> Co-authored-by: Manodasan Wignarajah <[email protected]> Co-authored-by: Scott Jones <[email protected]> Co-authored-by: DmitriyKomin <[email protected]> Co-authored-by: Jeffrey Stall <[email protected]> Co-authored-by: alexlamtest <[email protected]>
1 parent b73d7ba commit 0fd53eb

File tree

157 files changed

+11792
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+11792
-5
lines changed

‎DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@
193193
<Import Project="$(NugetPackageDirectory)\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
194194
<Import Project="$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets')" />
195195
<Import Project="$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets')" />
196+
<Import Project="$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
196197
</ImportGroup>
197198
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
198199
<PropertyGroup>
@@ -203,5 +204,6 @@
203204
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
204205
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.props'))" />
205206
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets'))" />
207+
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
206208
</Target>
207209
</Project>

‎DynamicDependenciesSample/DynamicDependencies/DirectX/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220914.1" targetFramework="native" />
44
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.756" targetFramework="native" />
55
<package id="Microsoft.WindowsAppSDK" version="1.5.240227000" targetFramework="native" />
6+
<package id="Microsoft.Web.WebView2" version="1.0.2646-prerelease" targetFramework="native" />
67
</packages>

‎Samples/AppLifecycle/Activation/cpp/cpp-console-unpackaged/CppWinRtConsoleActivation/CppWinRtConsoleActivation.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
<Import Project="$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets')" />
149149
<Import Project="$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets')" />
150150
<Import Project="$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets')" />
151+
<Import Project="$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
151152
</ImportGroup>
152153
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
153154
<PropertyGroup>
@@ -159,5 +160,6 @@
159160
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
160161
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.props'))" />
161162
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets'))" />
163+
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
162164
</Target>
163165
</Project>

‎Samples/AppLifecycle/Activation/cpp/cpp-console-unpackaged/CppWinRtConsoleActivation/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.221104.6" targetFramework="native" />
44
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.756" targetFramework="native" />
55
<package id="Microsoft.WindowsAppSDK" version="1.5.240227000" targetFramework="native" />
6+
<package id="Microsoft.Web.WebView2" version="1.0.2646-prerelease" targetFramework="native" />
67
</packages>

‎Samples/AppLifecycle/Activation/cpp/cpp-win32-packaged/CppWinMainActivation/CppWinMainActivation.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@
237237
<Import Project="$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets')" />
238238
<Import Project="$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets')" />
239239
<Import Project="$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets')" />
240+
<Import Project="$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
240241
</ImportGroup>
241242
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
242243
<PropertyGroup>
@@ -248,5 +249,6 @@
248249
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
249250
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.props'))" />
250251
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets'))" />
252+
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
251253
</Target>
252254
</Project>

‎Samples/AppLifecycle/Activation/cpp/cpp-win32-packaged/CppWinMainActivation/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.221104.6" targetFramework="native" />
44
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.756" targetFramework="native" />
55
<package id="Microsoft.WindowsAppSDK" version="1.5.240227000" targetFramework="native" />
6+
<package id="Microsoft.Web.WebView2" version="1.0.2646-prerelease" targetFramework="native" />
67
</packages>

‎Samples/AppLifecycle/Activation/cpp/cpp-win32-unpackaged/CppWinMainActivation/CppWinMainActivation.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@
238238
<Import Project="$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets')" />
239239
<Import Project="$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets')" />
240240
<Import Project="$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets')" />
241+
<Import Project="$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
241242
</ImportGroup>
242243
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
243244
<PropertyGroup>
@@ -249,5 +250,6 @@
249250
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
250251
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.props'))" />
251252
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets'))" />
253+
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
252254
</Target>
253255
</Project>

‎Samples/AppLifecycle/Activation/cpp/cpp-win32-unpackaged/CppWinMainActivation/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.221104.6" targetFramework="native" />
44
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.756" targetFramework="native" />
55
<package id="Microsoft.WindowsAppSDK" version="1.5.240227000" targetFramework="native" />
6+
<package id="Microsoft.Web.WebView2" version="1.0.2646-prerelease" targetFramework="native" />
67
</packages>

‎Samples/AppLifecycle/Activation/cpp/cpp-winui-packaged/CppWinUiDesktopActivation/CppWinUiDesktopActivation/CppWinUiDesktopActivation.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
<Import Project="$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets')" />
148148
<Import Project="$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets')" />
149149
<Import Project="$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets')" />
150+
<Import Project="$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
150151
</ImportGroup>
151152
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
152153
<PropertyGroup>
@@ -158,5 +159,6 @@
158159
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
159160
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.props'))" />
160161
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.1.5.240227000\build\native\Microsoft.WindowsAppSDK.targets'))" />
162+
<Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
161163
</Target>
162164
</Project>

‎Samples/AppLifecycle/Activation/cpp/cpp-winui-packaged/CppWinUiDesktopActivation/CppWinUiDesktopActivation/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.221104.6" targetFramework="native" />
44
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.756" targetFramework="native" />
55
<package id="Microsoft.WindowsAppSDK" version="1.5.240227000" targetFramework="native" />
6+
<package id="Microsoft.Web.WebView2" version="1.0.2646-prerelease" targetFramework="native" />
67
</packages>

0 commit comments

Comments
 (0)