Skip to content

Commit 7085e8b

Browse files
JimBobSquarePantsJimBobSquarePants
committed
Merge remote-tracking branch 'upstream/master' into async-events
2 parents 4edae13 + 22352d1 commit 7085e8b

File tree

82 files changed

+1828
-1877
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

+1828
-1877
lines changed

‎.github/FUNDING.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
open_collective: imagesharp
1+
github: SixLabors
2+
open_collective: sixlabors

‎.github/workflows/build-and-test.yml‎

Lines changed: 7 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
codecov: false
3030

3131
runs-on: ${{matrix.options.os}}
32+
if: "!contains(github.event.head_commit.message, '[skip ci]')"
3233

3334
steps:
3435
- uses: actions/checkout@v2
@@ -44,28 +45,6 @@ jobs:
4445
git fetch --prune --unshallow
4546
git submodule -q update --init --recursive
4647
47-
- name: Fetch Tags for GitVersion
48-
run: |
49-
git fetch --tags
50-
51-
- name: Fetch master for GitVersion
52-
if: github.ref != 'refs/heads/master'
53-
run: git branch --create-reflog master origin/master
54-
55-
- name: Install GitVersion
56-
uses: gittools/actions/[email protected]
57-
with:
58-
versionSpec: "5.1.x"
59-
60-
- name: Use GitVersion
61-
id: gitversion # step id used as reference for output values
62-
uses: gittools/actions/[email protected]
63-
64-
- name: Setup DotNet SDK
65-
uses: actions/setup-dotnet@v1
66-
with:
67-
dotnet-version: "3.1.101"
68-
6948
- name: Install Azurite Linux
7049
if: matrix.options.os == 'ubuntu-latest'
7150
shell: bash
@@ -85,7 +64,7 @@ jobs:
8564
8665
- name: Build
8766
shell: pwsh
88-
run: ./ci-build.ps1 "${{steps.gitversion.outputs.nuGetVersion}}" "${{matrix.options.framework}}"
67+
run: ./ci-build.ps1 "${{matrix.options.framework}}"
8968

9069
- name: Test
9170
shell: pwsh
@@ -95,7 +74,7 @@ jobs:
9574
XUNIT_PATH: .\tests\ImageSharp.Web.Tests # Required for xunit
9675

9776
- name: Update Codecov
98-
uses: codecov/codecov-action@v1.0.7
77+
uses: codecov/codecov-action@v1
9978
if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors')
10079
with:
10180
flags: unittests
@@ -121,33 +100,13 @@ jobs:
121100
git fetch --prune --unshallow
122101
git submodule -q update --init --recursive
123102
124-
- name: Fetch Tags for GitVersion
125-
run: |
126-
git fetch --tags
127-
128-
- name: Fetch master for GitVersion
129-
if: github.ref != 'refs/heads/master'
130-
run: git branch --create-reflog master origin/master
131-
132-
- name: Install GitVersion
133-
uses: gittools/actions/[email protected]
134-
with:
135-
versionSpec: "5.1.x"
136-
137-
- name: Use GitVersion
138-
id: gitversion # step id used as reference for output values
139-
uses: gittools/actions/[email protected]
140-
141-
- name: Setup DotNet SDK
142-
uses: actions/setup-dotnet@v1
143-
with:
144-
dotnet-version: "3.1.101"
145-
146103
- name: Pack
147104
shell: pwsh
148-
run: ./ci-pack.ps1 "${{steps.gitversion.outputs.nuGetVersion}}"
105+
run: ./ci-pack.ps1
149106

150107
- name: Publish to MyGet
151108
shell: pwsh
152-
run: nuget.exe push .\artifacts\*.nupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v2/package
109+
run: |
110+
nuget.exe push .\artifacts\*.nupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v2/package
111+
nuget.exe push .\artifacts\*.snupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v3/index.json
153112
# TODO: If github.ref starts with 'refs/tags' then it was tag push and we can optionally push out package to nuget.org

‎Directory.Build.props‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
<!-- Default settings that are used by other settings -->
1414
<PropertyGroup>
1515
<BaseArtifactsPath>$(MSBuildThisFileDirectory)artifacts/</BaseArtifactsPath>
16-
<BaseArtifactsPathSuffix>$(ImageSharpProjectCategory)/$(MSBuildProjectName)</BaseArtifactsPathSuffix>
16+
<BaseArtifactsPathSuffix>$(SixLaborsProjectCategory)/$(MSBuildProjectName)</BaseArtifactsPathSuffix>
1717
<RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/SixLabors/ImageSharp.Web/</RepositoryUrl>
1818
</PropertyGroup>
1919

2020
<!-- Default settings that explicitly differ from the Sdk.props defaults -->
2121
<PropertyGroup>
2222
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
23+
<BaseIntermediateOutputPath>$(BaseArtifactsPath)obj/$(BaseArtifactsPathSuffix)/</BaseIntermediateOutputPath>
2324
<DebugType>portable</DebugType>
2425
<DebugType Condition="'$(codecov)' != ''">full</DebugType>
2526
<NullableContextOptions>disable</NullableContextOptions>
2627
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
27-
<SignAssembly>false</SignAssembly>
2828
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
2929
</PropertyGroup>
3030

