From d1ee2d0a0884d2f39d30a61a1f1bd4bfaba71f27 Mon Sep 17 00:00:00 2001
From: George Drak <sonicgd@gmail.com>
Date: Thu, 13 Jan 2022 10:52:56 +0500
Subject: [PATCH] feat: target .NET 6 only, move common settings to
 Directory.Build.props

BREAKING CHANGE: .NET 6 only
---
 Sitko.Blockly.sln                             |  3 ++
 src/Directory.Build.props                     | 30 ++++++++++++++
 .../Sitko.Blockly.AntDesign.csproj            | 36 ++++-------------
 .../Sitko.Blockly.Blazor.csproj               | 37 +++---------------
 .../Sitko.Blockly.EntityFrameworkCore.csproj  | 29 +-------------
 .../Sitko.Blockly.HtmlParser.csproj           | 39 +------------------
 src/Sitko.Blockly/Sitko.Blockly.csproj        | 32 ++-------------
 .../Sitko.Blockly.HtmlParser.Tests.csproj     | 13 +++----
 .../Sitko.Blockly.Tests.csproj                | 13 +++----
 9 files changed, 65 insertions(+), 167 deletions(-)
 create mode 100644 src/Directory.Build.props

diff --git a/Sitko.Blockly.sln b/Sitko.Blockly.sln
index 7110eea..284c1b8 100644
--- a/Sitko.Blockly.sln
+++ b/Sitko.Blockly.sln
@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 16.6.30114.105
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DA312F56-FDB4-4853-A7A1-A8B2527399FC}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitko.Blockly", "src\Sitko.Blockly\Sitko.Blockly.csproj", "{0367FAD9-C3FD-4E07-9CBE-103A17666A1D}"
 EndProject
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 0000000..c083b4b
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,30 @@
+<Project>
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
+    <!--<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>-->
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <Authors>George Drak</Authors>
+    <Company>Sitko.Ru</Company>
+    <Product>Sitko.Blockly</Product>
+    <Description>Sitko.Blockly is a library for building structured content editors</Description>
+    <Summary>Sitko.Blockly is a library for building structured content editors</Summary>
+    <Copyright>Copyright © Sitko.ru 2020 - 2022</Copyright>
+    <RepositoryUrl>https://github.com/sitkoru/Sitko.Blockly</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/sitkoru/Sitko.Blockly</PackageProjectUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md"/>
+    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+</Project>
diff --git a/src/Sitko.Blockly.AntDesign/Sitko.Blockly.AntDesign.csproj b/src/Sitko.Blockly.AntDesign/Sitko.Blockly.AntDesign.csproj
index 222fa48..c91681a 100644
--- a/src/Sitko.Blockly.AntDesign/Sitko.Blockly.AntDesign.csproj
+++ b/src/Sitko.Blockly.AntDesign/Sitko.Blockly.AntDesign.csproj
@@ -1,45 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Authors>George Drak</Authors>
-    <Company>Sitko.Ru</Company>
-    <Product>Sitko.Blockly</Product>
-    <Description>Sitko.Blockly is a library for building structured content editors</Description>
-    <Summary>Sitko.Blockly is a library for building structured content editors</Summary>
-    <Copyright>Copyright © Sitko.ru 2021</Copyright>
-    <RepositoryUrl>https://github.com/sitkoru/Sitko.Blockly</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/sitkoru/Sitko.Blockly</PackageProjectUrl>
-    <PackageIcon>packageIcon.png</PackageIcon>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <RootNamespace>Sitko.Blockly.AntDesignComponents</RootNamespace>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Sitko.Blockly.Blazor\Sitko.Blockly.Blazor.csproj" />
-    <ProjectReference Include="..\Sitko.Blockly\Sitko.Blockly.csproj" />
+    <ProjectReference Include="..\Sitko.Blockly.Blazor\Sitko.Blockly.Blazor.csproj"/>
+    <ProjectReference Include="..\Sitko.Blockly\Sitko.Blockly.csproj"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Sitko.Blazor.CKEditor.Bundle" Version="3.0.3" />
-    <PackageReference Include="Sitko.Core.Blazor.AntDesign" Version="8.36.1" />
+    <PackageReference Include="Sitko.Blazor.CKEditor.Bundle" Version="3.0.3"/>
+    <PackageReference Include="Sitko.Core.Blazor.AntDesign" Version="8.36.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
-    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Remove="Icons\*.svg" />
-    <EmbeddedResource Include="Icons\*.svg" />
-    <EmbeddedResource Include="Resources\*.json" />
+    <Content Remove="Icons\*.svg"/>
+    <EmbeddedResource Include="Icons\*.svg"/>
+    <EmbeddedResource Include="Resources\*.json"/>
   </ItemGroup>
 </Project>
