From 0ad59f3dad68850e76b479d90aae14b75cf1c989 Mon Sep 17 00:00:00 2001
From: btueffers <82911735+btueffers@users.noreply.github.com>
Date: Tue, 16 Nov 2021 10:45:52 -0800
Subject: [PATCH 1/8] DynamicDependenciesSamplesUpdate1.0
---
Samples/DynamicDependencies/DirectX/D3D9ExSample.cpp | 2 +-
Samples/DynamicDependencies/DirectX/D3D9ExSample.vcxproj | 8 ++++----
Samples/DynamicDependencies/DirectX/packages.config | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Samples/DynamicDependencies/DirectX/D3D9ExSample.cpp b/Samples/DynamicDependencies/DirectX/D3D9ExSample.cpp
index 49c57318b..905909d73 100644
--- a/Samples/DynamicDependencies/DirectX/D3D9ExSample.cpp
+++ b/Samples/DynamicDependencies/DirectX/D3D9ExSample.cpp
@@ -100,7 +100,7 @@ extern float GetFPS();
// Constants for Windows App SDK lookup via bootstrapper
const UINT32 majorMinorVersion{ 0x00010000 };
-PCWSTR versionTag{ L"preview3" };
+PCWSTR versionTag{ L"" };
int APIENTRY wWinMain( HINSTANCE hInstance,
HINSTANCE hPrevInstance,
diff --git a/Samples/DynamicDependencies/DirectX/D3D9ExSample.vcxproj b/Samples/DynamicDependencies/DirectX/D3D9ExSample.vcxproj
index c23a3d1dd..93fbcd401 100644
--- a/Samples/DynamicDependencies/DirectX/D3D9ExSample.vcxproj
+++ b/Samples/DynamicDependencies/DirectX/D3D9ExSample.vcxproj
@@ -1,7 +1,7 @@
+
-
Debug
@@ -113,17 +113,17 @@
-
+
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}.
-
-
+
+
\ No newline at end of file
diff --git a/Samples/DynamicDependencies/DirectX/packages.config b/Samples/DynamicDependencies/DirectX/packages.config
index 91497fcf9..b49de0d0d 100644
--- a/Samples/DynamicDependencies/DirectX/packages.config
+++ b/Samples/DynamicDependencies/DirectX/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
From 0f94efeb20ee51993afc66f9d49fcd749eb7e999 Mon Sep 17 00:00:00 2001
From: btueffers <82911735+btueffers@users.noreply.github.com>
Date: Tue, 16 Nov 2021 11:05:34 -0800
Subject: [PATCH 2/8] TextRendering1.0Update
---
.../DWriteCoreGallery (packaging).wapproj | 2 +-
.../cpp-win32/DWriteCoreGallery.sln | 10 ----------
.../DWriteCoreGallery.vcxproj | 18 +++++++++---------
.../DWriteCoreGallery/packages.config | 4 ++--
4 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/Samples/TextRendering/cpp-win32/DWriteCoreGallery (packaging)/DWriteCoreGallery (packaging).wapproj b/Samples/TextRendering/cpp-win32/DWriteCoreGallery (packaging)/DWriteCoreGallery (packaging).wapproj
index 2e2f6d337..10a0ff4b2 100644
--- a/Samples/TextRendering/cpp-win32/DWriteCoreGallery (packaging)/DWriteCoreGallery (packaging).wapproj
+++ b/Samples/TextRendering/cpp-win32/DWriteCoreGallery (packaging)/DWriteCoreGallery (packaging).wapproj
@@ -68,7 +68,7 @@
-
+
\ No newline at end of file
diff --git a/Samples/TextRendering/cpp-win32/DWriteCoreGallery.sln b/Samples/TextRendering/cpp-win32/DWriteCoreGallery.sln
index 17ec9ffa5..14ec9eb9d 100644
--- a/Samples/TextRendering/cpp-win32/DWriteCoreGallery.sln
+++ b/Samples/TextRendering/cpp-win32/DWriteCoreGallery.sln
@@ -9,21 +9,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWriteCoreGallery", "DWrite
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|ARM.ActiveCfg = Debug|ARM
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|ARM.Build.0 = Debug|ARM
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -36,9 +31,6 @@ Global
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|x86.ActiveCfg = Debug|x86
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|x86.Build.0 = Debug|x86
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|x86.Deploy.0 = Debug|x86
- {D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|Any CPU.Build.0 = Release|Any CPU
- {D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|Any CPU.Deploy.0 = Release|Any CPU
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|ARM.ActiveCfg = Release|ARM
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|ARM.Build.0 = Release|ARM
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|ARM.Deploy.0 = Release|ARM
@@ -51,14 +43,12 @@ Global
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|x86.ActiveCfg = Release|x86
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|x86.Build.0 = Release|x86
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|x86.Deploy.0 = Release|x86
- {D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|Any CPU.ActiveCfg = Debug|Win32
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|ARM.ActiveCfg = Debug|Win32
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|ARM64.ActiveCfg = Debug|Win32
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|x64.ActiveCfg = Debug|x64
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|x64.Build.0 = Debug|x64
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|x86.ActiveCfg = Debug|Win32
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|x86.Build.0 = Debug|Win32
- {D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Release|Any CPU.ActiveCfg = Release|Win32
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Release|ARM.ActiveCfg = Release|Win32
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Release|ARM64.ActiveCfg = Release|Win32
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Release|x64.ActiveCfg = Release|x64
diff --git a/Samples/TextRendering/cpp-win32/DWriteCoreGallery/DWriteCoreGallery.vcxproj b/Samples/TextRendering/cpp-win32/DWriteCoreGallery/DWriteCoreGallery.vcxproj
index 20a5d39ab..c614aa068 100644
--- a/Samples/TextRendering/cpp-win32/DWriteCoreGallery/DWriteCoreGallery.vcxproj
+++ b/Samples/TextRendering/cpp-win32/DWriteCoreGallery/DWriteCoreGallery.vcxproj
@@ -1,7 +1,7 @@
-
-
+
+
@@ -208,17 +208,17 @@
-
-
+
+
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}.
-
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/Samples/TextRendering/cpp-win32/DWriteCoreGallery/packages.config b/Samples/TextRendering/cpp-win32/DWriteCoreGallery/packages.config
index e2b82b1ef..2005c98b3 100644
--- a/Samples/TextRendering/cpp-win32/DWriteCoreGallery/packages.config
+++ b/Samples/TextRendering/cpp-win32/DWriteCoreGallery/packages.config
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
From 0d4fb929630569937cc5707cce2ef755d6448735 Mon Sep 17 00:00:00 2001
From: btueffers <82911735+btueffers@users.noreply.github.com>
Date: Tue, 16 Nov 2021 13:43:13 -0800
Subject: [PATCH 3/8] Windowing1.0GAupdate
---
.../SampleApp (Package).wapproj | 3 +--
.../cpp-winui/SampleApp/SampleApp.vcxproj | 16 ++++++++--------
.../cpp-winui/SampleApp/packages.config | 4 ++--
.../SampleApp (Package).wapproj | 4 ++--
.../cs-winui/SampleApp/SampleApp.csproj | 4 ++--
.../wpf_packaged_app (Package).wapproj | 4 ++--
.../wpf_packaged_app/wpf_packaged_app.csproj | 4 ++--
7 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/Samples/Windowing/cpp-winui/SampleApp (Package)/SampleApp (Package).wapproj b/Samples/Windowing/cpp-winui/SampleApp (Package)/SampleApp (Package).wapproj
index 468e1dd54..815f51460 100644
--- a/Samples/Windowing/cpp-winui/SampleApp (Package)/SampleApp (Package).wapproj
+++ b/Samples/Windowing/cpp-winui/SampleApp (Package)/SampleApp (Package).wapproj
@@ -58,7 +58,6 @@
-
@@ -67,7 +66,7 @@
-
+
\ No newline at end of file
diff --git a/Samples/Windowing/cpp-winui/SampleApp/SampleApp.vcxproj b/Samples/Windowing/cpp-winui/SampleApp/SampleApp.vcxproj
index b2315982c..7d5a3f706 100644
--- a/Samples/Windowing/cpp-winui/SampleApp/SampleApp.vcxproj
+++ b/Samples/Windowing/cpp-winui/SampleApp/SampleApp.vcxproj
@@ -1,7 +1,7 @@
-
-
+
+
@@ -191,8 +191,8 @@
-
-
+
+
@@ -200,9 +200,9 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/Samples/Windowing/cpp-winui/SampleApp/packages.config b/Samples/Windowing/cpp-winui/SampleApp/packages.config
index 5a5109b8f..c59f90ff4 100644
--- a/Samples/Windowing/cpp-winui/SampleApp/packages.config
+++ b/Samples/Windowing/cpp-winui/SampleApp/packages.config
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/Samples/Windowing/cs-winui/SampleApp (Package)/SampleApp (Package).wapproj b/Samples/Windowing/cs-winui/SampleApp (Package)/SampleApp (Package).wapproj
index 6cb598a8d..ce26df03c 100644
--- a/Samples/Windowing/cs-winui/SampleApp (Package)/SampleApp (Package).wapproj
+++ b/Samples/Windowing/cs-winui/SampleApp (Package)/SampleApp (Package).wapproj
@@ -67,8 +67,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj b/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj
index 6ca90d9c2..a3b4de80f 100644
--- a/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj
+++ b/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj
@@ -9,8 +9,8 @@
win10-x86;win10-x64;win10-arm64
-
-
+
+
\ No newline at end of file
diff --git a/Samples/Windowing/cs-wpf/wpf_packaged_app (Package)/wpf_packaged_app (Package).wapproj b/Samples/Windowing/cs-wpf/wpf_packaged_app (Package)/wpf_packaged_app (Package).wapproj
index 69e59e29d..28ebafabd 100644
--- a/Samples/Windowing/cs-wpf/wpf_packaged_app (Package)/wpf_packaged_app (Package).wapproj
+++ b/Samples/Windowing/cs-wpf/wpf_packaged_app (Package)/wpf_packaged_app (Package).wapproj
@@ -53,8 +53,8 @@
-
-
+
+
..\wpf_packaged_app\wpf_packaged_app.csproj
diff --git a/Samples/Windowing/cs-wpf/wpf_packaged_app/wpf_packaged_app.csproj b/Samples/Windowing/cs-wpf/wpf_packaged_app/wpf_packaged_app.csproj
index 2fdc263b2..b95aacbba 100644
--- a/Samples/Windowing/cs-wpf/wpf_packaged_app/wpf_packaged_app.csproj
+++ b/Samples/Windowing/cs-wpf/wpf_packaged_app/wpf_packaged_app.csproj
@@ -10,8 +10,8 @@
-
-
+
+
From a17f411997d1fc111513e542dd0bcb312c56b641 Mon Sep 17 00:00:00 2001
From: btueffers <82911735+btueffers@users.noreply.github.com>
Date: Tue, 16 Nov 2021 16:53:38 -0800
Subject: [PATCH 4/8] Unpackaged1.0GAupdate
---
Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.cpp | 2 +-
Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.vcxproj | 4 ++++
.../cpp-console-unpackaged/Unpackaged.vcxproj.filters | 4 ++--
Samples/Unpackaged/cpp-console-unpackaged/packages.config | 2 +-
Samples/Unpackaged/cs-console-unpackaged/Unpackaged.csproj | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.cpp b/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.cpp
index 9879a8b92..ec3f5d591 100644
--- a/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.cpp
+++ b/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.cpp
@@ -46,7 +46,7 @@ HRESULT ExplicitlyInitializeWinAppRuntime()
// Constants for dynamic dependencies lookup.
// Preview tag not needed for GA release, eg: versionTag{ L"" };
const UINT32 majorMinorVersion{ 0x00010000 };
- PCWSTR versionTag{ L"preview3" };
+ PCWSTR versionTag{ L"" };
// Initialize values for the call to the Dynamic Dependencies bootstrapper
const PACKAGE_VERSION minVersion{};
diff --git a/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.vcxproj b/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.vcxproj
index 4de054e3d..4e9bc58fa 100644
--- a/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.vcxproj
+++ b/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.vcxproj
@@ -1,5 +1,6 @@
+
@@ -221,6 +222,7 @@
+
@@ -233,5 +235,7 @@
+
+
\ No newline at end of file
diff --git a/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.vcxproj.filters b/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.vcxproj.filters
index 756ebaf94..8784d0180 100644
--- a/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.vcxproj.filters
+++ b/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.vcxproj.filters
@@ -15,7 +15,7 @@
-
+
Source Files
@@ -23,7 +23,7 @@
-
+
Header Files
diff --git a/Samples/Unpackaged/cpp-console-unpackaged/packages.config b/Samples/Unpackaged/cpp-console-unpackaged/packages.config
index 64b5b3e1c..4d5709d40 100644
--- a/Samples/Unpackaged/cpp-console-unpackaged/packages.config
+++ b/Samples/Unpackaged/cpp-console-unpackaged/packages.config
@@ -3,5 +3,5 @@
-
+
\ No newline at end of file
diff --git a/Samples/Unpackaged/cs-console-unpackaged/Unpackaged.csproj b/Samples/Unpackaged/cs-console-unpackaged/Unpackaged.csproj
index 06703f661..1b549aff8 100644
--- a/Samples/Unpackaged/cs-console-unpackaged/Unpackaged.csproj
+++ b/Samples/Unpackaged/cs-console-unpackaged/Unpackaged.csproj
@@ -13,7 +13,7 @@
-
+
From 48782f7b0f77196bc514749fe48c52f59cd6468e Mon Sep 17 00:00:00 2001
From: Angela Zhang
Date: Tue, 16 Nov 2021 17:14:36 -0800
Subject: [PATCH 5/8] Fix formatting
---
.../cs-winui/SampleApp/SampleApp.csproj | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj b/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj
index a3b4de80f..4f557e487 100644
--- a/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj
+++ b/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj
@@ -1,16 +1,16 @@
-
- WinExe
- net5.0-windows10.0.19041.0
- 10.0.17763.0
- SampleApp
- app.manifest
- x86;x64;arm64
- win10-x86;win10-x64;win10-arm64
-
-
-
-
-
-
+
+ WinExe
+ net5.0-windows10.0.19041.0
+ 10.0.17763.0
+ SampleApp
+ app.manifest
+ x86;x64;arm64
+ win10-x86;win10-x64;win10-arm64
+
+
+
+
+
+
\ No newline at end of file
From 8efd6aa419f0dd8c33e1c0ff95a612bd3c7e7903 Mon Sep 17 00:00:00 2001
From: btueffers <82911735+btueffers@users.noreply.github.com>
Date: Wed, 17 Nov 2021 13:16:17 -0800
Subject: [PATCH 6/8] ResolvingWindowingMergeConflict
---
.../SampleApp (Package).wapproj | 74 -------------------
.../cs-winui/SampleApp/SampleApp.csproj | 16 ----
2 files changed, 90 deletions(-)
delete mode 100644 Samples/Windowing/cs-winui/SampleApp (Package)/SampleApp (Package).wapproj
delete mode 100644 Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj
diff --git a/Samples/Windowing/cs-winui/SampleApp (Package)/SampleApp (Package).wapproj b/Samples/Windowing/cs-winui/SampleApp (Package)/SampleApp (Package).wapproj
deleted file mode 100644
index ce26df03c..000000000
--- a/Samples/Windowing/cs-winui/SampleApp (Package)/SampleApp (Package).wapproj
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
- 15.0
-
-
-
- Debug
- x86
-
-
- Release
- x86
-
-
- Debug
- x64
-
-
- Release
- x64
-
-
- Debug
- arm64
-
-
- Release
- arm64
-
-
-
- $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\
- SampleApp\
-
-
-
- b8310b24-3961-450b-9659-abd464be0b0d
- 10.0.19041.0
- 10.0.19041.0
- net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)
- en-US
- False
- ..\SampleApp\SampleApp.csproj
- 697B0A4425F6E61C280403E9B3F468E3E3C905A5
- SampleApp %28Package%29_TemporaryKey.pfx
-
-
-
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- True
- Properties\PublishProfiles\win10-$(Platform).pubxml
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj b/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj
deleted file mode 100644
index 4f557e487..000000000
--- a/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- WinExe
- net5.0-windows10.0.19041.0
- 10.0.17763.0
- SampleApp
- app.manifest
- x86;x64;arm64
- win10-x86;win10-x64;win10-arm64
-
-
-
-
-
-
-
\ No newline at end of file
From b54d44cbf9478f35532d6475127dbadc96810e00 Mon Sep 17 00:00:00 2001
From: btueffers <82911735+btueffers@users.noreply.github.com>
Date: Wed, 17 Nov 2021 14:08:29 -0800
Subject: [PATCH 7/8] reverting to commit
48782f7b0f77196bc514749fe48c52f59cd6468e
---
.../SampleApp (Package).wapproj | 74 +++++++++++++++++++
.../cs-winui/SampleApp/SampleApp.csproj | 16 ++++
2 files changed, 90 insertions(+)
create mode 100644 Samples/Windowing/cs-winui/SampleApp (Package)/SampleApp (Package).wapproj
create mode 100644 Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj
diff --git a/Samples/Windowing/cs-winui/SampleApp (Package)/SampleApp (Package).wapproj b/Samples/Windowing/cs-winui/SampleApp (Package)/SampleApp (Package).wapproj
new file mode 100644
index 000000000..ce26df03c
--- /dev/null
+++ b/Samples/Windowing/cs-winui/SampleApp (Package)/SampleApp (Package).wapproj
@@ -0,0 +1,74 @@
+
+
+
+ 15.0
+
+
+
+ Debug
+ x86
+
+
+ Release
+ x86
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+ Debug
+ arm64
+
+
+ Release
+ arm64
+
+
+
+ $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\
+ SampleApp\
+
+
+
+ b8310b24-3961-450b-9659-abd464be0b0d
+ 10.0.19041.0
+ 10.0.19041.0
+ net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)
+ en-US
+ False
+ ..\SampleApp\SampleApp.csproj
+ 697B0A4425F6E61C280403E9B3F468E3E3C905A5
+ SampleApp %28Package%29_TemporaryKey.pfx
+
+
+
+ Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ True
+ Properties\PublishProfiles\win10-$(Platform).pubxml
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj b/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj
new file mode 100644
index 000000000..4f557e487
--- /dev/null
+++ b/Samples/Windowing/cs-winui/SampleApp/SampleApp.csproj
@@ -0,0 +1,16 @@
+
+
+ WinExe
+ net5.0-windows10.0.19041.0
+ 10.0.17763.0
+ SampleApp
+ app.manifest
+ x86;x64;arm64
+ win10-x86;win10-x64;win10-arm64
+
+
+
+
+
+
+
\ No newline at end of file
From 95c72d02f704a91059e1ef35d852bd5224c8b5a1 Mon Sep 17 00:00:00 2001
From: btueffers <82911735+btueffers@users.noreply.github.com>
Date: Wed, 17 Nov 2021 14:20:00 -0800
Subject: [PATCH 8/8] DWriteCoreBuildToolsPackageUpdate
---
.../DWriteCoreGallery (packaging).wapproj | 2 +-
.../cpp-win32/DWriteCoreGallery/DWriteCoreGallery.vcxproj | 8 ++++----
.../cpp-win32/DWriteCoreGallery/packages.config | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Samples/TextRendering/cpp-win32/DWriteCoreGallery (packaging)/DWriteCoreGallery (packaging).wapproj b/Samples/TextRendering/cpp-win32/DWriteCoreGallery (packaging)/DWriteCoreGallery (packaging).wapproj
index 10a0ff4b2..48366ac20 100644
--- a/Samples/TextRendering/cpp-win32/DWriteCoreGallery (packaging)/DWriteCoreGallery (packaging).wapproj
+++ b/Samples/TextRendering/cpp-win32/DWriteCoreGallery (packaging)/DWriteCoreGallery (packaging).wapproj
@@ -67,7 +67,7 @@
-
+
diff --git a/Samples/TextRendering/cpp-win32/DWriteCoreGallery/DWriteCoreGallery.vcxproj b/Samples/TextRendering/cpp-win32/DWriteCoreGallery/DWriteCoreGallery.vcxproj
index c614aa068..4006ade5b 100644
--- a/Samples/TextRendering/cpp-win32/DWriteCoreGallery/DWriteCoreGallery.vcxproj
+++ b/Samples/TextRendering/cpp-win32/DWriteCoreGallery/DWriteCoreGallery.vcxproj
@@ -1,7 +1,7 @@
+
-
@@ -208,17 +208,17 @@
-
+
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}.
-
-
+
+
\ No newline at end of file
diff --git a/Samples/TextRendering/cpp-win32/DWriteCoreGallery/packages.config b/Samples/TextRendering/cpp-win32/DWriteCoreGallery/packages.config
index 2005c98b3..b49de0d0d 100644
--- a/Samples/TextRendering/cpp-win32/DWriteCoreGallery/packages.config
+++ b/Samples/TextRendering/cpp-win32/DWriteCoreGallery/packages.config
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file