Moved JetBrains.Annotation package reference to Directory.Build.props

Author: arturcic

build.cake

@@ -33,7 +33,6 @@
 //////////////////////////////////////////////////////////////////////
 bool publishingError = false;
 
-
 ///////////////////////////////////////////////////////////////////////////////
 // SETUP / TEARDOWN
 ///////////////////////////////////////////////////////////////////////////////

build/parameters.cake

@@ -131,7 +131,16 @@ public class BuildParameters
 
         if(!IsRunningOnWindows)
         {
-            var frameworkPathOverride = new FilePath(typeof(object).Assembly.Location).GetDirectory().FullPath + "/";
+            var frameworkPathOverride = context.Environment.Runtime.IsCoreClr
+                                        ?   new []{
+                                                new DirectoryPath("/Library/Frameworks/Mono.framework/Versions/Current/lib/mono"),
+                                                new DirectoryPath("/usr/lib/mono"),
+                                                new DirectoryPath("/usr/local/lib/mono")
+                                            }
+                                            .Select(directory =>directory.Combine("4.5"))
+                                            .FirstOrDefault(directory => context.DirectoryExists(directory))
+                                            ?.FullPath + "/"
+                                        : new FilePath(typeof(object).Assembly.Location).GetDirectory().FullPath + "/";
 
             // Use FrameworkPathOverride when not running on Windows.
             context.Information("Build will use FrameworkPathOverride={0} since not building on Windows.", frameworkPathOverride);

build/utils.cake

@@ -45,7 +45,7 @@ GitVersion GetVersion(BuildParameters parameters)
 
     var gitVersion = GitVersion(settings);
 
-    if (!(parameters.IsRunningOnAzurePipeline && parameters.IsPullRequest))
+    if (!parameters.IsLocalBuild && !(parameters.IsRunningOnAzurePipeline && parameters.IsPullRequest))
     {
         settings.UpdateAssemblyInfo = true;
         settings.LogFilePath = "console";

src/.nuget/NuGet.exe

@@ -15,6 +15,7 @@
  </PropertyGroup>
  <PropertyGroup>
     <PackageVersion_GitToolsCore>1.3.1</PackageVersion_GitToolsCore>
+    <PackageVersion_JetBrainsAnnotations>2018.2.1</PackageVersion_JetBrainsAnnotations>
     <PackageVersion_YamlDotNet>5.2.1</PackageVersion_YamlDotNet>
     <PackageVersion_LibGit2SharpNativeBinaries>[1.0.185]</PackageVersion_LibGit2SharpNativeBinaries>
  </PropertyGroup>

src/Directory.Build.props

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
@@ -15,7 +15,7 @@
     <PackageReference Include="FluentDateTime" Version="1.15.0" />
     <PackageReference Include="GitTools.Core" Version="$(PackageVersion_GitToolsCore)" />
     <PackageReference Include="GitTools.Testing" Version="1.2.0" />
-    <PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
+    <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
     <PackageReference Include="NSubstitute" Version="3.1.0" />
     <PackageReference Include="coverlet.msbuild" Version="2.3.1">
       <PrivateAssets>all</PrivateAssets>

src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
@@ -20,6 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="GitTools.Core" Version="$(PackageVersion_GitToolsCore)" />
+    <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
     <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
     <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2SharpNativeBinaries)" PrivateAssets="contentFiles" />
   </ItemGroup>

src/GitVersionCore/GitVersionCore.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -8,7 +8,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="GitTools.Core" Version="$(PackageVersion_GitToolsCore)"></PackageReference>
     <PackageReference Include="GitTools.Testing" Version="1.2.0"></PackageReference>
-    <PackageReference Include="JetBrains.Annotations" Version="2018.2.1"></PackageReference>
+    <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
     <PackageReference Include="Mono.Cecil" Version="0.10.1"></PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NSubstitute" Version="3.1.0"></PackageReference>

src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

@@ -18,7 +18,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)'=='net461'">
     <PackageReference Include="GitTools.Core" Version="$(PackageVersion_GitToolsCore)" />
-    <PackageReference Include="JetBrains.Annotations" Version="2018.2.1"></PackageReference>
+    <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
   </ItemGroup>
 
   <ItemGroup>

src/GitVersionExe/GitVersionExe.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -8,7 +8,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="FluentDateTime" Version="1.15.0"></PackageReference>
     <PackageReference Include="GitTools.Core" Version="$(PackageVersion_GitToolsCore)"></PackageReference>
-    <PackageReference Include="JetBrains.Annotations" Version="2018.2.1"></PackageReference>
+    <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.8.2"></PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.8.2"></PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2"></PackageReference>