Skip to content
This repository was archived by the owner on May 7, 2024. It is now read-only.

Commit f14da51

Browse files
nishanilnishanil
authored
Merge pull request #7 from sughosneo/feature/update-net-5
Feature/update .NET 5
2 parents 2ba4c97 + b561a08 commit f14da51

File tree

19 files changed

+67
-67
lines changed

19 files changed

+67
-67
lines changed

‎FullStockTickerSample/grpc/FullStockTicker/src/TraderSys.FullStockTicker.Client/TraderSys.FullStockTicker.Client.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Google.Protobuf" Version="3.9.1" />
9-
<PackageReference Include="Grpc.Auth" Version="2.23.0" />
10-
<PackageReference Include="Grpc.Net.ClientFactory" Version="0.2.23-pre1" />
11-
<PackageReference Include="Grpc.Net.Common" Version="0.2.23-pre1" />
12-
<PackageReference Include="Grpc.Tools" Version="2.23.0">
8+
<PackageReference Include="Google.Protobuf" Version="3.14.0" />
9+
<PackageReference Include="Grpc.Auth" Version="2.34.0" />
10+
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.34.0-pre1" />
11+
<PackageReference Include="Grpc.Net.Common" Version="2.34.0-pre1" />
12+
<PackageReference Include="Grpc.Tools" Version="2.34.0">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

‎FullStockTickerSample/grpc/FullStockTicker/src/TraderSys.FullStockTickerClientApp/TraderSys.FullStockTickerClientApp.csproj‎

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

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>net5.0-windows</TargetFramework>
66
<UseWPF>true</UseWPF>
77
</PropertyGroup>
88

@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview8.19405.4" />
14+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎FullStockTickerSample/grpc/FullStockTicker/src/TraderSys.FullStockTickerServer/TraderSys.FullStockTickerServer.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<Protobuf Include="Protos\full_stock_ticker.proto" GrpcServices="Server" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Grpc.AspNetCore" Version="0.1.22-pre3" />
13-
<PackageReference Include="Grpc.Net.Common" Version="0.2.23-pre1" />
14-
<PackageReference Include="Grpc.Tools" Version="2.23.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="3.0.0-preview8.19405.7" />
12+
<PackageReference Include="Grpc.AspNetCore" Version="2.34.0-pre1" />
13+
<PackageReference Include="Grpc.Net.Common" Version="2.34.0-pre1" />
14+
<PackageReference Include="Grpc.Tools" Version="2.34.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="5.0.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎FullStockTickerSample/grpc/FullStockTickerAuth/FullStockTicker/src/TraderSys.FullStockTicker.Client/TraderSys.FullStockTicker.Client.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Google.Protobuf" Version="3.9.1" />
9-
<PackageReference Include="Grpc.Auth" Version="2.23.0" />
10-
<PackageReference Include="Grpc.Net.ClientFactory" Version="0.2.23-pre1" />
11-
<PackageReference Include="Grpc.Net.Common" Version="0.2.23-pre1" />
12-
<PackageReference Include="Grpc.Tools" Version="2.23.0">
8+
<PackageReference Include="Google.Protobuf" Version="3.14.0" />
9+
<PackageReference Include="Grpc.Auth" Version="2.34.0" />
10+
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.34.0-pre1" />
11+
<PackageReference Include="Grpc.Net.Common" Version="2.34.0-pre1" />
12+
<PackageReference Include="Grpc.Tools" Version="2.34.0">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

‎FullStockTickerSample/grpc/FullStockTickerAuth/FullStockTicker/src/TraderSys.FullStockTickerClientApp/TraderSys.FullStockTickerClientApp.csproj‎

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

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>net5.0-windows</TargetFramework>
66
<UseWPF>true</UseWPF>
77
</PropertyGroup>
88

@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview8.19405.4" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎FullStockTickerSample/grpc/FullStockTickerAuth/FullStockTicker/src/TraderSys.FullStockTickerServer/TraderSys.FullStockTickerServer.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<Protobuf Include="Protos\full_stock_ticker.proto" GrpcServices="Server" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Grpc.AspNetCore" Version="0.1.22-pre3" />
13-
<PackageReference Include="Grpc.Net.Common" Version="0.2.23-pre1" />
14-
<PackageReference Include="Grpc.Tools" Version="2.23.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="3.0.0-preview8.19405.7" />
12+
<PackageReference Include="Grpc.AspNetCore" Version="2.34.0-pre1" />
13+
<PackageReference Include="Grpc.Net.Common" Version="2.34.0-pre1" />
14+
<PackageReference Include="Grpc.Tools" Version="2.34.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="5.0.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎KubernetesSample/src/StockData/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM mcr.microsoft.com/dotnet/core/sdk:3.0 as build
1+
FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim as build
22

3-
WORKDIR /build
3+
WORKDIR /src
44

5-
COPY ./Kubed.sln .
5+
COPY ./StockKube.sln .
66
COPY ./src/StockData/StockData.csproj ./src/StockData/
77
COPY ./src/StockWeb/StockWeb.csproj ./src/StockWeb/
88

@@ -12,7 +12,7 @@ COPY . .
1212

1313
RUN dotnet publish --no-restore -c Release -o /published src/StockData/StockData.csproj
1414

15-
FROM mcr.microsoft.com/dotnet/core/aspnet:3.0
15+
FROM mcr.microsoft.com/dotnet/aspnet:5.0 as runtime
1616

1717
WORKDIR /app
1818

‎KubernetesSample/src/StockData/StockData.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
5-
<LangVersion>8</LangVersion>
4+
<TargetFramework>net5.0</TargetFramework>
5+
<LangVersion>9.0</LangVersion>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<Protobuf Include="Protos\stocks.proto" GrpcServices="Server" />
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Grpc.AspNetCore" Version="0.2.23-pre2" />
13+
<PackageReference Include="Grpc.AspNetCore" Version="2.34.0-pre1" />
1414
</ItemGroup>
1515

1616
</Project>

‎KubernetesSample/src/StockWeb/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/core/sdk:3.0 as build
1+
FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim as build
22

33
WORKDIR /src
44

@@ -12,7 +12,7 @@ COPY . .
1212

1313
RUN dotnet publish --no-restore -c Release -o /published src/StockWeb/StockWeb.csproj
1414

15-
FROM mcr.microsoft.com/dotnet/core/aspnet:3.0
15+
FROM mcr.microsoft.com/dotnet/aspnet:5.0 as runtime
1616

1717
WORKDIR /app
1818

‎KubernetesSample/src/StockWeb/StockWeb.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.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Google.Protobuf" Version="3.9.1" />
9-
<PackageReference Include="Grpc.Net.ClientFactory" Version="0.2.23-pre2" />
10-
<PackageReference Include="Grpc.Tools" Version="2.23.0">
8+
<PackageReference Include="Google.Protobuf" Version="3.14.0" />
9+
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.34.0-pre1" />
10+
<PackageReference Include="Grpc.Tools" Version="2.34.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>

0 commit comments

Comments
 (0)