Skip to content

Commit 551d5f3

Browse files
JimBobSquarePantsJimBobSquarePants
authored
Update dependencies + fix stylecop (SixLabors#816)
1 parent 163c502 commit 551d5f3

File tree

3 files changed

+56
-49
lines changed

3 files changed

+56
-49
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
path = tests/Images/External
33
url = https://github.com/SixLabors/Imagesharp.Tests.Images.git
44
branch = master
5+
[submodule "standards"]
6+
path = standards
7+
url = https://github.com/SixLabors/Standards

‎ImageSharp.sln‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.26730.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
77
ProjectSection(SolutionItems) = preProject
8-
.editorconfig = .editorconfig
8+
standards\.editorconfig = standards\.editorconfig
99
.travis.yml = .travis.yml
1010
appveyor.yml = appveyor.yml
1111
.github\ISSUE_TEMPLATE\ask-question.md = .github\ISSUE_TEMPLATE\ask-question.md
@@ -15,12 +15,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
1515
.github\CONTRIBUTING.md = .github\CONTRIBUTING.md
1616
.github\ISSUE_TEMPLATE\feature-request.md = .github\ISSUE_TEMPLATE\feature-request.md
1717
features.md = features.md
18-
ImageSharp.ruleset = ImageSharp.ruleset
1918
ImageSharp.sln.DotSettings = ImageSharp.sln.DotSettings
2019
NuGet.config = NuGet.config
2120
.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
2221
README.md = README.md
2322
run-tests.ps1 = run-tests.ps1
23+
standards\SixLabors.ruleset = standards\SixLabors.ruleset
24+
standards\stylecop.json = standards\stylecop.json
2425
EndProjectSection
2526
EndProject
2627
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{815C0625-CD3D-440F-9F80-2D83856AB7AE}"

‎src/ImageSharp.Drawing/ImageSharp.Drawing.csproj‎

Lines changed: 50 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,53 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<AssemblyTitle>SixLabors.ImageSharp.Drawing</AssemblyTitle>
4-
<Authors>SixLabors and contributors</Authors>
5-
<Company>Six Labors</Company>
6-
<Copyright>Copyright (c) Six Labors and contributors.</Copyright>
7-
<Product>SixLabors.ImageSharp</Product>
8-
<Description>An extension to ImageSharp that allows the drawing of images, paths, and text.</Description>
9-
<NeutralLanguage>en</NeutralLanguage>
2+
<PropertyGroup>
3+
<AssemblyTitle>SixLabors.ImageSharp.Drawing</AssemblyTitle>
4+
<Authors>SixLabors and contributors</Authors>
5+
<Company>Six Labors</Company>
6+
<Copyright>Copyright (c) Six Labors and contributors.</Copyright>
7+
<Product>SixLabors.ImageSharp</Product>
8+
<Description>An extension to ImageSharp that allows the drawing of images, paths, and text.</Description>
9+
<NeutralLanguage>en</NeutralLanguage>
1010

11-
<VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
12-
<VersionPrefix Condition="$(packageversion) == ''">0.0.1</VersionPrefix>
13-
<TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
14-
<LangVersion>7.3</LangVersion>
15-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
16-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
17-
<AssemblyName>SixLabors.ImageSharp.Drawing</AssemblyName>
18-
<PackageId>SixLabors.ImageSharp.Drawing</PackageId>
19-
<PackageTags>Image Draw Shape Path Font</PackageTags>
20-
<PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/imagesharp/sixlabors.imagesharp.128.png</PackageIconUrl>
21-
<PackageProjectUrl>https://github.com/SixLabors/ImageSharp</PackageProjectUrl>
22-
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
23-
<RepositoryType>git</RepositoryType>
24-
<RepositoryUrl>https://github.com/SixLabors/ImageSharp</RepositoryUrl>
25-
<DebugType Condition="$(codecov) != ''">full</DebugType>
26-
<DebugType Condition="$(codecov) == ''">portable</DebugType>
27-
<DebugSymbols>True</DebugSymbols>
28-
</PropertyGroup>
29-
<ItemGroup>
30-
<Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
31-
</ItemGroup>
32-
<ItemGroup>
33-
<ProjectReference Include="..\ImageSharp\ImageSharp.csproj" />
34-
</ItemGroup>
35-
<ItemGroup>
36-
<AdditionalFiles Include="..\..\stylecop.json" />
37-
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-dev000119" />
38-
<PackageReference Include="SixLabors.Shapes" Version="1.0.0-dev000102" />
39-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta007">
40-
<PrivateAssets>All</PrivateAssets>
41-
</PackageReference>
42-
</ItemGroup>
43-
<PropertyGroup>
44-
<CodeAnalysisRuleSet>..\..\ImageSharp.ruleset</CodeAnalysisRuleSet>
45-
<RootNamespace>SixLabors.ImageSharp</RootNamespace>
46-
</PropertyGroup>
47-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
48-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
49-
</PropertyGroup>
11+
<VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
12+
<VersionPrefix Condition="$(packageversion) == ''">0.0.1</VersionPrefix>
13+
<TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
14+
<LangVersion>7.3</LangVersion>
15+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
16+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
17+
<AssemblyName>SixLabors.ImageSharp.Drawing</AssemblyName>
18+
<PackageId>SixLabors.ImageSharp.Drawing</PackageId>
19+
<PackageTags>Image Draw Shape Path Font</PackageTags>
20+
<PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/imagesharp/sixlabors.imagesharp.128.png</PackageIconUrl>
21+
<PackageProjectUrl>https://github.com/SixLabors/ImageSharp</PackageProjectUrl>
22+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
23+
<RepositoryType>git</RepositoryType>
24+
<RepositoryUrl>https://github.com/SixLabors/ImageSharp</RepositoryUrl>
25+
<DebugType Condition="$(codecov) != ''">full</DebugType>
26+
<DebugType Condition="$(codecov) == ''">portable</DebugType>
27+
<DebugSymbols>True</DebugSymbols>
28+
</PropertyGroup>
29+
30+
<ItemGroup>
31+
<Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
32+
</ItemGroup>
33+
34+
<ItemGroup>
35+
<ProjectReference Include="..\ImageSharp\ImageSharp.csproj" />
36+
</ItemGroup>
37+
38+
<ItemGroup>
39+
<AdditionalFiles Include="..\..\standards\stylecop.json" />
40+
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0008" />
41+
<PackageReference Include="SixLabors.Shapes" Version="1.0.0-beta0008" />
42+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61" PrivateAssets="All" />
43+
</ItemGroup>
44+
45+
<PropertyGroup>
46+
<CodeAnalysisRuleSet>..\..\standards\SixLabors.ruleset</CodeAnalysisRuleSet>
47+
<RootNamespace>SixLabors.ImageSharp</RootNamespace>
48+
</PropertyGroup>
49+
50+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
51+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
52+
</PropertyGroup>
5053
</Project>

0 commit comments

Comments
 (0)