Skip to content

Commit b0ca225

Browse files
GrigoreMihaiGrigoreMihai
authored
Merge pull request #1250 from imgbot/update_compress_runtime
Update compress runtime
2 parents fb9022a + 6631e28 commit b0ca225

File tree

13 files changed

+52
-53
lines changed

13 files changed

+52
-53
lines changed

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
dotnet-version: [ '2.1' ]
13+
dotnet-version: [ '6.0.402' ]
1414

1515
steps:
1616
- uses: actions/checkout@v3

‎Auth/Auth.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
4-
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
8-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
7+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
8+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
99
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
1010
</ItemGroup>
1111
<ItemGroup>

‎Common/Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎CompressImagesFunction/CompressImagesFunction.csproj

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
4-
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
5+
<UseAppHost>false</UseAppHost>
56
</PropertyGroup>
67

78
<Target Name="CopyNativeBinaries" AfterTargets="Build">
89
<ItemGroup>
9-
<NativeBinary Include="$(TargetDir)bin/runtimes/linux-x64/native/libgit2-106a5f2.so" />
10-
<NativeBinary Include="$(TargetDir)bin/runtimes/osx/native/libgit2-106a5f2.dylib" />
11-
<NativeBinary Include="$(TargetDir)bin/runtimes/win-x86/native/git2-106a5f2.dll" />
12-
<NativeBinary Include="$(TargetDir)bin/runtimes/linux-x64/native/Magick.Native-Q16-x64.dll.so" />
13-
<NativeBinary Include="$(TargetDir)bin/runtimes/osx-x64/native/Magick.Native-Q16-x64.dll.dylib" />
14-
<NativeBinary Include="$(TargetDir)bin/runtimes/win-x64/native/Magick.Native-Q16-x64.dll" />
10+
<NativeBinary Include="$(TargetDir)runtimes/linux-x64/native/libgit2-b7bad55.so" />
11+
<NativeBinary Include="$(TargetDir)runtimes/linux-x64/native/Magick.Native-Q16-x64.dll.so" />
1512
</ItemGroup>
1613
<Copy SourceFiles="@(NativeBinary)" DestinationFiles="@(NativeBinary->'$(TargetDir)bin/%(Filename)%(Extension)')" />
1714
</Target>
1815

1916
<ItemGroup>
20-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
21-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
22-
<PackageReference Include="LibGit2Sharp" Version="0.26.2" />
23-
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="10.1.0" />
24-
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.5" />
17+
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0182" />
18+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.0.1" />
19+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
20+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
21+
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="12.2.0" />
2522
<PackageReference Include="Octokit" Version="0.50.0" />
2623
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
2724
</ItemGroup>

‎DeleteBranchFunction/DeleteBranchFunction.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
4-
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<PackageReference Include="Octokit" Version="0.50.0" />
9-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
10-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
9+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
10+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1111
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.5" />
1212
</ItemGroup>
1313

‎Dockerfile.CompressImages

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS dotnet
1+
FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS dotnet
22

33
COPY . /src/
44
RUN mkdir -p /home/site/wwwroot
55
RUN cd /src/CompressImagesFunction && dotnet publish CompressImagesFunction.csproj -c Release --output /home/site/wwwroot
66

77
# Native Binaries
8-
RUN cd /src/CompressImagesFunction && cp bin/Release/netstandard2.0/bin/runtimes/linux-x64/native/libgit2-106a5f2.so /home/site/wwwroot/bin/
9-
RUN cd /src/CompressImagesFunction && cp bin/Release/netstandard2.0/bin/runtimes/linux-x64/native/Magick.Native-Q16-x64.dll.so /home/site/wwwroot/bin/
8+
RUN cd /src/CompressImagesFunction && cp bin/Release/net6.0/runtimes/linux-x64/native/libgit2-b7bad55.so /home/site/wwwroot/bin/
9+
RUN cd /src/CompressImagesFunction && cp bin/Release/net6.0/runtimes/linux-x64/native/Magick.Native-Q16-x64.dll.so /home/site/wwwroot/bin/
1010

11-
FROM mcr.microsoft.com/azure-functions/dotnet:2.0
11+
FROM mcr.microsoft.com/azure-functions/dotnet:4
1212

1313
RUN apt-get update && apt-get install -y --no-install-recommends --no-install-suggests \
14-
curl libcurl3 autoconf automake libtool nasm make wget pkg-config
14+
curl libcurl4 autoconf automake libtool nasm make wget pkg-config
1515

16-
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
16+
RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash -
1717
RUN apt-get install -y nodejs
1818
RUN npm install -g svgo@^1.3.2
1919

‎Install/Install.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
8+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
99
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
1010
</ItemGroup>
1111

‎MarketplaceSyncFunction/MarketplaceSyncFunction.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
4-
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<PackageReference Include="Octokit" Version="0.50.0" />
9-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
10-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
9+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
10+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎OpenPrFunction/OpenPrFunction.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
4-
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<PackageReference Include="Octokit" Version="0.50.0" />
9-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
10-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
9+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
10+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1111
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.5" />
1212
</ItemGroup>
1313

‎PrPoisonHandler/PrPoisonHandler.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
4-
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
9-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
8+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
9+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1010
<PackageReference Include="Octokit" Version="0.50.0" />
1111
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.5" />
1212
</ItemGroup>

‎RouterFunction/RouterFunction.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
4-
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
9-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
8+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
9+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1010
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.5" />
1111
</ItemGroup>
1212

‎Test/Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<LangVersion>latest</LangVersion>
77
</PropertyGroup>
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
1111
<PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
1212
<PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
13-
<PackageReference Include="LibGit2Sharp" Version="0.26.2" />
13+
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0182" />
1414
<PackageReference Include="NSubstitute" Version="4.2.2" />
1515
</ItemGroup>
1616

‎WebHook/WebHook.csproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
4-
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
8-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
7+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
8+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.0.1" />
9+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
10+
<PackageReference Include="System.Runtime" Version="4.3.1" />
911
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
1012
</ItemGroup>
1113
<ItemGroup>

0 commit comments

Comments
 (0)