From cc6f59f3d7e27ab4f765a735e47f4908d3a884fc Mon Sep 17 00:00:00 2001
From: Artur Stolear <arturcic@gmail.com>
Date: Wed, 4 Mar 2020 15:26:03 +0200
Subject: [PATCH 1/2] (GH-2153) made all Microsoft.Extensions.* packages share
 the same version

---
 src/Directory.Build.props                                | 1 +
 src/GitVersionCore.Tests/GitVersionCore.Tests.csproj     | 4 ++--
 src/GitVersionCore/GitVersionCore.csproj                 | 4 ++--
 src/GitVersionExe/GitVersionExe.csproj                   | 2 +-
 src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj | 2 +-
 src/GitVersionTask.Tests/GitVersionTask.Tests.csproj     | 2 +-
 src/GitVersionTask/GitVersionTask.csproj                 | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 881a98aefd..8b44ed7e3e 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -22,6 +22,7 @@
         <PackageVersion_JetBrainsAnnotations>2019.1.3</PackageVersion_JetBrainsAnnotations>
         <PackageVersion_YamlDotNet>8.1.0</PackageVersion_YamlDotNet>
         <PackageVersion_NewtonsoftJson>12.0.3</PackageVersion_NewtonsoftJson>
+        <PackageVersion_MicrosoftExtensions>3.1.2</PackageVersion_MicrosoftExtensions>
 
         <PackageVersion_MicrosoftTestSdk>16.5.0</PackageVersion_MicrosoftTestSdk>
         <PackageVersion_NSubstitute>4.2.1</PackageVersion_NSubstitute>
diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
index af29b4fb8f..edc99e979c 100644
--- a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
+++ b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
@@ -14,8 +14,8 @@
         <PackageReference Include="FluentDateTime" Version="2.0.0" />
         <PackageReference Include="GitTools.Testing" Version="1.2.0" />
         <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.2" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="$(PackageVersion_MicrosoftExtensions)" />
         <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
     </ItemGroup>
     <ItemGroup>
diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj
index 825087dcad..e4b91571e3 100644
--- a/src/GitVersionCore/GitVersionCore.csproj
+++ b/src/GitVersionCore/GitVersionCore.csproj
@@ -18,8 +18,8 @@
     <ItemGroup>
         <PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
         <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.2" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(PackageVersion_MicrosoftExtensions)" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="$(PackageVersion_MicrosoftExtensions)" />
         <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
     </ItemGroup>
 
diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj
index 4afa367184..cb5e627129 100644
--- a/src/GitVersionExe/GitVersionExe.csproj
+++ b/src/GitVersionExe/GitVersionExe.csproj
@@ -29,7 +29,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.2" />
+      <PackageReference Include="Microsoft.Extensions.Hosting" Version="$(PackageVersion_MicrosoftExtensions)" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj b/src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj
index 979e5d2b0b..c3384e8235 100644
--- a/src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj
+++ b/src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
         <LangVersion>8.0</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
index e76eae491a..19ecf491fe 100644
--- a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
+++ b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -8,7 +8,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.4.0" />
         <PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />
     </ItemGroup>
     <ItemGroup>
         <Content Include="Approved\**\*.txt" />
diff --git a/src/GitVersionTask/GitVersionTask.csproj b/src/GitVersionTask/GitVersionTask.csproj
index 6fe670bf32..5978c500a2 100644
--- a/src/GitVersionTask/GitVersionTask.csproj
+++ b/src/GitVersionTask/GitVersionTask.csproj
@@ -14,7 +14,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" PrivateAssets="All" />
         <PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" PrivateAssets="All" />
     </ItemGroup>
 

From 042068e8fcabe1350c3698781ff17e3c0fe4af6e Mon Sep 17 00:00:00 2001
From: Artur Stolear <arturcic@gmail.com>
Date: Wed, 4 Mar 2020 18:14:01 +0200
Subject: [PATCH 2/2] (GH-2153) (build) downgrade to Microsoft.Extension.*
 3.0.0

---
 src/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 8b44ed7e3e..3cd62b92ac 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -22,7 +22,7 @@
         <PackageVersion_JetBrainsAnnotations>2019.1.3</PackageVersion_JetBrainsAnnotations>
         <PackageVersion_YamlDotNet>8.1.0</PackageVersion_YamlDotNet>
         <PackageVersion_NewtonsoftJson>12.0.3</PackageVersion_NewtonsoftJson>
-        <PackageVersion_MicrosoftExtensions>3.1.2</PackageVersion_MicrosoftExtensions>
+        <PackageVersion_MicrosoftExtensions>3.0.0</PackageVersion_MicrosoftExtensions>
 
         <PackageVersion_MicrosoftTestSdk>16.5.0</PackageVersion_MicrosoftTestSdk>
         <PackageVersion_NSubstitute>4.2.1</PackageVersion_NSubstitute>