diff --git a/src/Sitko.Blockly.Blazor/Sitko.Blockly.Blazor.csproj b/src/Sitko.Blockly.Blazor/Sitko.Blockly.Blazor.csproj
index dee8d8c..2893dfd 100644
--- a/src/Sitko.Blockly.Blazor/Sitko.Blockly.Blazor.csproj
+++ b/src/Sitko.Blockly.Blazor/Sitko.Blockly.Blazor.csproj
@@ -1,37 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Authors>George Drak</Authors>
-    <Company>Sitko.Ru</Company>
-    <Product>Sitko.Blockly</Product>
-    <Description>Sitko.Blockly is a library for building structured content editors</Description>
-    <Summary>Sitko.Blockly is a library for building structured content editors</Summary>
-    <Copyright>Copyright © Sitko.ru 2021</Copyright>
-    <RepositoryUrl>https://github.com/sitkoru/Sitko.Blockly</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/sitkoru/Sitko.Blockly</PackageProjectUrl>
-    <PackageIcon>packageIcon.png</PackageIcon>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Sitko.Blockly\Sitko.Blockly.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="Sitko.Core.App.Blazor" Version="8.36.1" />
-      <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-      <PackageReference Include="Sitko.Core.Blazor.FileUpload" Version="8.36.1" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Sitko.Blockly\Sitko.Blockly.csproj"/>
+  </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
-    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\" />
+    <PackageReference Include="Sitko.Core.App.Blazor" Version="8.36.1"/>
+    <PackageReference Include="Sitko.Core.Blazor.FileUpload" Version="8.36.1"/>
   </ItemGroup>
+
 </Project>
diff --git a/src/Sitko.Blockly.EntityFrameworkCore/Sitko.Blockly.EntityFrameworkCore.csproj b/src/Sitko.Blockly.EntityFrameworkCore/Sitko.Blockly.EntityFrameworkCore.csproj
index 0489efe..030954b 100644
--- a/src/Sitko.Blockly.EntityFrameworkCore/Sitko.Blockly.EntityFrameworkCore.csproj
+++ b/src/Sitko.Blockly.EntityFrameworkCore/Sitko.Blockly.EntityFrameworkCore.csproj
@@ -1,36 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Authors>George Drak</Authors>
-    <Company>Sitko.Ru</Company>
-    <Product>Sitko.Blockly</Product>
-    <Description>Sitko.Blockly is a library for building structured content editors</Description>
-    <Summary>Sitko.Blockly is a library for building structured content editors</Summary>
-    <Copyright>Copyright © Sitko.ru 2021</Copyright>
-    <RepositoryUrl>https://github.com/sitkoru/Sitko.Blockly</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/sitkoru/Sitko.Blockly</PackageProjectUrl>
-    <PackageIcon>packageIcon.png</PackageIcon>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-
   <ItemGroup>
-    <ProjectReference Include="..\Sitko.Blockly\Sitko.Blockly.csproj" />
+    <ProjectReference Include="..\Sitko.Blockly\Sitko.Blockly.csproj"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Sitko.Core.Db.Postgres" Version="8.36.1" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Sitko.Core.Db.Postgres" Version="8.36.1"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
-    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
 </Project>
