RetroSearch Browse

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://github.com/ThreeMammals/Ocelot/commit/24b507ee07ada3da924fcaf5f09a8717e41eeb9b below:

#1787 Upgrade to .NET 8 (#1789) · ThreeMammals/Ocelot@24b507e · GitHub

File tree Expand file treeCollapse file tree 63 files changed

+764

-639

lines changed

Filter options

- OcelotServiceDiscovery/ApiGateway
- - OcelotApplicationApiGateway
- Ocelot.Cache.CacheManager
- Ocelot.Provider.Kubernetes
- Ocelot.Tracing.OpenTracing

Expand file treeCollapse file tree 63 files changed

+764

-639

lines changed Original file line number Diff line number Diff line change


 @@ -4,13 +4,13 @@ orbs:

4 4


 jobs:

5 5


 build:

6 6


 docker:

7

-
 - image: mijitt0m/ocelot-build:0.0.9

7

+
 - image: ocelot2/circleci-build:latest

8 8


 steps:

9 9


 - checkout

10 10


 - run: dotnet tool restore && dotnet cake

11 11


 release:

12 12


 docker:

13

-
 - image: mijitt0m/ocelot-build:0.0.9

13

+
 - image: ocelot2/circleci-build:latest

14 14


 steps:

15 15


 - checkout

16 16


 - run: dotnet tool restore && dotnet cake --target=Release


 @@ -19,7 +19,7 @@ workflows:

19 19


 main:

20 20


 jobs:

21 21


 - queue/block_workflow:

22

-
 time: "20"

22

+
 time: '20'

23 23


 only-on-branch: main

24 24


 - release:

25 25


 requires:


 @@ -38,6 +38,6 @@ workflows:

38 38


 - build:

39 39


 filters:

40 40


 branches:

41

-
 ignore:

41

+
 ignore:

42 42


 - main

43 43


 - develop

Original file line number Diff line number Diff line change


 @@ -4,7 +4,12 @@ root = true

4 4


 end_of_line = lf

5 5


 insert_final_newline = true

6 6 7

-
 [*.cs]

7

+
 [*.cs]

8 8


 end_of_line = lf

9 9


 indent_style = space

10 10


 indent_size = 4

11 + 12

+
 # XML files

13

+
 [*.xml]

14

+
 indent_style = space

15

+
 indent_size = 2

Original file line number Diff line number Diff line change


 @@ -1,7 +1,7 @@

1 - 1 + 2 2


 Microsoft Visual Studio Solution File, Format Version 12.00

3 3


 # Visual Studio Version 17

4

-
 VisualStudioVersion = 17.6.33723.286

4

+
 VisualStudioVersion = 17.8.34309.116

5 5


 MinimumVisualStudioVersion = 10.0.40219.1

6 6


 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5CFB79B7-C9DC-45A4-9A75-625D92471702}"

7 7


 EndProject

Original file line number Diff line number Diff line change


 @@ -1,9 +1,16 @@

1

-
 FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine

1

+
 FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine

2 2 3 3


 RUN apk add bash icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib git openssh-client

4 4 5 5


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

6 6 7 7


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

8 8 9

+
 # Install .NET 8 SDK (already included in the base image, but listed for consistency)

10

+
 RUN ./dotnet-install.sh -c 8.0 -i /usr/share/dotnet

11 + 12

+
 # Install .NET 7 SDK

13

+
 RUN ./dotnet-install.sh -c 7.0 -i /usr/share/dotnet

14 + 15

+
 # Install .NET 6 SDK

9 16


 RUN ./dotnet-install.sh -c 6.0 -i /usr/share/dotnet

Original file line number Diff line number Diff line change


 @@ -1,7 +1,8 @@

1 1


 # call from ocelot repo root with

2 2


 # docker build --platform linux/arm64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .

3 3


 # docker build --platform linux/amd64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .

4

-
 FROM mijitt0m/ocelot-build:0.0.9

4 + 5

+
 FROM ocelot2/circleci-build:latest

5 6 6 7


 ARG OCELOT_COVERALLS_TOKEN

7 8


 @@ -13,4 +14,4 @@ COPY ./. .

