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

Commit 6d25545

Browse files
jamesmontemagnojamesmontemagno
authored
Merge pull request #24 from ardalis/ardalis/net7
Updates for .NET 7
2 parents 29b167e + 8bf4e0d commit 6d25545

File tree

18 files changed

+63
-50
lines changed

18 files changed

+63
-50
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

77
<ItemGroup>
8-
<PackageReference Include="Google.Protobuf" Version="3.19.1" />
9-
<PackageReference Include="Grpc.Auth" Version="2.41.1" />
10-
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.40.0" />
11-
<PackageReference Include="Grpc.Net.Common" Version="2.40.0" />
12-
<PackageReference Include="Grpc.Tools" Version="2.41.1">
8+
<PackageReference Include="Google.Protobuf" Version="3.22.0" />
9+
<PackageReference Include="Grpc.Auth" Version="2.51.0" />
10+
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.51.0" />
11+
<PackageReference Include="Grpc.Net.Common" Version="2.51.0" />
12+
<PackageReference Include="Grpc.Tools" Version="2.51.0">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

‎FullStockTickerSample/grpc/FullStockTicker/src/TraderSys.FullStockTickerClientApp/App.xaml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ private void ConfigureServices(ServiceCollection services)
2121

2222
services.AddGrpcClient<FullStockTickerServer.Protos.FullStockTicker.FullStockTickerClient>("grpc", options =>
2323
{
24-
options.Address = new Uri("https://localhost:5001");
24+
options.Address = new Uri("https://localhost:61282");
2525
});
2626
services.AddSingleton<MainWindow>();
2727
services.AddSingleton<MainWindowViewModel>();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net6.0-windows</TargetFramework>
5+
<TargetFramework>net7.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="5.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

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

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
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>
88
<Protobuf Include="Protos\full_stock_ticker.proto" GrpcServices="Server" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Grpc.AspNetCore" Version="2.40.0" />
13-
<PackageReference Include="Grpc.Net.Common" Version="2.40.0" />
14-
<PackageReference Include="Grpc.Tools" Version="2.41.1" />
15-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="6.0.0" />
12+
<PackageReference Include="Grpc.AspNetCore" Version="2.51.0" />
13+
<PackageReference Include="Grpc.Net.Common" Version="2.51.0" />
14+
<PackageReference Include="Grpc.Tools" Version="2.51.0">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
18+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="7.0.3" />
1619
</ItemGroup>
1720

1821
<ItemGroup>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

77
</Project>

‎KubernetesSample/src/StockData/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:6.0 as build
1+
FROM mcr.microsoft.com/dotnet/sdk:7.0 as build
22

33
WORKDIR /src
44

@@ -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/aspnet:6.0 as runtime
15+
FROM mcr.microsoft.com/dotnet/aspnet:7.0 as runtime
1616

1717
WORKDIR /app
1818

‎KubernetesSample/src/StockData/StockData.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

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

@@ -10,7 +10,7 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Grpc.AspNetCore" Version="2.40.0" />
13+
<PackageReference Include="Grpc.AspNetCore" Version="2.51.0" />
1414
</ItemGroup>
1515

1616
</Project>

‎KubernetesSample/src/StockWeb/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:6.0 as build
1+
FROM mcr.microsoft.com/dotnet/sdk:7.0 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/aspnet:6.0 as runtime
15+
FROM mcr.microsoft.com/dotnet/aspnet:7.0 as runtime
1616

1717
WORKDIR /app
1818

