Skip to content

Commit 07263be

Browse files
TomPallisterTomPallister
committed
Merge branch 'RaynaldM-upgrade-to-net7' into develop
2 parents 36ad6e1 + 8920836 commit 07263be

File tree

503 files changed

+5508
-4291
lines changed

Some content is hidden

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

503 files changed

+5508
-4291
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ orbs:
44
jobs:
55
build:
66
docker:
7-
- image: mijitt0m/ocelot-build:0.0.6
7+
- image: mijitt0m/ocelot-build:0.0.7
88
steps:
99
- checkout
1010
- run: dotnet tool restore && dotnet cake
1111
release:
1212
docker:
13-
- image: mijitt0m/ocelot-build:0.0.6
13+
- image: mijitt0m/ocelot-build:0.0.7
1414
steps:
1515
- checkout
1616
- run: dotnet tool restore && dotnet cake --target=Release

‎docker/Dockerfile.base‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# syntax=docker/dockerfile:1
2-
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine
1+
FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine
32

43
RUN apk add bash icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib
54

65
RUN curl -L --output ./dotnet-install.sh https://dot.net/v1/dotnet-install.sh
76

87
RUN chmod u+x ./dotnet-install.sh
98

10-
RUN ./dotnet-install.sh -c 5.0 -i /usr/share/dotnet
9+
RUN ./dotnet-install.sh -c 6.0 -i /usr/share/dotnet

‎docker/Dockerfile.build‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# syntax=docker/dockerfile:1
21
# call from ocelot repo root with
32
# docker build --platform linux/arm64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
43
# docker build --platform linux/amd64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
5-
FROM mijitt0m/ocelot-build:0.0.6
4+
FROM mijitt0m/ocelot-build:0.0.7
65

76
ARG OCELOT_COVERALLS_TOKEN
87

‎docker/Dockerfile.release‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# syntax=docker/dockerfile:1
21
# call from ocelot repo root with
32
# docker build --platform linux/arm64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN --build-arg OCELOT_GITHUB_API_KEY=$OCELOT_GITHUB_API_KEY --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
43
# docker build --platform linux/amd64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN --build-arg OCELOT_GITHUB_API_KEY=$OCELOT_GITHUB_API_KEY --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
5-
FROM mijitt0m/ocelot-build:0.0.6
4+
FROM mijitt0m/ocelot-build:0.0.7
65

76
ARG OCELOT_COVERALLS_TOKEN
87
ARG OCELOT_NUTGET_API_KEY

‎docker/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# this script build the ocelot docker file
2-
version=0.0.6
2+
version=0.0.7
33
docker build --platform linux/amd64 -t mijitt0m/ocelot-build -f Dockerfile.base .
44
echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
55
docker tag mijitt0m/ocelot-build mijitt0m/ocelot-build:$version

‎samples/AdministrationApi/AdministrationApi.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<Folder Include="wwwroot\" />
77
</ItemGroup>
88
<ItemGroup>
9-
<PackageReference Include="Ocelot" Version="17.0.1" />
10-
<PackageReference Include="Ocelot.Administration" Version="17.0.1" />
9+
<PackageReference Include="Ocelot" Version="18.0.0" />
10+
<PackageReference Include="Ocelot.Administration" Version="18.0.0" />
1111

1212
</ItemGroup>
1313
</Project>

‎samples/AdministrationApi/Issue645.postman_collection.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
"id": "0f60e7b3-e4f1-4458-bbc4-fc4809e86b2d",
133133
"type": "text/javascript",
134134
"exec": [
135-
""
135+
string.Empty
136136
]
137137
}
138138
},
@@ -142,7 +142,7 @@
142142
"id": "1279a2cf-b771-4a86-9dfa-302b240fac62",
143143
"type": "text/javascript",
144144
"exec": [
145-
""
145+
string.Empty
146146
]
147147
}
148148
}

