From d3cb47628798e06a47fcec001a599e8257215edb Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Fri, 22 Nov 2024 16:06:14 +0000 Subject: [PATCH 01/22] fix build --- build/Win2D.cpp.props | 7 +------ build/Win2D.cs.props | 5 ----- nuget.config | 2 -- release-nuget.config | 2 -- samples/CompositionExample/CompositionExample.csproj | 2 +- samples/CompositionExample/Package.appxmanifest | 2 +- .../CoreWindowExample/CoreWindowExample.uap.appxmanifest | 2 +- samples/CoreWindowExample/CoreWindowExample.uap.csproj | 2 +- .../ExampleGallery.BackgroundTask.uap.csproj | 2 +- .../ExampleGallery/Effects/ExampleGallery.Effects.csproj | 2 +- samples/ExampleGallery/ExampleGallery.uap.appxmanifest | 2 +- samples/ExampleGallery/ExampleGallery.uap.csproj | 2 +- samples/SimpleSample/SimpleSample.uap.appxmanifest | 2 +- samples/SimpleSample/SimpleSample.uap.csproj | 2 +- winrt/projection/winrt.projection.csproj | 1 + winrt/test.external/winrt.test.external.uap.appxmanifest | 2 +- winrt/test.managed/winrt.test.managed.uap.appxmanifest | 2 +- winrt/test.managed/winrt.test.managed.uap.csproj | 8 ++++---- 18 files changed, 18 insertions(+), 31 deletions(-) diff --git a/build/Win2D.cpp.props b/build/Win2D.cpp.props index 8b371d6a2..3172f7752 100644 --- a/build/Win2D.cpp.props +++ b/build/Win2D.cpp.props @@ -54,12 +54,7 @@ 10.0.19041.0 - - - 10.0.10240.0 - 10.0.10240.0 - - + 10.0.16299.0 10.0.16299.0 diff --git a/build/Win2D.cs.props b/build/Win2D.cs.props index 9016091c0..8f1452a8a 100644 --- a/build/Win2D.cs.props +++ b/build/Win2D.cs.props @@ -17,11 +17,6 @@ 4 true 10.0.19041.0 - - - 10.0.10240.0 - - 10.0.16299.0 diff --git a/nuget.config b/nuget.config index aa5e9f4cc..200b6a0ad 100644 --- a/nuget.config +++ b/nuget.config @@ -1,8 +1,6 @@ - - diff --git a/release-nuget.config b/release-nuget.config index 59f2bbfdb..200b6a0ad 100644 --- a/release-nuget.config +++ b/release-nuget.config @@ -1,8 +1,6 @@ - - diff --git a/samples/CompositionExample/CompositionExample.csproj b/samples/CompositionExample/CompositionExample.csproj index faae767ae..05c55be70 100644 --- a/samples/CompositionExample/CompositionExample.csproj +++ b/samples/CompositionExample/CompositionExample.csproj @@ -112,7 +112,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/CompositionExample/Package.appxmanifest b/samples/CompositionExample/Package.appxmanifest index 7e995ce5d..27762fbf3 100644 --- a/samples/CompositionExample/Package.appxmanifest +++ b/samples/CompositionExample/Package.appxmanifest @@ -8,7 +8,7 @@ Assets\StoreLogo.png - + diff --git a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest index fdeee44b3..a2aefd8d2 100644 --- a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest +++ b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest @@ -12,7 +12,7 @@ Assets\StoreLogo.png - + diff --git a/samples/CoreWindowExample/CoreWindowExample.uap.csproj b/samples/CoreWindowExample/CoreWindowExample.uap.csproj index 8d8472e75..fbc44f0b8 100644 --- a/samples/CoreWindowExample/CoreWindowExample.uap.csproj +++ b/samples/CoreWindowExample/CoreWindowExample.uap.csproj @@ -112,7 +112,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj b/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj index 5e4428ee2..ed25241a8 100644 --- a/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj +++ b/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj @@ -110,7 +110,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj b/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj index 3aa8411b1..e41df9f3a 100644 --- a/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj +++ b/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj @@ -109,7 +109,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest index 2428606cc..dd9bd366a 100644 --- a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest +++ b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest @@ -12,7 +12,7 @@ Assets\StoreLogo.png - + diff --git a/samples/ExampleGallery/ExampleGallery.uap.csproj b/samples/ExampleGallery/ExampleGallery.uap.csproj index c65aeacec..8ca93f88c 100644 --- a/samples/ExampleGallery/ExampleGallery.uap.csproj +++ b/samples/ExampleGallery/ExampleGallery.uap.csproj @@ -127,7 +127,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/SimpleSample/SimpleSample.uap.appxmanifest b/samples/SimpleSample/SimpleSample.uap.appxmanifest index 9fc67a86f..62415bd49 100644 --- a/samples/SimpleSample/SimpleSample.uap.appxmanifest +++ b/samples/SimpleSample/SimpleSample.uap.appxmanifest @@ -19,7 +19,7 @@ - + diff --git a/samples/SimpleSample/SimpleSample.uap.csproj b/samples/SimpleSample/SimpleSample.uap.csproj index f1477f658..01df2002d 100644 --- a/samples/SimpleSample/SimpleSample.uap.csproj +++ b/samples/SimpleSample/SimpleSample.uap.csproj @@ -146,7 +146,7 @@ - 6.2.9 + 6.2.14 diff --git a/winrt/projection/winrt.projection.csproj b/winrt/projection/winrt.projection.csproj index db1070cee..c506969bd 100644 --- a/winrt/projection/winrt.projection.csproj +++ b/winrt/projection/winrt.projection.csproj @@ -8,6 +8,7 @@ Microsoft.Graphics.Canvas.Interop AnyCPU true + true - - - - - - - - - - - - - - - - + + + Properties="IncludeVersionInfo=true" /> diff --git a/build/Assets/Logo.scale-200.png b/build/Assets/Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..076b3a389a0b7e3aab55c153ae88c1713951a69a GIT binary patch literal 3400 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 Dr5!b4 literal 0 HcmV?d00001 diff --git a/build/Assets/SmallLogo.scale-200.png b/build/Assets/SmallLogo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..fe2cf3f5a9ba29b96a32cdcb341d3ecb795b1402 GIT binary patch literal 1285 zcmV+g1^W7lP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1e!@iK~#8N?VT}} z)HoDHpDKYA0s@vX+kk+qn+Bpu2}mGg1(U!6CZAcr?1D2}Ae+OYiEMa;z24 z5{wfKzOg{lm@OE3@C`coV`1*GE)tC4S-l=>G7k~oC3d+pskJT^j3W=eDS@VuMKJW> zo3tY};tMA^&@{3M#*qczoIumaDi{mGpeAx2Lw3RF&wjUqv(Nq-M6GbQv=y2NhTeZw zFF6XdEIDE(7)Cp6g;hbA3Wh6Q} zfqO1WT^JP=jA8IizVyt2KhZ@l?TZUWUp=#Ko-8Hms?2Xrts)o&!bM}H-&{v9hSg*m zd?f-+V^zVp+kr`sVCJ9%TCqo5s|$v4@RbZSjVc7Aud>m{;8Un!nn5*!F%+^Wgp@#A ze8T2Xm0)BFzO@2PqdLLpt52OwH^!3hT2Q56-0he;9rQkGoNimKVDwErDfpB?o7}Zn zP_;vqpbMBdlYyrFn@Loi=&bem*zSbCWd(;|oZJ1_AyU;MC zT`C*WZuS_msQc;4>=De`Ont;PS@1CjS}Ie5Z<62|9)s6H>NJC7 z!Ad8uZt#>ynJAMa_!I*zm9gL(73?dwn#puEa-XAn1=lzov{nvHw>>1dy)0@5zAFub zPk&id^t!V_ztT8NlvjJNJJa5Xcnjd;X0!QIL>`BqHFTVFKS}-$;1B;7v;H$h@P7dQ vX|J4|%r5{hoO92^g#*Ejyj1;1#AD!p1iCK3=OM1h00000NkvXXu0mjfXkJy^ literal 0 HcmV?d00001 diff --git a/build/Assets/SplashScreen.scale-200.png b/build/Assets/SplashScreen.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..d6f68949edc2cc33071a65cdc779ca1dabca3a4c GIT binary patch literal 8651 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 v`L#JAKZ)pK$j~LOJ3 - - - - - - + + diff --git a/tools/docs/BuildDocs.proj b/tools/docs/BuildDocs.proj index 2b0b874b7..9adf42077 100644 --- a/tools/docs/BuildDocs.proj +++ b/tools/docs/BuildDocs.proj @@ -62,7 +62,7 @@ - + $(MSBuildThisFileDirectory)..\..\packages\System.Runtime.4.0.20\ref\dotnet @@ -126,7 +126,7 @@ - + diff --git a/winrt/test.managed/winrt.test.managed.uap.csproj b/winrt/test.managed/winrt.test.managed.uap.csproj index 8e4ef7afd..5560de6e4 100644 --- a/winrt/test.managed/winrt.test.managed.uap.csproj +++ b/winrt/test.managed/winrt.test.managed.uap.csproj @@ -95,6 +95,18 @@ + + Assets\Logo.scale-200.png + + + Assets\SmallLogo.scale-200.png + + + Assets\SplashScreen.scale-200.png + + + Assets\StoreLogo.scale-200.png + Assets\Logo.scale-240.png From be548e0de6345fa1191dd5f92c28f446a1330e2a Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Fri, 22 Nov 2024 18:38:17 +0000 Subject: [PATCH 03/22] disable generating cswinrt projection --- Win2D.proj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Win2D.proj b/Win2D.proj index c5266f927..119e2d759 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -42,7 +42,8 @@ - + + @@ -299,7 +300,7 @@ %(BuildConfiguration.Identity) - + %(BuildPlatform.Identity) From ce89a472ef2028dd586ae4d36db4fc67c0c9fe78 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Fri, 22 Nov 2024 18:44:19 +0000 Subject: [PATCH 04/22] nuget fix --- build/nuget/Win2D.uwp.nuspec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/nuget/Win2D.uwp.nuspec b/build/nuget/Win2D.uwp.nuspec index 6bfdcf07d..41c450371 100644 --- a/build/nuget/Win2D.uwp.nuspec +++ b/build/nuget/Win2D.uwp.nuspec @@ -44,8 +44,11 @@ + + From 672f037c1ff8f1e0b78ed078511182905c2fa6c8 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Fri, 22 Nov 2024 18:52:46 +0000 Subject: [PATCH 05/22] update nuget --- build/nuget/Win2D.uwp.nuspec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build/nuget/Win2D.uwp.nuspec b/build/nuget/Win2D.uwp.nuspec index 41c450371..8a4105a6e 100644 --- a/build/nuget/Win2D.uwp.nuspec +++ b/build/nuget/Win2D.uwp.nuspec @@ -16,14 +16,20 @@ + + + + @@ -32,7 +38,10 @@ + + From d5d76028891f1ac5099ec3c9ed459a9a56cd9d50 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Sat, 23 Nov 2024 09:41:19 +0000 Subject: [PATCH 06/22] small build fix --- build/Win2D.cpp.props | 1 - 1 file changed, 1 deletion(-) diff --git a/build/Win2D.cpp.props b/build/Win2D.cpp.props index 3172f7752..f0b1a5318 100644 --- a/build/Win2D.cpp.props +++ b/build/Win2D.cpp.props @@ -55,7 +55,6 @@ 10.0.19041.0 10.0.16299.0 - 10.0.16299.0 From e404c1586a194d2a92318664f14c7f044c4dde99 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Sat, 4 Jan 2025 09:10:32 +0000 Subject: [PATCH 07/22] fix appx folder --- Win2D.proj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Win2D.proj b/Win2D.proj index 119e2d759..850aed426 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -274,10 +274,12 @@ %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform) %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform)_%(ProjectsToBuild.Configuration) + %(ProjectsToBuild.Filename)_1.0.0.0 + %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Configuration) %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\%(ProjectsToBuild.Filename).dll - %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppX)_Test\%(TestProjects.TestAppX).appx + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppXFolder)_Test\%(TestProjects.TestAppX).appx %(TestProjects.TestArgs) /Platform:x64 From 1063ebb08ef51f1133d89c5a1e9999452c5ce6e5 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Sat, 4 Jan 2025 09:25:34 +0000 Subject: [PATCH 08/22] add bundle extension --- Win2D.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Win2D.proj b/Win2D.proj index 850aed426..8bc8fd9c6 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -277,9 +277,9 @@ %(ProjectsToBuild.Filename)_1.0.0.0 %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Configuration) - + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\%(ProjectsToBuild.Filename).dll - %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppXFolder)_Test\%(TestProjects.TestAppX).appx + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppXFolder)_Test\%(TestProjects.TestAppX).appxbundle %(TestProjects.TestArgs) /Platform:x64 From e29ef240af6eca07e59192dd464dbcba9cf6b828 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Sat, 4 Jan 2025 09:39:24 +0000 Subject: [PATCH 09/22] fix name again --- Win2D.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Win2D.proj b/Win2D.proj index 8bc8fd9c6..a2cf1f9bb 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -272,8 +272,8 @@ bin\%(ProjectsToBuild.BinDir)%(TestProjects.TestPlatform)\%(ProjectsToBuild.Configuration) - %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform) - %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform)_%(ProjectsToBuild.Configuration) + %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform) + %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform)_%(ProjectsToBuild.Configuration) %(ProjectsToBuild.Filename)_1.0.0.0 %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Configuration) From 39221f5e0c4377ec3f6d1f3fd415d169368c84ee Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Sat, 4 Jan 2025 17:05:38 +0000 Subject: [PATCH 10/22] add back projection --- Win2D.proj | 3 +-- build/nuget/Win2D.uwp.nuspec | 12 ------------ winrt/projection/winrt.projection.csproj | 13 +++++++++---- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Win2D.proj b/Win2D.proj index a2cf1f9bb..1e31c9f4f 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -42,8 +42,7 @@ - - + diff --git a/build/nuget/Win2D.uwp.nuspec b/build/nuget/Win2D.uwp.nuspec index 8a4105a6e..6bfdcf07d 100644 --- a/build/nuget/Win2D.uwp.nuspec +++ b/build/nuget/Win2D.uwp.nuspec @@ -16,20 +16,14 @@ - - - - @@ -38,10 +32,7 @@ - - @@ -53,11 +44,8 @@ - - diff --git a/winrt/projection/winrt.projection.csproj b/winrt/projection/winrt.projection.csproj index c506969bd..c3d41213d 100644 --- a/winrt/projection/winrt.projection.csproj +++ b/winrt/projection/winrt.projection.csproj @@ -8,7 +8,13 @@ Microsoft.Graphics.Canvas.Interop AnyCPU true - true + + + false - 10.0.$([System.Version]::Parse('$(TargetPlatformVersion)').Build).48 + 10.0.$([System.Version]::Parse('$(TargetPlatformVersion)').Build).57 Microsoft.Graphics.Canvas; @@ -62,7 +68,6 @@ - - + From 341d9861afe252c0f7f62696c9c9852fefb56905 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Thu, 9 Jan 2025 08:57:51 +0000 Subject: [PATCH 11/22] remove unnecessary changes --- samples/CompositionExample/Package.appxmanifest | 2 +- samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest | 2 +- samples/ExampleGallery/ExampleGallery.uap.appxmanifest | 2 +- samples/SimpleSample/SimpleSample.uap.appxmanifest | 2 +- winrt/test.external/winrt.test.external.uap.appxmanifest | 2 +- winrt/test.managed/winrt.test.managed.uap.appxmanifest | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/CompositionExample/Package.appxmanifest b/samples/CompositionExample/Package.appxmanifest index 27762fbf3..7e995ce5d 100644 --- a/samples/CompositionExample/Package.appxmanifest +++ b/samples/CompositionExample/Package.appxmanifest @@ -8,7 +8,7 @@ Assets\StoreLogo.png - + diff --git a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest index a2aefd8d2..fdeee44b3 100644 --- a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest +++ b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest @@ -12,7 +12,7 @@ Assets\StoreLogo.png - + diff --git a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest index dd9bd366a..2428606cc 100644 --- a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest +++ b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest @@ -12,7 +12,7 @@ Assets\StoreLogo.png - + diff --git a/samples/SimpleSample/SimpleSample.uap.appxmanifest b/samples/SimpleSample/SimpleSample.uap.appxmanifest index 62415bd49..9fc67a86f 100644 --- a/samples/SimpleSample/SimpleSample.uap.appxmanifest +++ b/samples/SimpleSample/SimpleSample.uap.appxmanifest @@ -19,7 +19,7 @@ - + diff --git a/winrt/test.external/winrt.test.external.uap.appxmanifest b/winrt/test.external/winrt.test.external.uap.appxmanifest index df7eaa832..c28de4983 100644 --- a/winrt/test.external/winrt.test.external.uap.appxmanifest +++ b/winrt/test.external/winrt.test.external.uap.appxmanifest @@ -23,7 +23,7 @@ - + diff --git a/winrt/test.managed/winrt.test.managed.uap.appxmanifest b/winrt/test.managed/winrt.test.managed.uap.appxmanifest index 02ec66cd0..9f862bf29 100644 --- a/winrt/test.managed/winrt.test.managed.uap.appxmanifest +++ b/winrt/test.managed/winrt.test.managed.uap.appxmanifest @@ -14,7 +14,7 @@ Assets\StoreLogo.png - + From 954871691f408f1989184f6c5b9e537a618395d1 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Thu, 9 Jan 2025 10:27:23 +0000 Subject: [PATCH 12/22] revert binary location changes --- Win2D.proj | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Win2D.proj b/Win2D.proj index 1e31c9f4f..41b5f3353 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -271,14 +271,12 @@ bin\%(ProjectsToBuild.BinDir)%(TestProjects.TestPlatform)\%(ProjectsToBuild.Configuration) - %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform) - %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform)_%(ProjectsToBuild.Configuration) - %(ProjectsToBuild.Filename)_1.0.0.0 - %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Configuration) + %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform) + %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform)_%(ProjectsToBuild.Configuration) - + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\%(ProjectsToBuild.Filename).dll - %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppXFolder)_Test\%(TestProjects.TestAppX).appxbundle + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppX)_Test\%(TestProjects.TestAppX).appx %(TestProjects.TestArgs) /Platform:x64 From 56e1a2ec84df176539025c99816692085e109ad1 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Thu, 9 Jan 2025 10:42:09 +0000 Subject: [PATCH 13/22] reapply bin location changes --- Win2D.proj | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Win2D.proj b/Win2D.proj index 41b5f3353..069c10afd 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -268,15 +268,17 @@ x86 %(ProjectsToBuild.Platform) - + bin\%(ProjectsToBuild.BinDir)%(TestProjects.TestPlatform)\%(ProjectsToBuild.Configuration) - %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform) - %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform)_%(ProjectsToBuild.Configuration) + %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform) + %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform)_%(ProjectsToBuild.Configuration) + %(ProjectsToBuild.Filename)_1.0.0.0 + %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Configuration) - + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\%(ProjectsToBuild.Filename).dll - %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppX)_Test\%(TestProjects.TestAppX).appx + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppXFolder)_Test\%(TestProjects.TestAppX).appxbundle %(TestProjects.TestArgs) /Platform:x64 From a8475651aa9f03afa39baff023c246545ba487f0 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Thu, 9 Jan 2025 10:42:26 +0000 Subject: [PATCH 14/22] remove extra space --- Win2D.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Win2D.proj b/Win2D.proj index 069c10afd..1e31c9f4f 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -268,7 +268,7 @@ x86 %(ProjectsToBuild.Platform) - + bin\%(ProjectsToBuild.BinDir)%(TestProjects.TestPlatform)\%(ProjectsToBuild.Configuration) %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform) From e7ad7f44ed23a89ae5c7261599e3dd2ca04da42a Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Thu, 9 Jan 2025 11:04:06 +0000 Subject: [PATCH 15/22] revert binary location changes again --- Win2D.proj | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Win2D.proj b/Win2D.proj index 1e31c9f4f..41b5f3353 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -271,14 +271,12 @@ bin\%(ProjectsToBuild.BinDir)%(TestProjects.TestPlatform)\%(ProjectsToBuild.Configuration) - %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform) - %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform)_%(ProjectsToBuild.Configuration) - %(ProjectsToBuild.Filename)_1.0.0.0 - %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Configuration) + %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform) + %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform)_%(ProjectsToBuild.Configuration) - + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\%(ProjectsToBuild.Filename).dll - %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppXFolder)_Test\%(TestProjects.TestAppX).appxbundle + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppX)_Test\%(TestProjects.TestAppX).appx %(TestProjects.TestArgs) /Platform:x64 From 23fcad5f2c311cc0ba46ceaffa223eac272c04df Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Thu, 9 Jan 2025 11:27:53 +0000 Subject: [PATCH 16/22] reapply version changes --- Win2D.proj | 10 ++++++---- samples/CompositionExample/Package.appxmanifest | 2 +- .../CoreWindowExample.uap.appxmanifest | 2 +- samples/ExampleGallery/ExampleGallery.uap.appxmanifest | 2 +- samples/SimpleSample/SimpleSample.uap.appxmanifest | 2 +- .../test.external/winrt.test.external.uap.appxmanifest | 2 +- winrt/test.managed/winrt.test.managed.uap.appxmanifest | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Win2D.proj b/Win2D.proj index 41b5f3353..1e31c9f4f 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -271,12 +271,14 @@ bin\%(ProjectsToBuild.BinDir)%(TestProjects.TestPlatform)\%(ProjectsToBuild.Configuration) - %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform) - %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform)_%(ProjectsToBuild.Configuration) + %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform) + %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform)_%(ProjectsToBuild.Configuration) + %(ProjectsToBuild.Filename)_1.0.0.0 + %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Configuration) - + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\%(ProjectsToBuild.Filename).dll - %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppX)_Test\%(TestProjects.TestAppX).appx + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppXFolder)_Test\%(TestProjects.TestAppX).appxbundle %(TestProjects.TestArgs) /Platform:x64 diff --git a/samples/CompositionExample/Package.appxmanifest b/samples/CompositionExample/Package.appxmanifest index 7e995ce5d..27762fbf3 100644 --- a/samples/CompositionExample/Package.appxmanifest +++ b/samples/CompositionExample/Package.appxmanifest @@ -8,7 +8,7 @@ Assets\StoreLogo.png - + diff --git a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest index fdeee44b3..a2aefd8d2 100644 --- a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest +++ b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest @@ -12,7 +12,7 @@ Assets\StoreLogo.png - + diff --git a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest index 2428606cc..dd9bd366a 100644 --- a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest +++ b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest @@ -12,7 +12,7 @@ Assets\StoreLogo.png - + diff --git a/samples/SimpleSample/SimpleSample.uap.appxmanifest b/samples/SimpleSample/SimpleSample.uap.appxmanifest index 9fc67a86f..62415bd49 100644 --- a/samples/SimpleSample/SimpleSample.uap.appxmanifest +++ b/samples/SimpleSample/SimpleSample.uap.appxmanifest @@ -19,7 +19,7 @@ - + diff --git a/winrt/test.external/winrt.test.external.uap.appxmanifest b/winrt/test.external/winrt.test.external.uap.appxmanifest index c28de4983..df7eaa832 100644 --- a/winrt/test.external/winrt.test.external.uap.appxmanifest +++ b/winrt/test.external/winrt.test.external.uap.appxmanifest @@ -23,7 +23,7 @@ - + diff --git a/winrt/test.managed/winrt.test.managed.uap.appxmanifest b/winrt/test.managed/winrt.test.managed.uap.appxmanifest index 9f862bf29..02ec66cd0 100644 --- a/winrt/test.managed/winrt.test.managed.uap.appxmanifest +++ b/winrt/test.managed/winrt.test.managed.uap.appxmanifest @@ -14,7 +14,7 @@ Assets\StoreLogo.png - + From 9e130948590f15fe6d840760016e26257ca42b26 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Thu, 9 Jan 2025 12:04:44 +0000 Subject: [PATCH 17/22] undo unnecessary changes again --- Win2D.proj | 10 ++++------ samples/CompositionExample/Package.appxmanifest | 2 +- .../CoreWindowExample.uap.appxmanifest | 2 +- samples/ExampleGallery/ExampleGallery.uap.appxmanifest | 2 +- samples/SimpleSample/SimpleSample.uap.appxmanifest | 2 +- .../test.external/winrt.test.external.uap.appxmanifest | 2 +- winrt/test.managed/winrt.test.managed.uap.appxmanifest | 2 +- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Win2D.proj b/Win2D.proj index 1e31c9f4f..41b5f3353 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -271,14 +271,12 @@ bin\%(ProjectsToBuild.BinDir)%(TestProjects.TestPlatform)\%(ProjectsToBuild.Configuration) - %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform) - %(ProjectsToBuild.Filename)_1.0.0.0_%(TestProjects.TestPlatform)_%(ProjectsToBuild.Configuration) - %(ProjectsToBuild.Filename)_1.0.0.0 - %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Configuration) + %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform) + %(ProjectsToBuild.Filename)_1.0.0.0_%(ProjectsToBuild.Platform)_%(ProjectsToBuild.Configuration) - + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\%(ProjectsToBuild.Filename).dll - %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppXFolder)_Test\%(TestProjects.TestAppX).appxbundle + %(TestProjects.TestPath)\%(ProjectsToBuild.Filename)\AppPackages\%(TestProjects.TestAppX)_Test\%(TestProjects.TestAppX).appx %(TestProjects.TestArgs) /Platform:x64 diff --git a/samples/CompositionExample/Package.appxmanifest b/samples/CompositionExample/Package.appxmanifest index 27762fbf3..7e995ce5d 100644 --- a/samples/CompositionExample/Package.appxmanifest +++ b/samples/CompositionExample/Package.appxmanifest @@ -8,7 +8,7 @@ Assets\StoreLogo.png - + diff --git a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest index a2aefd8d2..fdeee44b3 100644 --- a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest +++ b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest @@ -12,7 +12,7 @@ Assets\StoreLogo.png - + diff --git a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest index dd9bd366a..2428606cc 100644 --- a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest +++ b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest @@ -12,7 +12,7 @@ Assets\StoreLogo.png - + diff --git a/samples/SimpleSample/SimpleSample.uap.appxmanifest b/samples/SimpleSample/SimpleSample.uap.appxmanifest index 62415bd49..9fc67a86f 100644 --- a/samples/SimpleSample/SimpleSample.uap.appxmanifest +++ b/samples/SimpleSample/SimpleSample.uap.appxmanifest @@ -19,7 +19,7 @@ - + diff --git a/winrt/test.external/winrt.test.external.uap.appxmanifest b/winrt/test.external/winrt.test.external.uap.appxmanifest index df7eaa832..c28de4983 100644 --- a/winrt/test.external/winrt.test.external.uap.appxmanifest +++ b/winrt/test.external/winrt.test.external.uap.appxmanifest @@ -23,7 +23,7 @@ - + diff --git a/winrt/test.managed/winrt.test.managed.uap.appxmanifest b/winrt/test.managed/winrt.test.managed.uap.appxmanifest index 02ec66cd0..9f862bf29 100644 --- a/winrt/test.managed/winrt.test.managed.uap.appxmanifest +++ b/winrt/test.managed/winrt.test.managed.uap.appxmanifest @@ -14,7 +14,7 @@ Assets\StoreLogo.png - + From 96cad97beabcb66dddba748a9bfc8f597c7072d3 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Thu, 9 Jan 2025 14:50:34 +0000 Subject: [PATCH 18/22] fix appx tests --- winrt/test.managed/winrt.test.managed.uap.appxmanifest | 2 +- winrt/test.managed/winrt.test.managed.uap.csproj | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/winrt/test.managed/winrt.test.managed.uap.appxmanifest b/winrt/test.managed/winrt.test.managed.uap.appxmanifest index 9f862bf29..cda59c799 100644 --- a/winrt/test.managed/winrt.test.managed.uap.appxmanifest +++ b/winrt/test.managed/winrt.test.managed.uap.appxmanifest @@ -5,7 +5,7 @@ xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> diff --git a/winrt/test.managed/winrt.test.managed.uap.csproj b/winrt/test.managed/winrt.test.managed.uap.csproj index 5560de6e4..85387f717 100644 --- a/winrt/test.managed/winrt.test.managed.uap.csproj +++ b/winrt/test.managed/winrt.test.managed.uap.csproj @@ -14,11 +14,12 @@ 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 16.0 + 17.0 true true true true + Never @@ -164,16 +165,16 @@ - 17.12.0 + 17.3.3 6.2.14 - 3.6.3 + 3.7.0 - 3.6.3 + 3.7.0 From a7e6c460ab246fdee3909b67a9e10fadf946e6d6 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Thu, 9 Jan 2025 15:08:24 +0000 Subject: [PATCH 19/22] update publisher to fix warnings --- samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest | 2 +- samples/ExampleGallery/ExampleGallery.uap.appxmanifest | 2 +- samples/SimpleSample/SimpleSample.uap.appxmanifest | 2 +- winrt/test.external/winrt.test.external.uap.appxmanifest | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest index fdeee44b3..fd8420fab 100644 --- a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest +++ b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest @@ -4,7 +4,7 @@ xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> - + Win2D CoreWindow Example diff --git a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest index 2428606cc..040c4c04b 100644 --- a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest +++ b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest @@ -4,7 +4,7 @@ xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> - + Win2D Example Gallery diff --git a/samples/SimpleSample/SimpleSample.uap.appxmanifest b/samples/SimpleSample/SimpleSample.uap.appxmanifest index 9fc67a86f..646bdaf21 100644 --- a/samples/SimpleSample/SimpleSample.uap.appxmanifest +++ b/samples/SimpleSample/SimpleSample.uap.appxmanifest @@ -7,7 +7,7 @@ diff --git a/winrt/test.external/winrt.test.external.uap.appxmanifest b/winrt/test.external/winrt.test.external.uap.appxmanifest index c28de4983..2b6276eec 100644 --- a/winrt/test.external/winrt.test.external.uap.appxmanifest +++ b/winrt/test.external/winrt.test.external.uap.appxmanifest @@ -6,7 +6,7 @@ IgnorableNamespaces="uap mp"> From 7bea09f0a278da2ea1f750230ea54839fb53312d Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Thu, 9 Jan 2025 15:18:28 +0000 Subject: [PATCH 20/22] one more publisher update --- samples/CompositionExample/Package.appxmanifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/CompositionExample/Package.appxmanifest b/samples/CompositionExample/Package.appxmanifest index 7e995ce5d..79c321f96 100644 --- a/samples/CompositionExample/Package.appxmanifest +++ b/samples/CompositionExample/Package.appxmanifest @@ -1,6 +1,6 @@ - + Win2D Composition Example From fa4b4bd2ab0972fd2a96a3d81e9304d1478d31ff Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Fri, 10 Jan 2025 10:17:29 +0000 Subject: [PATCH 21/22] final nuget upgrade --- .../ExampleGallery.Direct3DInterop.uap.vcxproj | 8 ++++---- samples/ExampleGallery/Direct3DInterop/packages.config | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj b/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj index 9a97f5889..d1e28402c 100644 --- a/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj +++ b/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj @@ -1,6 +1,6 @@  - + @@ -46,15 +46,15 @@ - + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/samples/ExampleGallery/Direct3DInterop/packages.config b/samples/ExampleGallery/Direct3DInterop/packages.config index e39c18ce5..d0ccb4886 100644 --- a/samples/ExampleGallery/Direct3DInterop/packages.config +++ b/samples/ExampleGallery/Direct3DInterop/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From 24a301c7ef3ec37429c63eb1462cf5000c1acfc9 Mon Sep 17 00:00:00 2001 From: benstevens48 Date: Fri, 10 Jan 2025 10:43:42 +0000 Subject: [PATCH 22/22] fix directxtk version --- .../ExampleGallery.Direct3DInterop.uap.vcxproj | 8 ++++---- samples/ExampleGallery/Direct3DInterop/packages.config | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj b/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj index d1e28402c..abf814fc7 100644 --- a/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj +++ b/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj @@ -1,6 +1,6 @@  - + @@ -46,15 +46,15 @@ - + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/samples/ExampleGallery/Direct3DInterop/packages.config b/samples/ExampleGallery/Direct3DInterop/packages.config index d0ccb4886..7be7b7792 100644 --- a/samples/ExampleGallery/Direct3DInterop/packages.config +++ b/samples/ExampleGallery/Direct3DInterop/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file