(proj) target net472

arturcic · arturcic · commit 932119450d39 · 2019-07-31T15:26:12.000+03:00
diff --git a/build/pack.cake b/build/pack.cake
@@ -52,7 +52,7 @@ Task("Test")
                 CollectCoverage = true,
                 CoverletOutputFormat = CoverletOutputFormat.opencover,
                 CoverletOutputDirectory = parameters.Paths.Directories.TestCoverageOutput + "/",
-                CoverletOutputName = $"{project.GetFilenameWithoutExtension()}.coverage.xml"
+                CoverletOutputName = $"{project.GetFilenameWithoutExtension()}.{framework}.coverage.xml"
             };
 
             if (IsRunningOnUnix())
diff --git a/build/stages/common-steps.yml b/build/stages/common-steps.yml
@@ -5,5 +5,17 @@ steps:
     packageType: sdk
     version: 2.2.107
     installationPath: $(Agent.ToolsDirectory)/dotnet
+- task: CmdLine@2
+  condition: eq( variables['Agent.OS'], 'Darwin' )
+  displayName: 'Select Mono version'
+  inputs:
+    script: |
+      SYMLINK=5_18_1
+      MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
+      echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;]$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH"
+      echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
+      echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
+      sudo rm /Library/Frameworks/Mono.framework/Versions/Current
+      sudo ln -s $MONOPREFIX /Library/Frameworks/Mono.framework/Versions/Current
 - script: dotnet tool install --global Cake.Tool
   displayName: 'Install Cake tool'
diff --git a/build/utils/parameters.cake b/build/utils/parameters.cake
@@ -9,7 +9,7 @@ public class BuildParameters
     public string Configuration { get; private set; }
 
     public string CoreFxVersion { get; private set; } = "netcoreapp2.1";
-    public string FullFxVersion { get; private set; } = "net461";
+    public string FullFxVersion { get; private set; } = "net472";
 
     public string DockerDistro { get; private set; }
     public string DockerDotnetVersion { get; private set; }
diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 
     <DebugType>full</DebugType>
diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
     <RootNamespace>GitVersion</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <DocumentationFile>bin\$(Configuration)\GitVersionCore.xml</DocumentationFile>
diff --git a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj
@@ -4,15 +4,15 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>GitVersion</RootNamespace>
     <AssemblyName>GitVersion</AssemblyName>
-    <TargetFrameworks Condition=" '$(TargetFrameworks)' == '' ">net461;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(TargetFrameworks)' == '' ">net472;netcoreapp2.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <DocumentationFile>bin\$(Configuration)\GitVersion.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net461'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net472'">
     <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
   </ItemGroup>
 
diff --git a/src/GitVersionExe/Program.cs b/src/GitVersionExe/Program.cs
@@ -77,7 +77,7 @@ static int VerifyArgumentsAndRun()
                 }
 
                 ConfigureLogging(arguments);
-#if NET461
+#if NET472
                 if (arguments.Diag)
                 {
                     Logger.WriteInfo("Dumping commit graph: ");
@@ -131,7 +131,7 @@ static int VerifyArgumentsAndRun()
 
                     try
                     {
-#if NET461
+#if NET472
                         LibGitExtensions.DumpGraph(arguments.TargetPath, Logger.WriteInfo, 100);
 #endif
                     }
diff --git a/src/GitVersionExe/SpecifiedArgumentRunner.cs b/src/GitVersionExe/SpecifiedArgumentRunner.cs
@@ -69,7 +69,7 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)
                 }
                 var execRun = false;
                 var msbuildRun = false;
-#if NET461
+#if NET472
                 execRun = RunExecCommandIfNeeded(arguments, targetPath, variables);
                 msbuildRun = RunMsBuildIfNeeded(arguments, targetPath, variables);
 #endif
@@ -87,7 +87,7 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)
                 }
             }
         }
