Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<PackageVersion_GitToolsCore>1.3.1</PackageVersion_GitToolsCore>
<PackageVersion_YamlDotNet>4.2.3</PackageVersion_YamlDotNet>
<PackageVersion_YamlDotNet>5.2.1</PackageVersion_YamlDotNet>
<PackageVersion_LibGit2SharpNativeBinaries>[1.0.185]</PackageVersion_LibGit2SharpNativeBinaries>
</PropertyGroup>
</Project>
</Project>
23 changes: 13 additions & 10 deletions src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net461</TargetFramework>
Expand All @@ -11,17 +11,20 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="FluentDateTime" Version="1.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<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="10.4.0" />
<PackageReference Include="NSubstitute" Version="1.10.0.0" />
<PackageReference Include="coverlet.msbuild" Version="2.1.1" />
<PackageReference Include="NUnit" Version="3.9.0" />
<packagereference Include="NUnit3TestAdapter" Version="3.9.0"></packagereference>
<PackageReference Include="Shouldly" Version="3.0.0" />
<PackageReference Include="TestStack.ConventionTests" Version="3.0.0" />
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
<PackageReference Include="NSubstitute" Version="3.1.0" />
<PackageReference Include="coverlet.msbuild" Version="2.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="3.11.0" />
<packagereference Include="NUnit3TestAdapter" Version="3.11.0"></packagereference>
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="TestStack.ConventionTests" Version="3.0.1" />
<PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
</ItemGroup>
<ItemGroup>
Expand Down
9 changes: 2 additions & 7 deletions src/GitVersionCore/GitVersionCore.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.3;net40</TargetFrameworks>
Expand Down Expand Up @@ -42,13 +42,8 @@

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
<PackageReference Include="System.Net.Http" Version="4.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
<PackageReference Include="System.Threading" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
23 changes: 13 additions & 10 deletions src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<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="10.4.0"></PackageReference>
<PackageReference Include="Mono.Cecil" Version="0.9.6.4"></PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="NSubstitute" Version="1.10.0"></PackageReference>
<PackageReference Include="coverlet.msbuild" Version="2.1.1" />
<PackageReference Include="NUnit" Version="3.9.0"></PackageReference>
<packagereference Include="NUnit3TestAdapter" Version="3.9.0"></packagereference>
<PackageReference Include="Shouldly" Version="3.0.0"></PackageReference>
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1"></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>
<PackageReference Include="coverlet.msbuild" Version="2.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="3.11.0"></PackageReference>
<packagereference Include="NUnit3TestAdapter" Version="3.11.0"></packagereference>
<PackageReference Include="Shouldly" Version="3.0.2"></PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/GitVersionExe.Tests/VersionWriterTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace GitVersionExe.Tests
namespace GitVersionExe.Tests
{
using System;
using System.IO;
Expand Down Expand Up @@ -42,7 +42,7 @@ private Assembly GenerateAssembly(Version fileVersion, string prereleaseInfo)

var asmDef = AssemblyDefinition.CreateAssembly(definition, "test-asm", ModuleKind.Dll);
var constructor = typeof(AssemblyInformationalVersionAttribute).GetConstructor(new[] { typeof(string) });
var methodReference = asmDef.MainModule.Import(constructor);
var methodReference = asmDef.MainModule.ImportReference(constructor);
var customAttribute = new CustomAttribute(methodReference);
customAttribute.ConstructorArguments.Add(new CustomAttributeArgument(asmDef.MainModule.TypeSystem.String, fileVersion + prereleaseInfo));
asmDef.CustomAttributes.Add(customAttribute);
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionExe/GitVersionExe.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<ItemGroup Condition="'$(TargetFramework)'=='net40'">
<PackageReference Include="GitTools.Core" Version="1.3.1"></PackageReference>
<PackageReference Include="JetBrains.Annotations" Version="10.4.0"></PackageReference>
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1"></PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
37 changes: 17 additions & 20 deletions src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="ApprovalTests" Version="3.0.13"></PackageReference>
<PackageReference Include="ApprovalUtilities" Version="3.0.13"></PackageReference>
<PackageReference Include="FluentDateTime" Version="1.13.0"></PackageReference>
<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="10.4.0"></PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="1.3.2"></PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.2"></PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="1.3.2"></PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3"></PackageReference>
<PackageReference Include="NSubstitute" Version="1.10.0"></PackageReference>
<PackageReference Include="coverlet.msbuild" Version="2.1.1" />
<PackageReference Include="NUnit" Version="3.9.0"></PackageReference>
<packagereference Include="NUnit3TestAdapter" Version="3.9.0"></packagereference>
<PackageReference Include="ObjectApproval" Version="2.1.0"></PackageReference>
<PackageReference Include="Shouldly" Version="3.0.0"></PackageReference>
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2"></PackageReference>
<PackageReference Include="System.Collections.Immutable" Version="1.3.1"></PackageReference>
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.548" />
<PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" />
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1"></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>
<PackageReference Include="NSubstitute" Version="3.1.0"></PackageReference>
<PackageReference Include="coverlet.msbuild" Version="2.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="3.11.0"></PackageReference>
<packagereference Include="NUnit3TestAdapter" Version="3.11.0"></packagereference>
<PackageReference Include="ObjectApproval" Version="2.2.0"></PackageReference>
<PackageReference Include="Shouldly" Version="3.0.2"></PackageReference>
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.6.85" />
</ItemGroup>
<ItemGroup>
<Content Include="Approved\**\*.txt" />
Expand Down
8 changes: 5 additions & 3 deletions src/GitVersionTask/GitVersionTask.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<!--See https://github.com/Microsoft/msbuild/issues/3671 for reason for the ExcludeAssets against msbuild packagerefernces -->
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.548" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" ExcludeAssets="runtime" />
<PackageReference Include="UtilPack.NuGet.MSBuild" Version="$(PackageVersion_UtilPackNuGetMSBuild)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.6.85" ExcludeAssets="runtime" />
<PackageReference Include="UtilPack.NuGet.MSBuild" Version="$(PackageVersion_UtilPackNuGetMSBuild)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionTask/UtilPack.Version.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PackageVersion_UtilPackNuGetMSBuild>2.7.0</PackageVersion_UtilPackNuGetMSBuild>
<PackageVersion_UtilPackNuGetMSBuild>2.9.0</PackageVersion_UtilPackNuGetMSBuild>
</PropertyGroup>
</Project>