Skip to content

Commit 7ce6a9b

Browse files
arturcicarturcic
committed
Moved JetBrains.Annotation package reference to Directory.Build.props
1 parent 672f23a commit 7ce6a9b

File tree

10 files changed

+21
-11
lines changed

10 files changed

+21
-11
lines changed

‎build.cake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
//////////////////////////////////////////////////////////////////////
3434
bool publishingError = false;
3535

36-
3736
///////////////////////////////////////////////////////////////////////////////
3837
// SETUP / TEARDOWN
3938
///////////////////////////////////////////////////////////////////////////////

‎build/parameters.cake

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,16 @@ public class BuildParameters
131131

132132
if(!IsRunningOnWindows)
133133
{
134-
var frameworkPathOverride = new FilePath(typeof(object).Assembly.Location).GetDirectory().FullPath + "/";
134+
var frameworkPathOverride = context.Environment.Runtime.IsCoreClr
135+
? new []{
136+
new DirectoryPath("/Library/Frameworks/Mono.framework/Versions/Current/lib/mono"),
137+
new DirectoryPath("/usr/lib/mono"),
138+
new DirectoryPath("/usr/local/lib/mono")
139+
}
140+
.Select(directory =>directory.Combine("4.5"))
141+
.FirstOrDefault(directory => context.DirectoryExists(directory))
142+
?.FullPath + "/"
143+
: new FilePath(typeof(object).Assembly.Location).GetDirectory().FullPath + "/";
135144

136145
// Use FrameworkPathOverride when not running on Windows.
137146
context.Information("Build will use FrameworkPathOverride={0} since not building on Windows.", frameworkPathOverride);

‎build/utils.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ GitVersion GetVersion(BuildParameters parameters)
4545

4646
var gitVersion = GitVersion(settings);
4747

48-
if (!(parameters.IsRunningOnAzurePipeline && parameters.IsPullRequest))
48+
if (!parameters.IsLocalBuild && !(parameters.IsRunningOnAzurePipeline && parameters.IsPullRequest))
4949
{
5050
settings.UpdateAssemblyInfo = true;
5151
settings.LogFilePath = "console";

‎src/.nuget/NuGet.exe

-1.59 MB
Binary file not shown.

‎src/Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
</PropertyGroup>
1616
<PropertyGroup>
1717
<PackageVersion_GitToolsCore>1.3.1</PackageVersion_GitToolsCore>
18+
<PackageVersion_JetBrainsAnnotations>2018.2.1</PackageVersion_JetBrainsAnnotations>
1819
<PackageVersion_YamlDotNet>5.2.1</PackageVersion_YamlDotNet>
1920
<PackageVersion_LibGit2SharpNativeBinaries>[1.0.185]</PackageVersion_LibGit2SharpNativeBinaries>
2021
</PropertyGroup>

‎src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

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

33
<PropertyGroup>
44
<TargetFramework>net461</TargetFramework>
@@ -15,7 +15,7 @@
1515
<PackageReference Include="FluentDateTime" Version="1.15.0" />
1616
<PackageReference Include="GitTools.Core" Version="$(PackageVersion_GitToolsCore)" />
1717
<PackageReference Include="GitTools.Testing" Version="1.2.0" />
18-
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
18+
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
1919
<PackageReference Include="NSubstitute" Version="3.1.0" />
2020
<PackageReference Include="coverlet.msbuild" Version="2.3.1">
2121
<PrivateAssets>all</PrivateAssets>

‎src/GitVersionCore/GitVersionCore.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
@@ -20,6 +20,7 @@
2020

2121
<ItemGroup>
2222
<PackageReference Include="GitTools.Core" Version="$(PackageVersion_GitToolsCore)" />
23+
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
2324
<PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
2425
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2SharpNativeBinaries)" PrivateAssets="contentFiles" />
2526
</ItemGroup>

‎src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net461</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -8,7 +8,7 @@
88
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
99
<PackageReference Include="GitTools.Core" Version="$(PackageVersion_GitToolsCore)"></PackageReference>
1010
<PackageReference Include="GitTools.Testing" Version="1.2.0"></PackageReference>
11-
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1"></PackageReference>
11+
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
1212
<PackageReference Include="Mono.Cecil" Version="0.10.1"></PackageReference>
1313
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1414
<PackageReference Include="NSubstitute" Version="3.1.0"></PackageReference>

‎src/GitVersionExe/GitVersionExe.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup Condition="'$(TargetFramework)'=='net461'">
2020
<PackageReference Include="GitTools.Core" Version="$(PackageVersion_GitToolsCore)" />
21-
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1"></PackageReference>
21+
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net461</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -8,7 +8,7 @@
88
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
99
<PackageReference Include="FluentDateTime" Version="1.15.0"></PackageReference>
1010
<PackageReference Include="GitTools.Core" Version="$(PackageVersion_GitToolsCore)"></PackageReference>
11-
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1"></PackageReference>
11+
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
1212
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.8.2"></PackageReference>
1313
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.8.2"></PackageReference>
1414
<PackageReference Include="Newtonsoft.Json" Version="11.0.2"></PackageReference>

0 commit comments

Comments
 (0)