Merge pull request #19 from umbraco-community/bugfix/readme-dotnet-pack

Attempt to fix Readme in dotnet pack
umbraco-community · Nov 19, 2021 · 620ddc8 · 620ddc8
2 parents 9104886 + a8a67bd
commit 620ddc8
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 17 deletions.
diff --git 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

diff --git 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: 5.0.x
+        dotnet-version: '6.0.x'
+        include-prerelease: true
 
     - name: Restore dependencies
       run: dotnet restore

diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net5.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -28,22 +28,31 @@
 		<RepositoryType>git</RepositoryType>
 		<PackageIcon>TagHelperLogo.png</PackageIcon>
 		<PackageTags>Umbraco;TagHelper;TagHelpers;UmbracoCMS</PackageTags>
+		<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="\" />
-  </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>