13 14 14 15


 RUN dotnet tool restore

15 16 16

-
 RUN dotnet cake

17

+
 RUN dotnet cake

Original file line number Diff line number Diff line change


 @@ -1,7 +1,8 @@

1 1


 # call from ocelot repo root with

2 2


 # 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 .

3 3


 # 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 .

4

-
 FROM mijitt0m/ocelot-build:0.0.9

4 + 5

+
 FROM ocelot2/circleci-build:latest

5 6 6 7


 ARG OCELOT_COVERALLS_TOKEN

7 8


 ARG OCELOT_NUTGET_API_KEY


 @@ -17,4 +18,4 @@ COPY ./. .

17 18 18 19


 RUN dotnet tool restore

19 20 20

-
 RUN dotnet cake

21

+
 RUN dotnet cake

Original file line number Diff line number Diff line change


 @@ -1,3 +1,3 @@

1 1


 # docker build

2 2 3

-
 This folder contains the dockerfile and script to create the ocelot build container.

3

+
 This folder contains the `Dockerfile.*` and `build.sh` script to create the Ocelot build image & container.

Original file line number Diff line number Diff line change


 @@ -1,7 +1,11 @@

1

-
 # this script build the ocelot docker file

2

-
 version=0.0.9

3

-
 docker build --platform linux/amd64 -t mijitt0m/ocelot-build -f Dockerfile.base .

1

+
 # This script builds the Ocelot Docker file

2 + 3

+
 # {DotNetSdkVer}.{OcelotVer} -> {.NET8}.{21.0} -> 8.21.0

4

+
 version=8.21.0

5

+
 docker build --platform linux/amd64 -t ocelot2/circleci-build -f Dockerfile.base .

6 + 4 7


 echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin

5

-
 docker tag mijitt0m/ocelot-build mijitt0m/ocelot-build:$version

6

-
 docker push mijitt0m/ocelot-build:latest

7

-
 docker push mijitt0m/ocelot-build:$version

8 + 9

+
 docker tag ocelot2/circleci-build ocelot2/circleci-build:$version

10

+
 docker push ocelot2/circleci-build:latest

11

+
 docker push ocelot2/circleci-build:$version

Original file line number Diff line number Diff line change


 @@ -1,15 +1,14 @@

1 1


 <Project Sdk="Microsoft.NET.Sdk.Web">

2 2


 <PropertyGroup>

3

-
 <TargetFramework>net7.0</TargetFramework>

3

+
 <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>

4 4


 <ImplicitUsings>disable</ImplicitUsings>

5 5


 <Nullable>disable</Nullable>

6 6


 </PropertyGroup>

7 7


 <ItemGroup>

8 8


 <Folder Include="wwwroot\" />

9 9


 </ItemGroup>

10 10


 <ItemGroup>

11

-
 <PackageReference Include="Ocelot" Version="18.0.0" />

12

-
 <PackageReference Include="Ocelot.Administration" Version="18.0.0" />

13 - 11

+
 <ProjectReference Include="..\..\src\Ocelot.Administration\Ocelot.Administration.csproj" />

12

+
 <ProjectReference Include="..\..\src\Ocelot\Ocelot.csproj" />

14 13


 </ItemGroup>

15 14


 </Project>

Original file line number Diff line number Diff line change


 @@ -1,18 +1,14 @@

1 1


 <Project Sdk="Microsoft.NET.Sdk.Web">

2 - 3 2


 <PropertyGroup>

4

-
 <TargetFramework>net7.0</TargetFramework>

3

+
 <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>

5 4


 <ImplicitUsings>disable</ImplicitUsings>

6 5


 <Nullable>disable</Nullable>

7 6


 <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>

8 7


 </PropertyGroup>

9 - 10 8


 <ItemGroup>

11 9


 <Folder Include="Properties\" />

12 10


 </ItemGroup>

13 - 14 11


 <ItemGroup>

15 12


 <ProjectReference Include="..\..\src\Ocelot\Ocelot.csproj" />

16 13


 </ItemGroup>

17 - 18 14


 </Project>

You can’t perform that action at this time.

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4