Skip to content

Commit 45d071b

Browse files
JimBobSquarePantsJimBobSquarePants
authored
Merge pull request #92 from SixLabors/release/rc-1
Release RC1
2 parents 5e03a29 + 3361b74 commit 45d071b

File tree

90 files changed

+832
-753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+832
-753
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ csharp_space_between_square_brackets = false
339339
# warn when using var for built-in types,
340340
# warn when using var when the type is not apparent, and
341341
# warn when not using var when the type is apparent
342+
# warn when using simplified "using" declaration
342343
###############################################################################
343344
[*.cs]
344345
csharp_prefer_braces = true:silent
@@ -367,6 +368,6 @@ csharp_style_throw_expression = true:suggestion
367368
csharp_style_unused_value_expression_statement_preference = discard_variable:silent
368369
csharp_style_unused_value_assignment_preference = discard_variable:suggestion
369370

370-
csharp_style_var_for_built_in_types = false:warning
371-
csharp_style_var_elsewhere = false:warning
371+
csharp_style_var_for_built_in_types = never
372372
csharp_style_var_when_type_is_apparent = true:warning
373+
csharp_style_var_elsewhere = false:warning

‎.gitattributes‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,22 +96,23 @@
9696
*.gif binary
9797
*.jpg binary
9898
*.ktx binary
99+
*.otf binary
99100
*.pbm binary
100101
*.pdf binary
101102
*.png binary
102103
*.ppt binary
103104
*.pptx binary
104105
*.pvr binary
105-
*.ttf binary
106106
*.snk binary
107107
*.tga binary
108+
*.ttc binary
108109
*.ttf binary
110+
*.webp binary
109111
*.woff binary
110112
*.woff2 binary
111113
*.xls binary
112114
*.xlsx binary
113115

114-
115116
###############################################################################
116117
# Set explicit file behavior to:
117118
# diff as plain text

‎APACHE-2.0-LICENSE.txt‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎Directory.Build.props‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,32 +35,26 @@
3535
+===================+=======+==========+=====================+=============+=================+====================+==============+
3636
| netcoreapp3.1 | Y | Y | Y | Y | Y | Y | Y |
3737
| netcoreapp2.1 | Y | Y | Y | Y | Y | N | Y |
38-
| netcoreapp2.0 | Y | N | N | N | N | N | Y |
39-
| netstandard2.1 | Y | Y | N | Y | Y | N | Y |
40-
| netstandard2.0 | N | N | N | N | N | N | Y |
41-
| netstandard1.3 | N | N | N | N | N | N | N |
42-
| net472 | N | N | Y | N | N | N | Y |
4338
+===================+=======+==========+=====================+=============+=================+====================+==============+
4439
-->
4540

4641
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
47-
<DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_RUNTIME_INTRINSICS;SUPPORTS_CODECOVERAGE</DefineConstants>
42+
<DefineConstants>$(DefineConstants);SUPPORTS_MATHF</DefineConstants>
43+
<DefineConstants>$(DefineConstants);SUPPORTS_HASHCODE</DefineConstants>
44+
<DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>
45+
<DefineConstants>$(DefineConstants);SUPPORTS_SPAN_STREAM</DefineConstants>
46+
<DefineConstants>$(DefineConstants);SUPPORTS_ENCODING_STRING</DefineConstants>
47+
<DefineConstants>$(DefineConstants);SUPPORTS_RUNTIME_INTRINSICS</DefineConstants>
48+
<DefineConstants>$(DefineConstants);SUPPORTS_CODECOVERAGE</DefineConstants>
4849
</PropertyGroup>
4950
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
50-
<DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_CODECOVERAGE</DefineConstants>
51-
</PropertyGroup>
52-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
53-
<DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_CODECOVERAGE</DefineConstants>
54-
</PropertyGroup>
55-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
56-
<DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_CODECOVERAGE</DefineConstants>
57-
</PropertyGroup>
58-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
51+
<DefineConstants>$(DefineConstants);SUPPORTS_MATHF</DefineConstants>
52+
<DefineConstants>$(DefineConstants);SUPPORTS_HASHCODE</DefineConstants>
53+
<DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>
54+
<DefineConstants>$(DefineConstants);SUPPORTS_SPAN_STREAM</DefineConstants>
55+
<DefineConstants>$(DefineConstants);SUPPORTS_ENCODING_STRING</DefineConstants>
5956
<DefineConstants>$(DefineConstants);SUPPORTS_CODECOVERAGE</DefineConstants>
6057
</PropertyGroup>
61-
<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
62-
<DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_CODECOVERAGE</DefineConstants>
63-
</PropertyGroup>
6458

6559
<!-- Default settings that explicitly differ from the Sdk.targets defaults-->
6660
<PropertyGroup>
@@ -75,33 +69,35 @@
7569