@@ -59,6 +59,7 @@
5959
<!-- Default settings that explicitly differ from the Sdk.targets defaults-->
6060
<PropertyGroup>
6161
<Authors>Six Labors and contributors</Authors>
62+
<BaseOutputPath>$(BaseArtifactsPath)bin/$(BaseArtifactsPathSuffix)/</BaseOutputPath>
6263
<Company>Six Labors</Company>
6364
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(BaseArtifactsPathSuffix)/$(Configuration)/</PackageOutputPath>
6465
<Product>SixLabors.ImageSharp.Web</Product>
@@ -67,6 +68,12 @@
6768
<VersionSuffix></VersionSuffix>
6869
</PropertyGroup>
6970

71+
<!--MinVer Properties for versioning-->
72+
<PropertyGroup>
73+
<MinVerTagPrefix>v</MinVerTagPrefix>
74+
<MinVerVerbosity>normal</MinVerVerbosity>
75+
</PropertyGroup>
76+
7077
<!-- Default settings that are otherwise undefined -->
7178
<PropertyGroup>
7279
<Copyright>Copyright © Six Labors</Copyright>

‎Directory.Build.targets‎

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

2424
<!--Src Dependencies-->
25-
<PackageReference Update="SixLabors.ImageSharp" Version="1.0.0-rc0002" />
2625
<PackageReference Update="Azure.Storage.Blobs" Version="12.4.0" />
26+
<PackageReference Update="Microsoft.IO.RecyclableMemoryStream" Version="1.3.5" />
27+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
28+
<PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.0" />
29+
<PackageReference Update="SixLabors.ImageSharp" Version="1.0.1" />
2730
</ItemGroup>
2831

2932
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">

‎GitVersion.yml‎

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

‎ImageSharp.Web.sln‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.28803.452
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_root", "_root", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
77
ProjectSection(SolutionItems) = preProject
88
.editorconfig = .editorconfig
99
.gitignore = .gitignore
10+
before.ImageSharp.Web.sln.targets = before.ImageSharp.Web.sln.targets
1011
ci-build.ps1 = ci-build.ps1
1112
ci-pack.ps1 = ci-pack.ps1
1213
ci-test.ps1 = ci-test.ps1
@@ -55,6 +56,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
5556
.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
5657
EndProjectSection
5758
EndProject
59+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8B4A805D-D780-4A18-9BDA-4D27B4BD11AA}"
60+
ProjectSection(SolutionItems) = preProject
61+
samples\Directory.Build.props = samples\Directory.Build.props
62+
samples\Directory.Build.targets = samples\Directory.Build.targets
63+
EndProjectSection
64+
EndProject
65+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Web.Sample", "samples\ImageSharp.Web.Sample\ImageSharp.Web.Sample.csproj", "{8F40DEC6-A97F-4002-A504-13E188665A98}"
66+
EndProject
5867
Global
5968
GlobalSection(SharedMSBuildProjectFiles) = preSolution
6069
shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{2f1b36e2-5d92-4442-b816-d2a978246435}*SharedItemsImports = 5
@@ -118,6 +127,18 @@ Global
118127
{E2A545EC-B909-4EAD-B95F-397F68588BE3}.Release|x64.Build.0 = Release|Any CPU
119128
{E2A545EC-B909-4EAD-B95F-397F68588BE3}.Release|x86.ActiveCfg = Release|Any CPU
120129
{E2A545EC-B909-4EAD-B95F-397F68588BE3}.Release|x86.Build.0 = Release|Any CPU
130+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
132+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Debug|x64.ActiveCfg = Debug|Any CPU
133+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Debug|x64.Build.0 = Debug|Any CPU
134+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Debug|x86.ActiveCfg = Debug|Any CPU
135+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Debug|x86.Build.0 = Debug|Any CPU
136+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
137+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Release|Any CPU.Build.0 = Release|Any CPU
138+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Release|x64.ActiveCfg = Release|Any CPU
139+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Release|x64.Build.0 = Release|Any CPU
140+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Release|x86.ActiveCfg = Release|Any CPU
141+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Release|x86.Build.0 = Release|Any CPU
121142
EndGlobalSection
122143
GlobalSection(SolutionProperties) = preSolution
123144
HideSolutionNode = FALSE
@@ -131,6 +152,7 @@ Global
131152
{68A8CC40-6AED-4E96-B524-31B1158FDEEA} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
132153
{04955CD1-F249-4899-9F61-6C7487BEECE1} = {B8152C86-B657-4967-B297-42F89A10D23A}
133154
{2A5EF4AC-E228-42C1-970B-35630A9AF250} = {B8152C86-B657-4967-B297-42F89A10D23A}
155+
{8F40DEC6-A97F-4002-A504-13E188665A98} = {8B4A805D-D780-4A18-9BDA-4D27B4BD11AA}
134156
EndGlobalSection
135157
GlobalSection(ExtensibilityGlobals) = postSolution
136158
SolutionGuid = {C5B38B65-A19E-4359-859C-5B2205429BD1}

0 commit comments

Comments
 (0)