Skip to content

Commit 50b4253

Browse files
author
John Luo
committed
Wip
1 parent 1efc5b4 commit 50b4253

File tree

8 files changed

+27
-20
lines changed

8 files changed

+27
-20
lines changed

‎eng/Dependencies.props

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,13 @@ and are generated based on the last package release.
162162
<ItemGroup Label="External dependencies" Condition="'$(DotNetBuildFromSource)' != 'true'">
163163
<LatestPackageReference Include="AngleSharp" Version="$(AngleSharpPackageVersion)" />
164164
<LatestPackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" />
165+
<LatestPackageReference Include="CommandLineParser" Version="$(CommandLineParserPackageVersion)" />
165166
<LatestPackageReference Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" />
166-
<LatestPackageReference Include="Google.ProtoBuf" Version="$(GoogleProtoBufPackageVersion)" />
167+
<LatestPackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
168+
<LatestPackageReference Include="Grpc.AspNetCore" Version="$(GrpcAspNetCorePackageVersion)" />
169+
<LatestPackageReference Include="Grpc.Auth" Version="$(GrpcAuthPackageVersion)" />
170+
<LatestPackageReference Include="Grpc.Net.Client" Version="$(GrpcNetClientPackageVersion)" />
171+
<LatestPackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" />
167172
<LatestPackageReference Include="IdentityServer4" Version="$(IdentityServer4PackageVersion)" />
168173
<LatestPackageReference Include="IdentityServer4.AspNetIdentity" Version="$(IdentityServer4AspNetIdentityPackageVersion)" />
169174
<LatestPackageReference Include="IdentityServer4.EntityFramework" Version="$(IdentityServer4EntityFrameworkPackageVersion)" />

‎eng/Versions.props

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,13 @@
234234
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
235235
<BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
236236
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
237+
<CommandLineParserPackageVersion>2.3.0</CommandLineParserPackageVersion>
237238
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
238-
<GoogleProtobufPackageVersion>3.8.0</GoogleProtobufPackageVersion>
239+
<GoogleProtobufPackageVersion>3.10.0</GoogleProtobufPackageVersion>
239240
<GrpcAspNetCorePackageVersion>2.23.2</GrpcAspNetCorePackageVersion>
241+
<GrpcAuthPackageVersion>2.25.0</GrpcAuthPackageVersion>
242+
<GrpcNetClientPackageVersion>2.23.2</GrpcNetClientPackageVersion>
243+
<GrpcToolsPackageVersion>2.25.0</GrpcToolsPackageVersion>
240244
<IdentityServer4AspNetIdentityPackageVersion>3.0.0</IdentityServer4AspNetIdentityPackageVersion>
241245
<IdentityServer4EntityFrameworkPackageVersion>3.0.0</IdentityServer4EntityFrameworkPackageVersion>
242246
<IdentityServer4PackageVersion>3.0.0</IdentityServer4PackageVersion>

‎src/Grpc/test/InteropTests/InteropTests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
</ItemGroup>
1111

1212
<PropertyGroup>
13-
<InteropTestsAssestsDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\src\Grpc\test\testassets</InteropTestsAssestsDir>
13+
<InteropTestsAssestsDir>$(RepoRoot)src\Grpc\test\testassets</InteropTestsAssestsDir>
1414
</PropertyGroup>
1515

1616
<ItemGroup>
1717
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
1818
<_Parameter1>InteropTestsWebsiteDir</_Parameter1>
1919
<_Parameter2>$(InteropTestsAssestsDir)\InteropWebsite</_Parameter2>
2020
</AssemblyAttribute>
21-
21+
2222
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
2323
<_Parameter1>InteropTestsClientDir</_Parameter1>
2424
<_Parameter2>$(InteropTestsAssestsDir)\InteropClient</_Parameter2>

‎src/Grpc/test/testassets/Directory.Build.props

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
<Project>
2-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\eng\Versions.props" />
2+
<PropertyGroup>
3+
<IsTestAssetProject>true</IsTestAssetProject>
4+
</PropertyGroup>
5+
<!-- Skip the parent folder to prevent getting test package references. -->
6+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\..\, Directory.Build.props))\Directory.Build.props" />
37
</Project>

‎src/Grpc/test/testassets/Directory.Build.targets

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/Grpc/test/testassets/InteropClient/InteropClient.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
using Google.Protobuf;
3030
using Grpc.Auth;
3131
using Grpc.Core;
32-
using Grpc.Core.Utils;
3332
using Grpc.Net.Client;
3433
using Grpc.Testing;
3534
using Microsoft.Extensions.DependencyInjection;

‎src/Grpc/test/testassets/InteropClient/InteropClient.csproj

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

33
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp5.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
65
<Nullable>enable</Nullable>
76
<LangVersion>8.0</LangVersion>
8-
<IsUnitTestProject>false</IsUnitTestProject>
97
</PropertyGroup>
108

119
<ItemGroup>
@@ -14,13 +12,12 @@
1412
<Protobuf Include="..\Proto\grpc\testing\messages.proto" GrpcServices="None" Link="Protos\messages.proto" />
1513

1614
<FrameworkReference Include="Microsoft.AspNetCore.App" />
17-
18-
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcAspNetCorePackageVersion)" />
19-
20-
<PackageReference Include="CommandLineParser" Version="2.3.0" />
21-
<PackageReference Include="Google.Protobuf" Version="3.10.0" />
22-
<PackageReference Include="Grpc.Auth" Version="2.25.0" PrivateAssets="All" />
23-
<PackageReference Include="Grpc.Tools" Version="2.25.0" PrivateAssets="All" />
15+
16+
<Reference Include="Grpc.Net.Client" />
17+
<Reference Include="CommandLineParser" />
18+
<Reference Include="Google.Protobuf" />
19+
<Reference Include="Grpc.Auth" PrivateAssets="All" />
20+
<Reference Include="Grpc.Tools" PrivateAssets="All" />
2421
</ItemGroup>
2522

2623
</Project>

‎src/Grpc/test/testassets/InteropWebsite/InteropWebsite.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp5.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
66
<GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
77
<Nullable>enable</Nullable>
88
<LangVersion>8.0</LangVersion>
9-
<IsUnitTestProject>false</IsUnitTestProject>
109
</PropertyGroup>
1110

1211
<ItemGroup>
1312
<Protobuf Include="..\Proto\grpc\testing\test.proto" GrpcServices="Server" Link="Protos\test.proto" />
1413
<Protobuf Include="..\Proto\grpc\testing\empty.proto" GrpcServices="None" Link="Protos\empty.proto" />
1514
<Protobuf Include="..\Proto\grpc\testing\messages.proto" GrpcServices="None" Link="Protos\messages.proto" />
1615

17-
<PackageReference Include="Grpc.AspNetCore" Version="$(GrpcAspNetCorePackageVersion)" />
16+
<Reference Include="Grpc.AspNetCore" />
1817
</ItemGroup>
1918

2019
</Project>

0 commit comments

Comments
 (0)