-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: target .NET 6 only, move common settings to Directory.Build.props
BREAKING CHANGE: .NET 6 only
- Loading branch information
Showing
9 changed files
with
65 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
36 changes: 7 additions & 29 deletions
36
src/Sitko.Blockly.AntDesign/Sitko.Blockly.AntDesign.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
29 changes: 2 additions & 27 deletions
29
src/Sitko.Blockly.EntityFrameworkCore/Sitko.Blockly.EntityFrameworkCore.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
39 changes: 2 additions & 37 deletions
39
src/Sitko.Blockly.HtmlParser/Sitko.Blockly.HtmlParser.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
13 changes: 6 additions & 7 deletions
13
tests/Sitko.Blockly.HtmlParser.Tests/Sitko.Blockly.HtmlParser.Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |