Skip to content

Commit ca9b756

Browse files
JamesNKJamesNK
authored
Update to use Directory.Packages.props (#2315)
1 parent 4a60f41 commit ca9b756

File tree

97 files changed

+369
-326
lines changed

Some content is hidden

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

97 files changed

+369
-326
lines changed

‎Directory.Build.props‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<Project>
2-
<Import Project="build\sources.props" />
3-
<Import Project="build\dependencies.props" />
42
<Import Project="build\version.props" />
53

64
<PropertyGroup>

‎Directory.Build.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<ItemGroup Condition="'$(IsGrpcPublishedPackage)' == 'true'">
2727
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
2828

29-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersPackageVersion)" PrivateAssets="All" />
30-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" />
29+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="All" />
30+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
3131
</ItemGroup>
3232

3333
<!--

‎Directory.Packages.props‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<MicrosoftAspNetCoreAppPackageVersion>8.0.0</MicrosoftAspNetCoreAppPackageVersion>
5+
<MicrosoftAspNetCoreApp7PackageVersion>7.0.5</MicrosoftAspNetCoreApp7PackageVersion>
6+
<MicrosoftAspNetCoreApp6PackageVersion>6.0.11</MicrosoftAspNetCoreApp6PackageVersion>
7+
<GrpcDotNetPackageVersion>2.58.0</GrpcDotNetPackageVersion>
8+
<OpenTelemetryPackageVersion>1.6.0</OpenTelemetryPackageVersion>
9+
<OpenTelemetryIntergationPackageVersion>1.6.0-beta.2</OpenTelemetryIntergationPackageVersion>
10+
<MicrosoftExtensionsPackageVersion>8.0.0</MicrosoftExtensionsPackageVersion>
11+
<MicrosoftExtensions6PackageVersion>6.0.0</MicrosoftExtensions6PackageVersion>
12+
</PropertyGroup>
13+
<ItemGroup>
14+
<!-- ASP.NET Core -->
15+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
16+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
17+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
18+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Certificate" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
19+
<PackageVersion Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
20+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
21+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
22+
<PackageVersion Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
23+
<PackageVersion Include="Microsoft.AspNetCore.Grpc.Swagger" Version="0.8.0" />
24+
25+
<!-- Extensions -->
26+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsPackageVersion)" />
27+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsPackageVersion)" />
28+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsPackageVersion)" />
29+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsPackageVersion)" />
30+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsPackageVersion)" />
31+
32+
<!-- gRPC -->
33+
<PackageVersion Include="Grpc.Tools" Version="2.59.0" />
34+
<PackageVersion Include="Grpc.Core" Version="2.46.6" />
35+
<PackageVersion Include="Grpc.Core.Api" Version="$(GrpcDotNetPackageVersion)"/>
36+
<PackageVersion Include="Grpc.Net.Client" Version="$(GrpcDotNetPackageVersion)" />
37+
<PackageVersion Include="Grpc.Net.Client.Web" Version="$(GrpcDotNetPackageVersion)" />
38+
<PackageVersion Include="Grpc.Net.ClientFactory" Version="$(GrpcDotNetPackageVersion)" />
39+
<PackageVersion Include="Grpc.AspNetCore" Version="$(GrpcDotNetPackageVersion)" />
40+
<PackageVersion Include="Grpc.AspNetCore.Server" Version="$(GrpcDotNetPackageVersion)" />
41+
<PackageVersion Include="Grpc.AspNetCore.Web" Version="$(GrpcDotNetPackageVersion)" />
42+
<PackageVersion Include="Grpc.Reflection" Version="$(GrpcDotNetPackageVersion)" />
43+
<PackageVersion Include="Grpc.AspNetCore.Server.Reflection" Version="$(GrpcDotNetPackageVersion)" />
44+
<PackageVersion Include="Grpc.HealthCheck" Version="$(GrpcDotNetPackageVersion)" />
45+
<PackageVersion Include="Grpc.AspNetCore.HealthChecks" Version="$(GrpcDotNetPackageVersion)" />
46+
<PackageVersion Include="Grpc.Auth" Version="$(GrpcDotNetPackageVersion)" />
47+
48+
<!-- OpenTelemetry -->
49+
<PackageVersion Include="OpenTelemetry" Version="$(OpenTelemetryPackageVersion)" />
50+
<PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="$(OpenTelemetryPackageVersion)" />
51+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryPackageVersion)" />
52+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="$(OpenTelemetryIntergationPackageVersion)" />
53+
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="$(OpenTelemetryIntergationPackageVersion)" />
54+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryIntergationPackageVersion)" />
55+
56+
<!-- Other -->
57+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
58+
<PackageVersion Include="CommandLineParser" Version="2.5.0" />
59+
<PackageVersion Include="Google.Apis.Auth" Version="1.46.0" />
60+
<PackageVersion Include="Google.Protobuf" Version="3.24.0" />
61+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.5.5" />
62+
<PackageVersion Include="Microsoft.Build" Version="16.9.0" />
63+
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23472.1" />
64+
<PackageVersion Include="Microsoft.Crank.EventSources" Version="0.2.0-alpha.21255.1" />
65+
<PackageVersion Include="Microsoft.Extensions.Logging.Testing" Version="2.1.1" />
66+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
67+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
68+
<PackageVersion Include="Microsoft.Win32.Registry" Version="4.6.0" />
69+
<PackageVersion Include="Moq" Version="4.16.1" />
70+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
71+
<PackageVersion Include="Nunit" Version="3.13.3" />
72+
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
73+
<PackageVersion Include="protobuf-net.Grpc.AspNetCore" Version="1.0.140" />
74+
<PackageVersion Include="protobuf-net.Grpc" Version="1.0.140" />
75+
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
76+
<PackageVersion Include="System.CommandLine.Rendering" Version="0.4.0-alpha.22272.1" />
77+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
78+
<PackageVersion Include="System.IO.Pipelines" Version="5.0.1" />
79+
<PackageVersion Include="System.Memory" Version="4.5.3" />
80+
<PackageVersion Include="System.Net.Http.WinHttpHandler" Version="7.0.0" />
81+
<PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" />
82+
<PackageVersion Include="System.Threading.Channels" Version="4.6.0" />
83+
</ItemGroup>
84+
</Project>