‎KubernetesSample/src/StockWeb/Program.cs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
builder.Services.AddControllersWithViews();
1212
builder.Services.Configure<StockDataSettings>(builder.Configuration.GetSection("StockData"));
13-
1413
builder.Services.AddGrpcClient<Stocks.StocksClient>((provider, options) =>
1514
{
1615
var settings = provider.GetRequiredService<IOptionsMonitor<StockDataSettings>>();

‎KubernetesSample/src/StockWeb/StockWeb.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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="Google.Protobuf" Version="3.19.1" />
9-
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.40.0" />
10-
<PackageReference Include="Grpc.Tools" Version="2.41.1">
8+
<PackageReference Include="Google.Protobuf" Version="3.22.0" />
9+
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.51.0" />
10+
<PackageReference Include="Grpc.Tools" Version="2.51.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>

‎PortfoliosSample/grpc/TraderSys/src/TraderSys.PortfolioData/TraderSys.PortfolioData.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

77
</Project>

‎PortfoliosSample/grpc/TraderSys/src/TraderSys.Portfolios.ClientConsole/TraderSys.Portfolios.ClientConsole.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Google.Protobuf" Version="3.19.1" />
10-
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.40.0" />
11-
<PackageReference Include="Grpc.Tools" Version="2.41.1">
9+
<PackageReference Include="Google.Protobuf" Version="3.22.0" />
10+
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.51.0" />
11+
<PackageReference Include="Grpc.Tools" Version="2.51.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>

‎PortfoliosSample/grpc/TraderSys/src/TraderSys.Portfolios/TraderSys.Portfolios.csproj

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
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>
88
<Protobuf Include="Protos\portfolios.proto" GrpcServices="Server" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Grpc.AspNetCore" Version="2.40.0" />
13-
<PackageReference Include="Grpc.Tools" Version="2.41.1" />
14-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
12+
<PackageReference Include="Grpc.AspNetCore" Version="2.51.0" />
13+
<PackageReference Include="Grpc.Tools" Version="2.51.0">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
17+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.3" />
1518
</ItemGroup>
1619

1720
<ItemGroup>

‎README.md

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
# GRPC for WCF Developers Sample Reference Application
22

3-
Sample .NET 6.0 GRPC reference application, powered by Microsoft, based on latest GRPC .NET packages and Docker containers.
3+
Sample .NET 7.0 GRPC reference application, powered by Microsoft, based on latest GRPC .NET packages and Docker containers.
44

5+
## Read the book
56

6-
## Updated for .NET 6
7+
The samples in this repository are meant to support the free eBook, [gRPC for WCF Developers](https://learn.microsoft.com/en-us/dotnet/architecture/grpc-for-wcf-developers/).
78

8-
grpc-for-wcf-developers is updated to .NET 6 "wave" of technologies. Not just compilation but also new recommended code and other new related versions with several significant changes.
9+
## Version
910

10-
**See more details in the [Release notes](https://github.com/dotnet-architecture/grpc-for-wcf-developers/wiki/Release-notes) wiki page**.
11+
The current version uses .NET 7 and the latest gRPC libraries as of early 2023.
12+
13+
## Release Notes
14+
15+
You'll find [additional release notes for major changes in the wiki](https://github.com/dotnet-architecture/grpc-for-wcf-developers/wiki/Release-notes).

‎SimpleStockTickerSample/grpc/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.Client/TraderSys.SimpleStockTickerServer.Client.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

77
<ItemGroup>
8-
<PackageReference Include="Google.Protobuf" Version="3.19.1" />
9-
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.40.0" />
10-
<PackageReference Include="Grpc.Tools" Version="2.41.1">
8+
<PackageReference Include="Google.Protobuf" Version="3.22.0" />
9+
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.51.0" />
10+
<PackageReference Include="Grpc.Tools" Version="2.51.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>

‎SimpleStockTickerSample/grpc/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.ClientConsole/TraderSys.SimpleStockTickerServer.ClientConsole.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<ProjectReference Include="..\TraderSys.SimpleStockTickerServer.Client\TraderSys.SimpleStockTickerServer.Client.csproj" />
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Grpc.Net.Common" Version="2.40.0" />
13+
<PackageReference Include="Grpc.Net.Common" Version="2.51.0" />
1414
</ItemGroup>
1515

1616
</Project>

‎SimpleStockTickerSample/grpc/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer/TraderSys.SimpleStockTickerServer.csproj

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
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>
88
<Protobuf Include="Protos\simple_stock_ticker.proto" GrpcServices="Server" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Grpc.AspNetCore" Version="2.40.0" />
13-
<PackageReference Include="Grpc.Tools" Version="2.41.1" />
12+
<PackageReference Include="Grpc.AspNetCore" Version="2.51.0" />
13+
<PackageReference Include="Grpc.Tools" Version="2.51.0">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
1417
</ItemGroup>
1518

1619
<ItemGroup>

‎SimpleStockTickerSample/grpc/SimpleStockTicker/src/TraderSys.StockMarket/TraderSys.StockMarket.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

77
</Project>

0 commit comments

Comments
 (0)