7670
<!-- Default settings that are otherwise undefined -->
7771
<PropertyGroup>
78-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)shared-infrastructure/SixLabors.snk</AssemblyOriginatorKeyFile>
79-
<Copyright>Copyright © Six Labors and Contributors</Copyright>
72+
<Copyright>Copyright © Six Labors</Copyright>
8073
<Features>strict;IOperation</Features>
8174
<HighEntropyVA>true</HighEntropyVA>
8275
<LangVersion>8.0</LangVersion>
8376
<NeutralLanguage>en</NeutralLanguage>
8477
<OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>
85-
<PackageIcon>icon.png</PackageIcon>
86-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
78+
<PackageIcon>sixlabors.imagesharp.web.128.png</PackageIcon>
79+
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
8780
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
8881
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
8982
<RepositoryType>git</RepositoryType>
9083
<RestoreSources>
9184
https://www.myget.org/F/sixlabors/api/v3/index.json;
9285
https://api.nuget.org/v3/index.json;
9386
</RestoreSources>
94-
<SixLaborsPublicKey>002400000c8000009400000006020000002400005253413100040000010001000147e6fe6766715eec6cfed61f1e7dcdbf69748a3e355c67e9d8dfd953acab1d5e012ba34b23308166fdc61ee1d0390d5f36d814a6091dd4b5ed9eda5a26afced924c683b4bfb4b3d64b0586a57eff9f02b1f84e3cb0ddd518bd1697f2c84dcbb97eb8bb5c7801be12112ed0ec86db934b0e9a5171e6bb1384b6d2f7d54dfa97</SixLaborsPublicKey>
87+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)shared-infrastructure/SixLabors.snk</AssemblyOriginatorKeyFile>
88+
<SixLaborsPublicKey>00240000048000009400000006020000002400005253413100040000010001000147e6fe6766715eec6cfed61f1e7dcdbf69748a3e355c67e9d8dfd953acab1d5e012ba34b23308166fdc61ee1d0390d5f36d814a6091dd4b5ed9eda5a26afced924c683b4bfb4b3d64b0586a57eff9f02b1f84e3cb0ddd518bd1697f2c84dcbb97eb8bb5c7801be12112ed0ec86db934b0e9a5171e6bb1384b6d2f7d54dfa97</SixLaborsPublicKey>
9589
<UseSharedCompilation>true</UseSharedCompilation>
90+
<SignAssembly>true</SignAssembly>
9691
</PropertyGroup>
9792

9893
<!-- Package references and additional files which are consumed by all projects -->
9994
<ItemGroup>
100-
<PackageReference Include="Microsoft.Net.Compilers.Toolset" IsImplicitlyDefined="true" />
95+
<PackageReference Include="Microsoft.Net.Compilers.Toolset" IsImplicitlyDefined="true" PrivateAssets="All"/>
10196
<PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true" />
10297
<AdditionalFiles Include="$(MSBuildThisFileDirectory)shared-infrastructure\stylecop.json" />
10398
<!--NuGet package icon source-->
104-
<None Include="$(MSBuildThisFileDirectory)shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="\icon.png" />
99+
<None Include="$(MSBuildThisFileDirectory)shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
100+
<None Include="$(MSBuildThisFileDirectory)shared-infrastructure\NUGETLICENSE.md" Pack="true" PackagePath="LICENSE.md" />
105101
</ItemGroup>
106102

107103
</Project>

‎Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
2323

2424
<!--Src Dependencies-->
25-
<PackageReference Update="SixLabors.ImageSharp" Version="1.0.0-unstable0961" />
25+
<PackageReference Update="SixLabors.ImageSharp" Version="1.0.0-rc0001" />
2626
<PackageReference Update="Azure.Storage.Blobs" Version="12.4.0" />
2727
</ItemGroup>
2828

‎ImageSharp.Web.sln‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{B815
4444
.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
4545
EndProjectSection
4646
EndProject
47+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedInfrastructure", "shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.shproj", "{68A8CC40-6AED-4E96-B524-31B1158FDEEA}"
48+
EndProject
4749
Global
4850
GlobalSection(SharedMSBuildProjectFiles) = preSolution
4951
shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{2f1b36e2-5d92-4442-b816-d2a978246435}*SharedItemsImports = 5
52+
shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{68a8cc40-6aed-4e96-b524-31b1158fdeea}*SharedItemsImports = 13
5053
shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{e2a545ec-b909-4ead-b95f-397f68588be3}*SharedItemsImports = 5
5154
EndGlobalSection
5255
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -116,6 +119,7 @@ Global
116119
{0B15E490-7821-42DF-86A5-4DEAE921DE59} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
117120
{E2A545EC-B909-4EAD-B95F-397F68588BE3} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
118121
{B8152C86-B657-4967-B297-42F89A10D23A} = {C317F1B1-D75E-4C6D-83EB-80367343E0D7}
122+
{68A8CC40-6AED-4E96-B524-31B1158FDEEA} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
119123
EndGlobalSection
120124
GlobalSection(ExtensibilityGlobals) = postSolution
121125
SolutionGuid = {C5B38B65-A19E-4359-859C-5B2205429BD1}

0 commit comments

Comments
 (0)