‎build/dependencies.props‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎build/sources.props‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎examples/Aggregator/Client/Client.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<Protobuf Include="..\Proto\greet.proto" GrpcServices="None" Link="Protos\greet.proto"/>
1111
<Protobuf Include="..\Proto\count.proto" GrpcServices="None" Link="Protos\count.proto"/>
1212

13-
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
14-
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcDotNetPackageVersion)" />
15-
<PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" PrivateAssets="All" />
13+
<PackageReference Include="Google.Protobuf" />
14+
<PackageReference Include="Grpc.Net.Client" />
15+
<PackageReference Include="Grpc.Tools" PrivateAssets="All" />
1616
</ItemGroup>
1717

1818
</Project>

‎examples/Aggregator/Server/Program.cs‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,23 @@
2828

2929
if (bool.TryParse(builder.Configuration["EnableOpenTelemetry"], out var enableOpenTelemetry) && enableOpenTelemetry)
3030
{
31-
builder.Services.AddOpenTelemetryTracing(telemetry =>
32-
{
33-
telemetry.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("aggregator"));
34-
telemetry.AddZipkinExporter();
35-
telemetry.AddGrpcClientInstrumentation();
36-
telemetry.AddHttpClientInstrumentation();
37-
telemetry.AddAspNetCoreInstrumentation();
38-
});
31+
builder.Services.AddOpenTelemetry()
32+
.WithTracing(tracing =>
33+
{
34+
tracing.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("aggregator"));
35+
36+
if (builder.Environment.IsDevelopment())
37+
{
38+
// We want to view all traces in development
39+
tracing.SetSampler(new AlwaysOnSampler());
40+
}
41+
42+
tracing.AddAspNetCoreInstrumentation()
43+
.AddGrpcClientInstrumentation()
44+
.AddHttpClientInstrumentation();
45+
46+
tracing.AddZipkinExporter();
47+
});
3948
}
4049

4150
// These clients will call back to the server

‎examples/Aggregator/Server/Server.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<Protobuf Include="..\Proto\greet.proto" GrpcServices="Both" Link="Protos\greet.proto" />
1010
<Protobuf Include="..\Proto\count.proto" GrpcServices="Both" Link="Protos\count.proto" />
1111

12-
<PackageReference Include="Grpc.AspNetCore" Version="$(GrpcDotNetPackageVersion)" />
12+
<PackageReference Include="Grpc.AspNetCore" />
1313

14-
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="$(OpenTelemetryPackageVersion)" />
15-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryIntergationPackageVersion)" />
16-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="$(OpenTelemetryIntergationPackageVersion)" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="$(OpenTelemetryIntergationPackageVersion)" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryIntergationPackageVersion)" />
14+
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" />
15+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
16+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
1919
</ItemGroup>
2020

2121
</Project>

‎examples/Blazor/Client/Client.csproj‎

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

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
9-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="all" />
8+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" />
9+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" PrivateAssets="all" />
1010

11-
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
12-
<PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" PrivateAssets="All" />
13-
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcDotNetPackageVersion)" />
14-
<PackageReference Include="Grpc.Net.Client.Web" Version="$(GrpcDotNetPackageVersion)" />
11+
<PackageReference Include="Google.Protobuf" />
12+
<PackageReference Include="Grpc.Tools" PrivateAssets="All" />
13+
<PackageReference Include="Grpc.Net.Client" />
14+
<PackageReference Include="Grpc.Net.Client.Web" />
1515

1616
<Protobuf Include="..\Proto\weather.proto" GrpcServices="Client" Link="Protos\weather.proto" Access="Internal" />
1717
<Protobuf Include="..\Proto\count.proto" GrpcServices="Client" Link="Protos\count.proto" Access="Internal" />

‎examples/Blazor/Server/Server.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<Protobuf Include="..\Proto\weather.proto" GrpcServices="Server" Link="Protos\weather.proto" />
1010
<Protobuf Include="..\Proto\count.proto" GrpcServices="Server" Link="Protos\count.proto" />
1111

12-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
13-
<PackageReference Include="Grpc.AspNetCore" Version="$(GrpcDotNetPackageVersion)" />
14-
<PackageReference Include="Grpc.AspNetCore.Web" Version="$(GrpcDotNetPackageVersion)" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
13+
<PackageReference Include="Grpc.AspNetCore" />
14+
<PackageReference Include="Grpc.AspNetCore.Web" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

0 commit comments

Comments
 (0)