From ad143538107e230642d44ac44357d4f9033eaba8 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 28 Oct 2021 09:49:54 +0100
Subject: [PATCH 1/7] See if this makes CodeSpaces happier maybe wrong path
 structure for LINUX

---
 Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj b/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj
index e4a908b..55823c2 100644
--- a/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj
+++ b/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj
@@ -45,7 +45,7 @@
 
   <ItemGroup>
 	<None Include="TagHelperLogo.png" Pack="true" PackagePath="\"/>
-	<None Include="..\README.md" Pack="true" PackagePath="\"/>
+	<None Include="../README.md" Pack="true" PackagePath="\"/>
   </ItemGroup>
 
 </Project>

From 0ac90455f4c2a967599689e89859d9205c6d19e7 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 28 Oct 2021 10:06:12 +0100
Subject: [PATCH 2/7] Lets try this syntax

---
 Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj b/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj
index 55823c2..0de6347 100644
--- a/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj
+++ b/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj
@@ -44,8 +44,11 @@
   </ItemGroup>
 
   <ItemGroup>
-	<None Include="TagHelperLogo.png" Pack="true" PackagePath="\"/>
-	<None Include="../README.md" Pack="true" PackagePath="\"/>
+	<None Include="TagHelperLogo.png" Pack="true" PackagePath="\" />
+	<None Include="../README.md">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
   </ItemGroup>
 
 </Project>

From 7688578752fa9dba72cffeceff4662a5c221c8ac Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 28 Oct 2021 10:09:06 +0100
Subject: [PATCH 3/7] Try with dotnet SDK 6.0.x

---
 .github/workflows/dotnet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 97b5594..c563a50 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
         
     - name: Restore dependencies
       run: dotnet restore

From 2638309ba0270685e5335f2cb8a7a86ed0867028 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 28 Oct 2021 10:10:48 +0100
Subject: [PATCH 4/7] Need correct syntax to use .NET 6 SDK

---
 .github/workflows/dotnet.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index c563a50..2c07b4f 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -24,7 +24,8 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: '6.0.x'
+        include-prerelease: true
         
     - name: Restore dependencies
       run: dotnet restore

From 33080677a53cec0ad936a5d800e8833a81dfe80a Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 19 Nov 2021 08:49:03 +0000
Subject: [PATCH 5/7] Using the same approach as MS Example Video

---
 .../Our.Umbraco.TagHelpers.csproj             | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj b/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj
index 908bfa8..f016f1d 100644
--- a/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj
+++ b/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj
@@ -31,24 +31,28 @@
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="5.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.2.0" />
-    <PackageReference Include="Stubble.Core" Version="1.9.3" />
-    <PackageReference Include="Umbraco.Cms.Core" Version="9.0.1" />
-    <PackageReference Include="Umbraco.Cms.Web.Common" Version="9.0.1" />
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="5.0.11" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.2.0" />
+		<PackageReference Include="Stubble.Core" Version="1.9.3" />
+		<PackageReference Include="Umbraco.Cms.Core" Version="9.0.1" />
+		<PackageReference Include="Umbraco.Cms.Web.Common" Version="9.0.1" />
 	  
-	<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-	<PackageReference Include="GitVersion.MsBuild" Version="5.6.10*" PrivateAssets="All" />
-  </ItemGroup>
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+		<PackageReference Include="GitVersion.MsBuild" Version="5.6.10*" PrivateAssets="All" />
+	</ItemGroup>
 
-  <ItemGroup>
-	<None Include="TagHelperLogo.png" Pack="true" PackagePath="\" />
-	<None Include="..\README.md" Pack="true" PackagePath="\"/>
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<!-- Include files in package -->
+		<None Include="TagHelperLogo.png">
+			<Pack>True</Pack>
+			<PackagePath>\</PackagePath>
+		</None>
+		<None Include="..\README.md">
+			<Pack>True</Pack>
+			<PackagePath>\</PackagePath>
+		</None>
+	</ItemGroup>
 
 </Project>

From 6bfa3fbf199914f4ace4720420f4d8255b99a56f Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 19 Nov 2021 08:52:56 +0000
Subject: [PATCH 6/7] Updated all .NET6

---
 .../Our.Umbraco.TagHelpers.Playground.csproj                    | 2 +-
 .../Our.Umbraco.TagHelpers.Tests.csproj                         | 2 +-
 Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Our.Umbraco.TagHelpers.Playground/Our.Umbraco.TagHelpers.Playground.csproj b/Our.Umbraco.TagHelpers.Playground/Our.Umbraco.TagHelpers.Playground.csproj
index fedfb7d..3bd7364 100644
--- a/Our.Umbraco.TagHelpers.Playground/Our.Umbraco.TagHelpers.Playground.csproj
+++ b/Our.Umbraco.TagHelpers.Playground/Our.Umbraco.TagHelpers.Playground.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <DefaultItemExcludes>$(DefaultItemExcludes);App_Plugins/**;</DefaultItemExcludes>
         <DefaultItemExcludes>$(DefaultItemExcludes);umbraco/**;</DefaultItemExcludes>
         <DefaultItemExcludes>$(DefaultItemExcludes);wwwroot/media/**;</DefaultItemExcludes>
diff --git a/Our.Umbraco.TagHelpers.Tests/Our.Umbraco.TagHelpers.Tests.csproj b/Our.Umbraco.TagHelpers.Tests/Our.Umbraco.TagHelpers.Tests.csproj
index afd719e..73f37a8 100644
--- a/Our.Umbraco.TagHelpers.Tests/Our.Umbraco.TagHelpers.Tests.csproj
+++ b/Our.Umbraco.TagHelpers.Tests/Our.Umbraco.TagHelpers.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj b/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj
index f016f1d..c888533 100644
--- a/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj
+++ b/Our.Umbraco.TagHelpers/Our.Umbraco.TagHelpers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net5.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 	</PropertyGroup>
 
 	<PropertyGroup>

From a8a67bd9db7dd5d7d7567456eff0831b4e71e902 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 19 Nov 2021 09:02:18 +0000
Subject: [PATCH 7/7] Try to fix codeql autobuild

---
 .github/workflows/codeql-analysis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b1fc3ea..c767278 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -43,6 +43,12 @@ jobs:
       with:
         fetch-depth: 0
 
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1