-#if NET461
+#if NET472
         static bool RunMsBuildIfNeeded(Arguments args, string workingDirectory, VersionVariables variables)
         {
 
diff --git a/src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj b/src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj
@@ -1,11 +1,11 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Build" Version="15.9.20" />
+        <PackageReference Include="Microsoft.Build" Version="16.0.461" />
         <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.0.461" />
         <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
     </ItemGroup>
diff --git a/src/GitVersionTask.MsBuild/LibGit2Sharp/GitLoaderContext.cs b/src/GitVersionTask.MsBuild/LibGit2Sharp/GitLoaderContext.cs
@@ -1,5 +1,5 @@
 // This code originally copied from https://raw.githubusercontent.com/dotnet/sourcelink/master/src/Microsoft.Build.Tasks.Git/GitLoaderContext.cs
-#if !NET461
+#if !NET472
 namespace GitVersionTask.MsBuild.LibGit2Sharp
 {
     using System;
diff --git a/src/GitVersionTask.MsBuild/LibGit2Sharp/LibGit2SharpLoader.cs b/src/GitVersionTask.MsBuild/LibGit2Sharp/LibGit2SharpLoader.cs
@@ -19,7 +19,7 @@ public class LibGit2SharpLoader
         private LibGit2SharpLoader(string tasksAssembly)
         {
             taskDirectory = Path.GetDirectoryName(typeof(LibGit2SharpLoader).Assembly.Location);
-#if NET461
+#if NET472
             nullVersion = new Version(0, 0, 0, 0);
             loaderLog = new List<string>();
 
@@ -35,7 +35,7 @@ private LibGit2SharpLoader(string tasksAssembly)
         }
 
         
-#if NET461
+#if NET472
 
         private static Version nullVersion;
 
diff --git a/src/GitVersionTask.MsBuild/LibGit2Sharp/RuntimeIdMap.cs b/src/GitVersionTask.MsBuild/LibGit2Sharp/RuntimeIdMap.cs
@@ -1,5 +1,5 @@
 // This code originally copied from https://raw.githubusercontent.com/dotnet/sourcelink/master/src/Microsoft.Build.Tasks.Git/RuntimeIdMap.cs
-#if !NET461
+#if !NET472
 
 namespace GitVersionTask.MsBuild.LibGit2Sharp
 {
diff --git a/src/GitVersionTask.MsBuild/TaskProxy.cs b/src/GitVersionTask.MsBuild/TaskProxy.cs
@@ -14,7 +14,7 @@ public static class TaskProxy
 
         static TaskProxy()
         {
-#if !NET461
+#if !NET472
             GitLoaderContext.Init("GitVersionCore", "LibGit2Sharp");
 #endif
             LibGit2SharpLoader.LoadAssembly("GitVersionTask");
diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
diff --git a/src/GitVersionTask/GitVersionTask.csproj b/src/GitVersionTask/GitVersionTask.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+        <TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
 
         <IsPackable>true</IsPackable>
 
diff --git a/src/GitVersionTask/GitVersionTask.nuspec b/src/GitVersionTask/GitVersionTask.nuspec
@@ -30,13 +30,13 @@
         <file src="netcoreapp2.1\publish\YamlDotNet.dll"      target="tools\netstandard2.0" />
         <file src="netcoreapp2.1\publish\GitVersion*"         target="tools\netstandard2.0" />
 
-        <file src="net461\GitVersion*"    target="tools\net461" />
-        <file src="net461\LibGit2Sharp.*" target="tools\net461" />
-        <file src="net461\YamlDotNet.*"   target="tools\net461" />
+        <file src="net472\GitVersion*"    target="tools\net472" />
+        <file src="net472\LibGit2Sharp.*" target="tools\net472" />
+        <file src="net472\YamlDotNet.*"   target="tools\net472" />
 
-        <file src="net461\lib\linux-x64\*.so" target="tools\net461\lib\linux-x64" />
-        <file src="net461\lib\osx\*.dylib"    target="tools\net461\lib\osx" />
-        <file src="net461\lib\win32\**\*.dll" target="tools\net461\lib\win32" />
+        <file src="net472\lib\linux-x64\*.so" target="tools\net472\lib\linux-x64" />
+        <file src="net472\lib\osx\*.dylib"    target="tools\net472\lib\osx" />
+        <file src="net472\lib\win32\**\*.dll" target="tools\net472\lib\win32" />
 
         <file src="..\..\build\*.*" target="build" />
         <file src="..\..\buildMultiTargeting\*.*" target="buildMultiTargeting" />
diff --git a/src/GitVersionTask/build/GitVersionTask.props b/src/GitVersionTask/build/GitVersionTask.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
     <PropertyGroup>
-        <GitVersionAssemblyFile Condition="$(GitVersionAssemblyFile) == '' And '$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net461\GitVersionTask.MsBuild.dll</GitVersionAssemblyFile>
+        <GitVersionAssemblyFile Condition="$(GitVersionAssemblyFile) == '' And '$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\GitVersionTask.MsBuild.dll</GitVersionAssemblyFile>
         <GitVersionAssemblyFile Condition="$(GitVersionAssemblyFile) == '' And '$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netstandard2.0\GitVersionTask.MsBuild.dll</GitVersionAssemblyFile>
 
         <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ static int VerifyArgumentsAndRun()`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`ConfigureLogging(arguments);`
`80`		`-#if NET461`
	`80`	`+#if NET472`
`81`	`81`	`if (arguments.Diag)`
`82`	`82`	`{`
`83`	`83`	`Logger.WriteInfo("Dumping commit graph: ");`
`@@ -131,7 +131,7 @@ static int VerifyArgumentsAndRun()`
`131`	`131`
`132`	`132`	`try`
`133`	`133`	`{`
`134`		`-#if NET461`
	`134`	`+#if NET472`
`135`	`135`	`LibGitExtensions.DumpGraph(arguments.TargetPath, Logger.WriteInfo, 100);`
`136`	`136`	`#endif`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)`
`69`	`69`	`}`
`70`	`70`	`var execRun = false;`
`71`	`71`	`var msbuildRun = false;`
`72`		`-#if NET461`
	`72`	`+#if NET472`
`73`	`73`	`execRun = RunExecCommandIfNeeded(arguments, targetPath, variables);`
`74`	`74`	`msbuildRun = RunMsBuildIfNeeded(arguments, targetPath, variables);`
`75`	`75`	`#endif`
`@@ -87,7 +87,7 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`}`
`90`		`-#if NET461`
	`90`	`+#if NET472`
`91`	`91`	`static bool RunMsBuildIfNeeded(Arguments args, string workingDirectory, VersionVariables variables)`
`92`	`92`	`{`
`93`	`93`