From 255889f84a4b93c3ac74c9911d4a4c939d723971 Mon Sep 17 00:00:00 2001
From: Alan West <3676547+alanwest@users.noreply.github.com>
Date: Fri, 4 Sep 2020 13:25:59 -0700
Subject: [PATCH] Centralize package versions for example projects (#1230)

Co-authored-by: Cijo Thomas <cithomas@microsoft.com>
---
 build/Common.nonprod.props                           | 12 +++++++++++-
 examples/AspNetCore/Examples.AspNetCore.csproj       |  2 +-
 examples/Console/Examples.Console.csproj             | 10 +++++-----
 examples/GrpcService/Examples.GrpcService.csproj     |  2 +-
 examples/MicroserviceExample/Utils/Utils.csproj      |  4 ++--
 examples/MicroserviceExample/WebApi/WebApi.csproj    |  2 +-
 .../WorkerService/WorkerService.csproj               |  4 ++--
 7 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/build/Common.nonprod.props b/build/Common.nonprod.props
index 79012c368..e08926ba1 100644
--- a/build/Common.nonprod.props
+++ b/build/Common.nonprod.props
@@ -17,17 +17,27 @@
     </Content>
   </ItemGroup>
 
-  <PropertyGroup Label="Package versions used in by test projects">
+  <PropertyGroup Label="Package versions used by test and example projects">
     <!--
       Please sort alphabetically.
       Refer to https://docs.microsoft.com/en-us/nuget/concepts/package-versioning for semver syntax.
     -->
     <BenchmarkDotNetPkgVer>[0.12.1,0.13)</BenchmarkDotNetPkgVer>
+    <CommandLineParserPkgVer>[2.3.0,3.0)</CommandLineParserPkgVer>
     <DotNetXUnitCliVer>[2.3.1,3.0)</DotNetXUnitCliVer>
+    <GoogleProtobufPkgVer>[3.13.0,4.0)</GoogleProtobufPkgVer>
+    <GrpcAspNetCorePkgVer>[2.27.0,3.0)</GrpcAspNetCorePkgVer>
+    <GrpcNetClientPkgVer>[2.27.0,3.0)</GrpcNetClientPkgVer>
+    <GrpcToolsPkgVer>[2.25.0,3.0)</GrpcToolsPkgVer>
+    <MicrosoftExtensionsHostingPkgVer>[3.1.6,5.0)</MicrosoftExtensionsHostingPkgVer>
     <MicrosoftExtensionsLoggingPkgVer>[5.0.0-preview.8.20407.11]</MicrosoftExtensionsLoggingPkgVer>
+    <MicrosoftExtensionsLoggingAbstractionsPkgVer>[5.0.0-preview.8.20407.11]</MicrosoftExtensionsLoggingAbstractionsPkgVer>
     <MicrosoftExtensionsLoggingConsolePkgVer>[5.0.0-preview.8.20407.11]</MicrosoftExtensionsLoggingConsolePkgVer>
     <MicrosoftNETTestSdkPkgVer>[16.7.1,17.0)</MicrosoftNETTestSdkPkgVer>
     <MoqPkgVer>[4.14.5,5.0)</MoqPkgVer>
+    <RabbitMQClientPkgVer>[6.1.0,7.0)</RabbitMQClientPkgVer>
+    <StackExchangeRedisPkgVer>[2.1.58,3.0)</StackExchangeRedisPkgVer>
+    <SwashbuckleAspNetCorePkgVer>[5.0.0-rc5]</SwashbuckleAspNetCorePkgVer>
     <XUnitRunnerVisualStudioPkgVer>[2.4.3,3.0)</XUnitRunnerVisualStudioPkgVer>
     <XUnitPkgVer>[2.4.1,3.0)</XUnitPkgVer>
   </PropertyGroup>
diff --git a/examples/AspNetCore/Examples.AspNetCore.csproj b/examples/AspNetCore/Examples.AspNetCore.csproj
index b9b245861..9df233799 100644
--- a/examples/AspNetCore/Examples.AspNetCore.csproj
+++ b/examples/AspNetCore/Examples.AspNetCore.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc5" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleAspNetCorePkgVer)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/Console/Examples.Console.csproj b/examples/Console/Examples.Console.csproj
index 6f7174497..9b82b8783 100644
--- a/examples/Console/Examples.Console.csproj
+++ b/examples/Console/Examples.Console.csproj
@@ -11,14 +11,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.3.0" />
-    <PackageReference Include="Google.Protobuf" Version="3.13.0" />
-    <PackageReference Include="Grpc.Net.Client" Version="2.27.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.25.0">
+    <PackageReference Include="CommandLineParser" Version="$(CommandLineParserPkgVer)" />
+    <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPkgVer)" />
+    <PackageReference Include="Grpc.Net.Client" Version="$(GrpcNetClientPkgVer)" />
+    <PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPkgVer)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="StackExchange.Redis" Version="2.1.58" />
+    <PackageReference Include="StackExchange.Redis" Version="$(StackExchangeRedisPkgVer)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/GrpcService/Examples.GrpcService.csproj b/examples/GrpcService/Examples.GrpcService.csproj
index 426131711..adef4b550 100644
--- a/examples/GrpcService/Examples.GrpcService.csproj
+++ b/examples/GrpcService/Examples.GrpcService.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.27.0" />
+    <PackageReference Include="Grpc.AspNetCore" Version="$(GrpcAspNetCorePkgVer)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/MicroserviceExample/Utils/Utils.csproj b/examples/MicroserviceExample/Utils/Utils.csproj
index 802f80ea5..e042c91c5 100644
--- a/examples/MicroserviceExample/Utils/Utils.csproj
+++ b/examples/MicroserviceExample/Utils/Utils.csproj
@@ -4,8 +4,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.6" />
-    <PackageReference Include="RabbitMQ.Client" Version="6.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPkgVer)" />
+    <PackageReference Include="RabbitMQ.Client" Version="$(RabbitMQClientPkgVer)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/MicroserviceExample/WebApi/WebApi.csproj b/examples/MicroserviceExample/WebApi/WebApi.csproj
index 2784b89fa..7d6c76474 100644
--- a/examples/MicroserviceExample/WebApi/WebApi.csproj
+++ b/examples/MicroserviceExample/WebApi/WebApi.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RabbitMQ.Client" Version="6.1.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="$(RabbitMQClientPkgVer)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/MicroserviceExample/WorkerService/WorkerService.csproj b/examples/MicroserviceExample/WorkerService/WorkerService.csproj
index 906665aba..8c3d83faf 100644
--- a/examples/MicroserviceExample/WorkerService/WorkerService.csproj
+++ b/examples/MicroserviceExample/WorkerService/WorkerService.csproj
@@ -4,8 +4,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.6" />
-    <PackageReference Include="RabbitMQ.Client" Version="6.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingPkgVer)" />
+    <PackageReference Include="RabbitMQ.Client" Version="$(RabbitMQClientPkgVer)" />
   </ItemGroup>
 
   <ItemGroup>