‎samples/AdministrationApi/Program.cs‎

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,48 @@
1-
using Microsoft.AspNetCore.Hosting;
1+
using System.IO;
2+
3+
using Microsoft.AspNetCore.Hosting;
24
using Microsoft.Extensions.Configuration;
35
using Microsoft.Extensions.Logging;
6+
47
using Ocelot.Administration;
58
using Ocelot.DependencyInjection;
69
using Ocelot.Middleware;
7-
using System.IO;
810

911
namespace AdministrationApi
1012
{
1113
public class Program
12-
{
13-
public static void Main(string[] args)
1414
{
15-
new WebHostBuilder()
16-
.UseKestrel()
17-
.UseUrls("http://localhost:5000")
18-
.UseContentRoot(Directory.GetCurrentDirectory())
19-
.ConfigureAppConfiguration((hostingContext, config) =>
20-
{
21-
config
22-
.SetBasePath(hostingContext.HostingEnvironment.ContentRootPath)
23-
.AddJsonFile("appsettings.json", true, true)
24-
.AddJsonFile($"appsettings.{hostingContext.HostingEnvironment.EnvironmentName}.json", true, true)
25-
.AddJsonFile("ocelot.json")
26-
.AddEnvironmentVariables();
27-
})
28-
.ConfigureServices(s => {
29-
s.AddOcelot()
30-
.AddAdministration("/administration", "secret");
31-
})
32-
.ConfigureLogging((hostingContext, logging) =>
33-
{
34-
logging.AddConsole();
35-
})
36-
.UseIISIntegration()
37-
.Configure(app =>
38-
{
39-
app.UseOcelot().Wait();
40-
})
41-
.Build()
42-
.Run();
15+
public static void Main(string[] args)
16+
{
17+
new WebHostBuilder()
18+
.UseKestrel()
19+
.UseUrls("http://localhost:5000")
20+
.UseContentRoot(Directory.GetCurrentDirectory())
21+
.ConfigureAppConfiguration((hostingContext, config) =>
22+
{
23+
config
24+
.SetBasePath(hostingContext.HostingEnvironment.ContentRootPath)
25+
.AddJsonFile("appsettings.json", true, true)
26+
.AddJsonFile($"appsettings.{hostingContext.HostingEnvironment.EnvironmentName}.json", true, true)
27+
.AddJsonFile("ocelot.json")
28+
.AddEnvironmentVariables();
29+
})
30+
.ConfigureServices(s =>
31+
{
32+
s.AddOcelot()
33+
.AddAdministration("/administration", "secret");
34+
})
35+
.ConfigureLogging((hostingContext, logging) =>
36+
{
37+
logging.AddConsole();
38+
})
39+
.UseIISIntegration()
40+
.Configure(app =>
41+
{
42+
app.UseOcelot().Wait();
43+
})
44+
.Build()
45+
.Run();
46+
}
4347
}
4448
}
45-
}

‎samples/OcelotBasic/OcelotBasic.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.Web">
22

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

77
<ItemGroup>
8-
<PackageReference Include="ocelot" Version="17.0.1" />
8+
<PackageReference Include="ocelot" Version="18.0.0" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎samples/OcelotBasic/Program.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
using System.IO;
2+
23
using Microsoft.AspNetCore.Hosting;
3-
using Microsoft.Extensions.Configuration;
4-
using Microsoft.Extensions.Hosting;
4+
using Microsoft.Extensions.Configuration;
5+
56
using Ocelot.DependencyInjection;
67
using Ocelot.Middleware;
78

@@ -23,7 +24,8 @@ public static void Main(string[] args)
2324
.AddJsonFile("ocelot.json")
2425
.AddEnvironmentVariables();
2526
})
26-
.ConfigureServices(s => {
27+
.ConfigureServices(s =>
28+
{
2729
s.AddOcelot();
2830
})
2931
.ConfigureLogging((hostingContext, logging) =>

0 commit comments

Comments
 (0)