From 88ea3636540db70cf1ccedea250dfa4a6fce5bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Thu, 29 Sep 2022 11:51:06 -0400
Subject: [PATCH 1/2] docs: Add community tutorials page

---
 doc/articles/guides/community-tutorials.md          | 13 +++++++++++++
 doc/articles/toc.yml                                |  2 ++
 .../Content/Uno.UI.SourceGenerators.props           |  3 +++
 3 files changed, 18 insertions(+)
 create mode 100644 doc/articles/guides/community-tutorials.md

diff --git a/doc/articles/guides/community-tutorials.md b/doc/articles/guides/community-tutorials.md
new file mode 100644
index 000000000000..1400671a0293
--- /dev/null
+++ b/doc/articles/guides/community-tutorials.md
@@ -0,0 +1,13 @@
+## Community Tutorials
+
+This page lists links our community provided tutorials.
+
+> [!NOTE]
+> Please use this page to submit links to your blogs, tutorials and other Uno Platform advocacy as part of Hacktoberfest 2022.
+
+- [A Quick Look at Uno Platform Development](https://jamesmccaffrey.wordpress.com/2021/05/31/a-quick-look-at-uno-platform-development/), by James D. McCaffrey.
+- [Why I wrote (and you should buy) a book about Uno Platform when there are free resources available](https://www.mrlacey.com/2022/02/why-i-wrote-and-you-should-buy-book.html), by Matt Lacey
+- [Uno Platform Getting Started with New Projects](https://www.andrewhoefling.com/Blog/Post/uno-platform-getting-started-with-new-projects), by Skye Hoefling
+- [Uno Platform - Build a Todo App - Part 5](https://steven-giesel.com/blogPost/2c025ac6-d67f-45ec-a616-009e0285c999), by Steven Giesel
+- [Uno Platform on Surface Duo](https://devblogs.microsoft.com/surface-duo/tag/uno-platform/), by Craig Dunn
+- _Create a PR tp add yours here!_
\ No newline at end of file
diff --git a/doc/articles/toc.yml b/doc/articles/toc.yml
index 2333996b2d1a..7c9e1ab7ff98 100644
--- a/doc/articles/toc.yml
+++ b/doc/articles/toc.yml
@@ -105,6 +105,8 @@
               href: howto-use-uno-in-xamarin-forms.md
             - name: Samples
               topicHref: uno-samples.md
+            - name: Community Tutorials
+              topicHref: guides/community-tutorials.md
 
     - name: Development
       items:
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props b/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
index c9f2f9d70a8b..438c90c2ca9c 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
@@ -466,6 +466,8 @@
 			<Compile Include="$(IntermediateOutputPath)\uno.reload.cookie.g.cs" />
 		</ItemGroup>
 	</Target>
+<<<<<<< HEAD
+=======
 
 	<Target Name="_WPFIssue6792_RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile" Condition="'$(UnoUseWPFIssue6792Workaround)'=='true'">
 		<!-- Work around https://github.com/dotnet/wpf/issues/6792, remove for .NET 6.0.500 or later -->
@@ -476,4 +478,5 @@
 			<Analyzer Include="@(FilteredAnalyzer)" />
 		</ItemGroup>
 	</Target>
+>>>>>>> 7fd50ce18fbc5e65b2a49c0f4f777d984b1e9d20
 </Project>

From 5d6014dc0053872a1dd09cbcc81d75628cb38a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Thu, 29 Sep 2022 13:17:59 -0400
Subject: [PATCH 2/2] chore: Remove invalid change

---
 .../Content/Uno.UI.SourceGenerators.props                      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props b/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
index 438c90c2ca9c..c9f2f9d70a8b 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
@@ -466,8 +466,6 @@
 			<Compile Include="$(IntermediateOutputPath)\uno.reload.cookie.g.cs" />
 		</ItemGroup>
 	</Target>
-<<<<<<< HEAD
-=======
 
 	<Target Name="_WPFIssue6792_RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile" Condition="'$(UnoUseWPFIssue6792Workaround)'=='true'">
 		<!-- Work around https://github.com/dotnet/wpf/issues/6792, remove for .NET 6.0.500 or later -->
@@ -478,5 +476,4 @@
 			<Analyzer Include="@(FilteredAnalyzer)" />
 		</ItemGroup>
 	</Target>
->>>>>>> 7fd50ce18fbc5e65b2a49c0f4f777d984b1e9d20
 </Project>