Skip to content

Commit d6135cf

Browse files
JimBobSquarePantsJimBobSquarePants
committed
Update dependencies and license.
1 parent 6ad5ef5 commit d6135cf

File tree

82 files changed

+101
-334
lines changed

Some content is hidden

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

82 files changed

+101
-334
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
*.tga binary
108108
*.ttc binary
109109
*.ttf binary
110+
*.webp binary
110111
*.woff binary
111112
*.woff2 binary
112113
*.xls binary

‎Directory.Build.props‎

Lines changed: 14 additions & 20 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,7 +69,6 @@
7569

7670
<!-- Default settings that are otherwise undefined -->
7771
<PropertyGroup>
78-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)shared-infrastructure/SixLabors.snk</AssemblyOriginatorKeyFile>
7972
<Copyright>Copyright © Six Labors</Copyright>
8073
<Features>strict;IOperation</Features>
8174
<HighEntropyVA>true</HighEntropyVA>
@@ -91,6 +84,7 @@
9184
https://www.myget.org/F/sixlabors/api/v3/index.json;
9285
https://api.nuget.org/v3/index.json;
9386
</RestoreSources>
87+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)shared-infrastructure/SixLabors.snk</AssemblyOriginatorKeyFile>
9488
<SixLaborsPublicKey>00240000048000009400000006020000002400005253413100040000010001000147e6fe6766715eec6cfed61f1e7dcdbf69748a3e355c67e9d8dfd953acab1d5e012ba34b23308166fdc61ee1d0390d5f36d814a6091dd4b5ed9eda5a26afced924c683b4bfb4b3d64b0586a57eff9f02b1f84e3cb0ddd518bd1697f2c84dcbb97eb8bb5c7801be12112ed0ec86db934b0e9a5171e6bb1384b6d2f7d54dfa97</SixLaborsPublicKey>
9589
<UseSharedCompilation>true</UseSharedCompilation>
9690
<SignAssembly>true</SignAssembly>
@@ -103,7 +97,7 @@
10397
<AdditionalFiles Include="$(MSBuildThisFileDirectory)shared-infrastructure\stylecop.json" />
10498
<!--NuGet package icon source-->
10599
<None Include="$(MSBuildThisFileDirectory)shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
106-
<None Include="$(MSBuildThisFileDirectory)shared-infrastructure\LICENSE.md" Pack="true" PackagePath="" />
100+
<None Include="$(MSBuildThisFileDirectory)shared-infrastructure\NUGETLICENSE.md" Pack="true" PackagePath="LICENSE.md" />
107101
</ItemGroup>
108102

109103
</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-unstable1129" />
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}

‎shared-infrastructure‎

‎src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) Six Labors and contributors.
2-
// Licensed under the Apache License, Version 2.0.
2+
// Licensed under the GNU Affero General Public License, Version 3.
33

44
using System;
55
using System.Collections.Generic;

‎src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) Six Labors and contributors.
2-
// Licensed under the Apache License, Version 2.0.
2+
// Licensed under the GNU Affero General Public License, Version 3.
33

44
using System.Collections.Generic;
55

‎src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageImageResolver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) Six Labors and contributors.
2-
// Licensed under the Apache License, Version 2.0.
2+
// Licensed under the GNU Affero General Public License, Version 3.
33

44
using System;
55
using System.IO;

‎src/ImageSharp.Web/Caching/AsyncKeyLock.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) Six Labors and contributors.
2-
// Licensed under the Apache License, Version 2.0.
2+
// Licensed under the GNU Affero General Public License, Version 3.
33

44
using System;
55
using System.Collections.Generic;

‎src/ImageSharp.Web/Caching/CacheHash.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) Six Labors and contributors.
2-
// Licensed under the Apache License, Version 2.0.
2+
// Licensed under the GNU Affero General Public License, Version 3.
33

44
using System;
55
using System.Security.Cryptography;

0 commit comments

Comments
 (0)