diff --git a/src/Sitko.Blockly.HtmlParser/Sitko.Blockly.HtmlParser.csproj b/src/Sitko.Blockly.HtmlParser/Sitko.Blockly.HtmlParser.csproj
index a3d1c6d..7c01a67 100644
--- a/src/Sitko.Blockly.HtmlParser/Sitko.Blockly.HtmlParser.csproj
+++ b/src/Sitko.Blockly.HtmlParser/Sitko.Blockly.HtmlParser.csproj
@@ -1,46 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Authors>George Drak</Authors>
-    <Company>Sitko.Ru</Company>
-    <Product>Sitko.Blockly</Product>
-    <Description>Sitko.Blockly is a library for building structured content editors</Description>
-    <Summary>Sitko.Blockly is a library for building structured content editors</Summary>
-    <Copyright>Copyright © Sitko.ru 2021</Copyright>
-    <RepositoryUrl>https://github.com/sitkoru/Sitko.Blockly</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/sitkoru/Sitko.Blockly</PackageProjectUrl>
-    <PackageIcon>packageIcon.png</PackageIcon>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.37" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.37"/>
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
-    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\" />
+    <ProjectReference Include="..\Sitko.Blockly\Sitko.Blockly.csproj"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Sitko.Blockly\Sitko.Blockly.csproj" />
-  </ItemGroup>
-  <!-- Workaround for .NET 6 Preview 7 (https://devblogs.microsoft.com/dotnet/announcing-net-6-preview-7/#comment-9902)-->
-  <PropertyGroup>
-    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
-  </PropertyGroup>
-  <!-- Workaround for this bug (https://github.com/dotnet/sdk/issues/18148) (replace the analyzer name with the one you need to exclude (filename only, no extension) -->
-  <Target Name="RemoveLoggingAnalyzer" AfterTargets="ResolveLockFileAnalyzers">
-    <ItemGroup>
-      <Analyzer Remove="@(Analyzer)" Condition="%(FileName) == 'System.Text.Json.SourceGeneration'" />
-      <Analyzer Remove="@(Analyzer)" Condition="%(FileName) == 'Microsoft.Extensions.Logging.Generators'" />
-    </ItemGroup>
-  </Target>
 </Project>
diff --git a/src/Sitko.Blockly/Sitko.Blockly.csproj b/src/Sitko.Blockly/Sitko.Blockly.csproj
index 853ac9e..35443c0 100644
--- a/src/Sitko.Blockly/Sitko.Blockly.csproj
+++ b/src/Sitko.Blockly/Sitko.Blockly.csproj
@@ -1,36 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Authors>George Drak</Authors>
-    <Company>Sitko.Ru</Company>
-    <Product>Sitko.Blockly</Product>
-    <Description>Sitko.Blockly is a library for building structured content editors</Description>
-    <Summary>Sitko.Blockly is a library for building structured content editors</Summary>
-    <Copyright>Copyright © Sitko.ru 2021</Copyright>
-    <RepositoryUrl>https://github.com/sitkoru/Sitko.Blockly</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/sitkoru/Sitko.Blockly</PackageProjectUrl>
-    <PackageIcon>packageIcon.png</PackageIcon>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Sitko.Core.App.Web" Version="8.36.1" />
-    <PackageReference Include="Sitko.Core.Storage" Version="8.36.1" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Sitko.Core.App.Web" Version="8.36.1"/>
+    <PackageReference Include="Sitko.Core.Storage" Version="8.36.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
-    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources/*.json" />
+    <EmbeddedResource Include="Resources/*.json"/>
   </ItemGroup>
 </Project>
diff --git a/tests/Sitko.Blockly.HtmlParser.Tests/Sitko.Blockly.HtmlParser.Tests.csproj b/tests/Sitko.Blockly.HtmlParser.Tests/Sitko.Blockly.HtmlParser.Tests.csproj
index 9a57292..bf171e5 100644
--- a/tests/Sitko.Blockly.HtmlParser.Tests/Sitko.Blockly.HtmlParser.Tests.csproj
+++ b/tests/Sitko.Blockly.HtmlParser.Tests/Sitko.Blockly.HtmlParser.Tests.csproj
@@ -1,22 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
-    <UserSecretsId>test</UserSecretsId>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Sitko.Blockly.HtmlParser\Sitko.Blockly.HtmlParser.csproj" />
-    <ProjectReference Include="..\Sitko.Blockly.Tests\Sitko.Blockly.Tests.csproj" />
+    <ProjectReference Include="..\..\src\Sitko.Blockly.HtmlParser\Sitko.Blockly.HtmlParser.csproj"/>
+    <ProjectReference Include="..\Sitko.Blockly.Tests\Sitko.Blockly.Tests.csproj"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Sitko.Core.Repository.EntityFrameworkCore" Version="8.36.1" />
-    <PackageReference Include="Sitko.Core.Xunit" Version="8.36.1" />
-    <PackageReference Include="Sitko.Core.Storage.FileSystem" Version="8.36.1" />
+    <PackageReference Include="Sitko.Core.Repository.EntityFrameworkCore" Version="8.36.1"/>
+    <PackageReference Include="Sitko.Core.Xunit" Version="8.36.1"/>
+    <PackageReference Include="Sitko.Core.Storage.FileSystem" Version="8.36.1"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Sitko.Blockly.Tests/Sitko.Blockly.Tests.csproj b/tests/Sitko.Blockly.Tests/Sitko.Blockly.Tests.csproj
index 811565b..e227668 100644
--- a/tests/Sitko.Blockly.Tests/Sitko.Blockly.Tests.csproj
+++ b/tests/Sitko.Blockly.Tests/Sitko.Blockly.Tests.csproj
@@ -1,21 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
-    <UserSecretsId>test</UserSecretsId>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Sitko.Blockly.AntDesign\Sitko.Blockly.AntDesign.csproj" />
-    <ProjectReference Include="..\..\src\Sitko.Blockly.EntityFrameworkCore\Sitko.Blockly.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Sitko.Blockly\Sitko.Blockly.csproj" />
+    <ProjectReference Include="..\..\src\Sitko.Blockly.AntDesign\Sitko.Blockly.AntDesign.csproj"/>
+    <ProjectReference Include="..\..\src\Sitko.Blockly.EntityFrameworkCore\Sitko.Blockly.EntityFrameworkCore.csproj"/>
+    <ProjectReference Include="..\..\src\Sitko.Blockly\Sitko.Blockly.csproj"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Sitko.Core.Repository.EntityFrameworkCore" Version="8.36.1" />
-    <PackageReference Include="Sitko.Core.Xunit" Version="8.36.1" />
+    <PackageReference Include="Sitko.Core.Repository.EntityFrameworkCore" Version="8.36.1"/>
+    <PackageReference Include="Sitko.Core.Xunit" Version="8.36.1"/>
   </ItemGroup>
 </Project>