Skip to content

Commit 84821c6

Browse files
PedramrezaeiPedramrezaei
authored
Updated packages (#1133)
* Upgrading nugets * doc changes * more changes to remove warnings * one more fix * one more fix * forcing the build
1 parent 4110837 commit 84821c6

File tree

32 files changed

+125
-132
lines changed

32 files changed

+125
-132
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ A quick list of Ocelot's capabilities for more information see the [documentatio
5555

5656
## How to install
5757

58-
Ocelot is designed to work with ASP.NET Core only and it targets `netstandard2.0`. This means it can be used anywhere `.NET Standard 2.0` is supported, including `.NET Core 3.1` and `.NET Framework 4.8` and up. [This](https://docs.microsoft.com/en-us/dotnet/standard/net-standard) documentation may prove helpful when working out if Ocelot would be suitable for you.
58+
Ocelot is designed to work with ASP.NET Core only and it targets `netcoreapp3.1`.
5959

60-
Install Ocelot and it's dependencies using NuGet.
60+
Install Ocelot and it's dependencies using NuGet.
6161

6262
`Install-Package Ocelot`
6363

‎docs/introduction/gettingstarted.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
Getting Started
22
===============
33

4-
Ocelot is designed to work with .NET Core only and is currently
5-
built to netstandard2.0. `This <https://docs.microsoft.com/en-us/dotnet/articles/standard/library>`_ documentation may prove helpful when working out if Ocelot would be suitable for you.
4+
Ocelot is designed to work with .NET Core only and is currently on netcoreapp3.1.
65

76
.NET Core 3.1
87
^^^^^^^^^^^^^
98

109
**Install NuGet package**
1110

12-
Install Ocelot and it's dependencies using nuget. You will need to create a netstandard2.0 project and bring the package into it. Then follow the Startup below and :doc:`../features/configuration` sections
11+
Install Ocelot and it's dependencies using nuget. You will need to create a netcoreapp3.1 project and bring the package into it. Then follow the Startup below and :doc:`../features/configuration` sections
1312
to get up and running.
1413

1514
``Install-Package Ocelot``

‎samples/AdministrationApi/AdministrationApi.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<Folder Include="wwwroot\" />
77
</ItemGroup>
88
<ItemGroup>
9-
<PackageReference Include="Ocelot" Version="14.0.3" />
10-
<PackageReference Include="Ocelot.Administration" Version="14.0.3" />
9+
<PackageReference Include="Ocelot" Version="14.0.9" />
10+
<PackageReference Include="Ocelot.Administration" Version="14.0.9" />
1111

1212
</ItemGroup>
1313
</Project>

‎samples/OcelotBasic/OcelotBasic.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

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

1111
<ItemGroup>

‎samples/OcelotEureka/ApiGateway/ApiGateway.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Ocelot" Version="13.5.1" />
19-
<PackageReference Include="Ocelot.Provider.Eureka" Version="13.5.1" />
20-
<PackageReference Include="Ocelot.Provider.Polly" Version="13.5.1" />
18+
<PackageReference Include="Ocelot" Version="14.0.9" />
19+
<PackageReference Include="Ocelot.Provider.Eureka" Version="14.0.9" />
20+
<PackageReference Include="Ocelot.Provider.Polly" Version="14.0.9" />
2121
</ItemGroup>
2222

2323
</Project>

‎samples/OcelotEureka/DownstreamService/Startup.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace DownstreamService
1313
{
14+
using Microsoft.Extensions.Hosting;
1415
using Steeltoe.Discovery.Client;
1516

1617
public class Startup
@@ -30,7 +31,7 @@ public void ConfigureServices(IServiceCollection services)
3031
}
3132

3233
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
33-
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
34+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
3435
{
3536
if (env.IsDevelopment())
3637
{

‎samples/OcelotGraphQL/OcelotGraphQL.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Folder Include="wwwroot\" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="Ocelot" Version="5.5.1" />
15-
<PackageReference Include="GraphQL" Version="2.0.0-alpha-870" />
14+
<PackageReference Include="Ocelot" Version="14.0.9" />
15+
<PackageReference Include="GraphQL" Version="2.4.0" />
1616
</ItemGroup>
1717
</Project>

‎samples/OcelotGraphQL/Program.cs‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class Hero
2828

2929
public class Query
3030
{
31-
private List<Hero> _heroes = new List<Hero>
31+
private readonly List<Hero> _heroes = new List<Hero>
3232
{
3333
new Hero { Id = 1, Name = "R2-D2" },
3434
new Hero { Id = 2, Name = "Batman" },
@@ -58,7 +58,7 @@ protected async override Task<HttpResponseMessage> SendAsync(HttpRequestMessage
5858
var query = await request.Content.ReadAsStringAsync();
5959

6060
//if not body try query string, dont hack like this in real world..
61-
if(query.Length == 0)
61+
if (query.Length == 0)
6262
{
6363
var decoded = WebUtility.UrlDecode(request.RequestUri.Query);
6464
query = decoded.Replace("?query=", "");
@@ -82,7 +82,7 @@ protected async override Task<HttpResponseMessage> SendAsync(HttpRequestMessage
8282

8383
public class Program
8484
{
85-
public static void Main(string[] args)
85+
public static void Main()
8686
{
8787
var schema = Schema.For(@"
8888
type Hero {
@@ -93,7 +93,8 @@ type Hero {
9393
type Query {
9494
hero(id: Int): Hero
9595
}
96-
", _ => {
96+
", _ =>
97+
{
9798
_.Types.Include<Query>();
9899
});
99100

@@ -109,10 +110,11 @@ type Query {
109110
.AddJsonFile("ocelot.json", false, false)
110111
.AddEnvironmentVariables();
111112
})
112-
.ConfigureServices(s => {
113-
s.AddSingleton<ISchema>(schema);
114-
s.AddOcelot()
115-
.AddSingletonDelegatingHandler<GraphQlDelegatingHandler>();
113+
.ConfigureServices(s =>
114+
{
115+
s.AddSingleton<ISchema>(schema);
116+
s.AddOcelot()
117+
.AddDelegatingHandler<GraphQlDelegatingHandler>();
116118
})
117119
.ConfigureLogging((hostingContext, logging) =>
118120
{
@@ -125,7 +127,7 @@ type Query {
125127
app.UseOcelot().Wait();
126128
})
127129
.Build()
128-
.Run();
129-
}
130+
.Run();
130131
}
132+
}
131133
}

‎samples/OcelotKube/ApiGateway/ApiGateway.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.App" />
11-
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
12-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.7.9" />
13-
<PackageReference Include="Ocelot" Version="13.5.1" />
14-
<PackageReference Include="Ocelot.Provider.Kubernetes" Version="13.5.1" />
10+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
11+
<PackageReference Include="Ocelot" Version="14.0.9" />
12+
<PackageReference Include="Ocelot.Provider.Kubernetes" Version="14.0.9" />
1513
</ItemGroup>
1614

1715
</Project>

‎samples/OcelotKube/DownstreamService/DownstreamService.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.App" />
11-
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
12-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.7.9" />
10+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
1311
</ItemGroup>
1412

1513
</Project>

0 commit comments

Comments
 (0)