File tree Expand file tree Collapse file tree 10 files changed +21
-11
lines changed Expand file tree Collapse file tree 10 files changed +21
-11
lines changed Original file line number Diff line number Diff line change 33
33
//////////////////////////////////////////////////////////////////////
34
34
bool publishingError = false ;
35
35
36
-
37
36
///////////////////////////////////////////////////////////////////////////////
38
37
// SETUP / TEARDOWN
39
38
///////////////////////////////////////////////////////////////////////////////
Original file line number Diff line number Diff line change @@ -131,7 +131,16 @@ public class BuildParameters
131
131
132
132
if ( ! IsRunningOnWindows )
133
133
{
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 + "/" ;
135
144
136
145
// Use FrameworkPathOverride when not running on Windows.
137
146
context . Information ( "Build will use FrameworkPathOverride={0} since not building on Windows." , frameworkPathOverride ) ;
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ GitVersion GetVersion(BuildParameters parameters)
45
45
46
46
var gitVersion = GitVersion ( settings ) ;
47
47
48
- if ( ! ( parameters . IsRunningOnAzurePipeline && parameters . IsPullRequest ) )
48
+ if ( ! parameters . IsLocalBuild && ! ( parameters . IsRunningOnAzurePipeline && parameters . IsPullRequest ) )
49
49
{
50
50
settings . UpdateAssemblyInfo = true ;
51
51
settings . LogFilePath = "console" ;
Original file line number Diff line number Diff line change 15
15
</PropertyGroup >
16
16
<PropertyGroup >
17
17
<PackageVersion_GitToolsCore >1.3.1</PackageVersion_GitToolsCore >
18
+ <PackageVersion_JetBrainsAnnotations >2018.2.1</PackageVersion_JetBrainsAnnotations >
18
19
<PackageVersion_YamlDotNet >5.2.1</PackageVersion_YamlDotNet >
19
20
<PackageVersion_LibGit2SharpNativeBinaries >[1.0.185]</PackageVersion_LibGit2SharpNativeBinaries >
20
21
</PropertyGroup >
Original file line number Diff line number Diff line change 1
- <Project Sdk =" Microsoft.NET.Sdk" >
1
+ <Project Sdk =" Microsoft.NET.Sdk" >
2
2
3
3
<PropertyGroup >
4
4
<TargetFramework >net461</TargetFramework >
15
15
<PackageReference Include =" FluentDateTime" Version =" 1.15.0" />
16
16
<PackageReference Include =" GitTools.Core" Version =" $(PackageVersion_GitToolsCore)" />
17
17
<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 >
19
19
<PackageReference Include =" NSubstitute" Version =" 3.1.0" />
20
20
<PackageReference Include =" coverlet.msbuild" Version =" 2.3.1" >
21
21
<PrivateAssets >all</PrivateAssets >
Original file line number Diff line number Diff line change 1
- <Project Sdk =" Microsoft.NET.Sdk" >
1
+ <Project Sdk =" Microsoft.NET.Sdk" >
2
2
3
3
<PropertyGroup >
4
4
<TargetFrameworks >net461;netstandard2.0</TargetFrameworks >
20
20
21
21
<ItemGroup >
22
22
<PackageReference Include =" GitTools.Core" Version =" $(PackageVersion_GitToolsCore)" />
23
+ <PackageReference Include =" JetBrains.Annotations" Version =" $(PackageVersion_JetBrainsAnnotations)" ></PackageReference >
23
24
<PackageReference Include =" YamlDotNet" Version =" $(PackageVersion_YamlDotNet)" />
24
25
<PackageReference Include =" LibGit2Sharp.NativeBinaries" Version =" $(PackageVersion_LibGit2SharpNativeBinaries)" PrivateAssets =" contentFiles" />
25
26
</ItemGroup >
Original file line number Diff line number Diff line change 1
- <Project Sdk =" Microsoft.NET.Sdk" >
1
+ <Project Sdk =" Microsoft.NET.Sdk" >
2
2
<PropertyGroup >
3
3
<TargetFramework >net461</TargetFramework >
4
4
<GenerateAssemblyInfo >false</GenerateAssemblyInfo >
8
8
<PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 15.9.0" />
9
9
<PackageReference Include =" GitTools.Core" Version =" $(PackageVersion_GitToolsCore)" ></PackageReference >
10
10
<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 >
12
12
<PackageReference Include =" Mono.Cecil" Version =" 0.10.1" ></PackageReference >
13
13
<PackageReference Include =" Newtonsoft.Json" Version =" 11.0.2" />
14
14
<PackageReference Include =" NSubstitute" Version =" 3.1.0" ></PackageReference >
Original file line number Diff line number Diff line change 18
18
19
19
<ItemGroup Condition =" '$(TargetFramework)'=='net461'" >
20
20
<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 >
22
22
</ItemGroup >
23
23
24
24
<ItemGroup >
Original file line number Diff line number Diff line change 1
- <Project Sdk =" Microsoft.NET.Sdk" >
1
+ <Project Sdk =" Microsoft.NET.Sdk" >
2
2
<PropertyGroup >
3
3
<TargetFramework >net461</TargetFramework >
4
4
<GenerateAssemblyInfo >false</GenerateAssemblyInfo >
8
8
<PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 15.9.0" />
9
9
<PackageReference Include =" FluentDateTime" Version =" 1.15.0" ></PackageReference >
10
10
<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 >
12
12
<PackageReference Include =" Microsoft.CodeAnalysis.CSharp" Version =" 2.8.2" ></PackageReference >
13
13
<PackageReference Include =" Microsoft.CodeAnalysis.VisualBasic" Version =" 2.8.2" ></PackageReference >
14
14
<PackageReference Include =" Newtonsoft.Json" Version =" 11.0.2" ></PackageReference >
You can’t perform that action at this time.
0 commit comments