Skip to content

Commit 3eba5fa

Browse files
dazinatordazinator
authored
Merge pull request #1534 from arturcic/feature/nuget-update
nuget update
2 parents 59d50c3 + 8e23b5b commit 3eba5fa

File tree

9 files changed

+56
-56
lines changed

9 files changed

+56
-56
lines changed

‎src/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<PackageVersion_GitToolsCore>1.3.1</PackageVersion_GitToolsCore>
4-
<PackageVersion_YamlDotNet>4.2.3</PackageVersion_YamlDotNet>
4+
<PackageVersion_YamlDotNet>5.2.1</PackageVersion_YamlDotNet>
55
<PackageVersion_LibGit2SharpNativeBinaries>[1.0.185]</PackageVersion_LibGit2SharpNativeBinaries>
66
</PropertyGroup>
7-
</Project>
7+
</Project>

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

Lines changed: 13 additions & 10 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>
@@ -11,17 +11,20 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
15-
<PackageReference Include="FluentDateTime" Version="1.13.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
15+
<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="10.4.0" />
19-
<PackageReference Include="NSubstitute" Version="1.10.0.0" />
20-
<PackageReference Include="coverlet.msbuild" Version="2.1.1" />
21-
<PackageReference Include="NUnit" Version="3.9.0" />
22-
<packagereference Include="NUnit3TestAdapter" Version="3.9.0"></packagereference>
23-
<PackageReference Include="Shouldly" Version="3.0.0" />
24-
<PackageReference Include="TestStack.ConventionTests" Version="3.0.0" />
18+
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
19+
<PackageReference Include="NSubstitute" Version="3.1.0" />
20+
<PackageReference Include="coverlet.msbuild" Version="2.3.1">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
23+
</PackageReference>
24+
<PackageReference Include="NUnit" Version="3.11.0" />
25+
<packagereference Include="NUnit3TestAdapter" Version="3.11.0"></packagereference>
26+
<PackageReference Include="Shouldly" Version="3.0.2" />
27+
<PackageReference Include="TestStack.ConventionTests" Version="3.0.1" />
2528
<PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
2629
</ItemGroup>
2730
<ItemGroup>

‎src/GitVersionCore/GitVersionCore.csproj‎

Lines changed: 2 additions & 7 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
<TargetFrameworks>netstandard1.3;net40</TargetFrameworks>
@@ -42,13 +42,8 @@
4242

4343
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
4444
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
45-
<PackageReference Include="System.Net.Http" Version="4.3.2" />
46-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
47-
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
48-
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
45+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
4946
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
50-
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
51-
<PackageReference Include="System.Threading" Version="4.3.0" />
5247
</ItemGroup>
5348

5449
<ItemGroup>

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net461</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
8+
<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="10.4.0"></PackageReference>
12-
<PackageReference Include="Mono.Cecil" Version="0.9.6.4"></PackageReference>
13-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
14-
<PackageReference Include="NSubstitute" Version="1.10.0"></PackageReference>
15-
<PackageReference Include="coverlet.msbuild" Version="2.1.1" />
16-
<PackageReference Include="NUnit" Version="3.9.0"></PackageReference>
17-
<packagereference Include="NUnit3TestAdapter" Version="3.9.0"></packagereference>
18-
<PackageReference Include="Shouldly" Version="3.0.0"></PackageReference>
11+
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1"></PackageReference>
12+
<PackageReference Include="Mono.Cecil" Version="0.10.1"></PackageReference>
13+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
14+
<PackageReference Include="NSubstitute" Version="3.1.0"></PackageReference>
15+
<PackageReference Include="coverlet.msbuild" Version="2.3.1">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
18+
</PackageReference>
19+
<PackageReference Include="NUnit" Version="3.11.0"></PackageReference>
20+
<packagereference Include="NUnit3TestAdapter" Version="3.11.0"></packagereference>
21+
<PackageReference Include="Shouldly" Version="3.0.2"></PackageReference>
1922
</ItemGroup>
2023
<ItemGroup>
2124
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />

‎src/GitVersionExe.Tests/VersionWriterTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersionExe.Tests
1+
namespace GitVersionExe.Tests
22
{
33
using System;
44
using System.IO;
@@ -42,7 +42,7 @@ private Assembly GenerateAssembly(Version fileVersion, string prereleaseInfo)
4242

4343
var asmDef = AssemblyDefinition.CreateAssembly(definition, "test-asm", ModuleKind.Dll);
4444
var constructor = typeof(AssemblyInformationalVersionAttribute).GetConstructor(new[] { typeof(string) });
45-
var methodReference = asmDef.MainModule.Import(constructor);
45+
var methodReference = asmDef.MainModule.ImportReference(constructor);
4646
var customAttribute = new CustomAttribute(methodReference);
4747
customAttribute.ConstructorArguments.Add(new CustomAttributeArgument(asmDef.MainModule.TypeSystem.String, fileVersion + prereleaseInfo));
4848
asmDef.CustomAttributes.Add(customAttribute);

‎src/GitVersionExe/GitVersionExe.csproj‎

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

1818
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
1919
<PackageReference Include="GitTools.Core" Version="1.3.1"></PackageReference>
20-
<PackageReference Include="JetBrains.Annotations" Version="10.4.0"></PackageReference>
20+
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1"></PackageReference>
2121
</ItemGroup>
2222

2323
<ItemGroup>

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

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net461</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
9-
<PackageReference Include="ApprovalTests" Version="3.0.13"></PackageReference>
10-
<PackageReference Include="ApprovalUtilities" Version="3.0.13"></PackageReference>
11-
<PackageReference Include="FluentDateTime" Version="1.13.0"></PackageReference>
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
9+
<PackageReference Include="FluentDateTime" Version="1.15.0"></PackageReference>
1210
<PackageReference Include="GitTools.Core" Version="$(PackageVersion_GitToolsCore)"></PackageReference>
13-
<PackageReference Include="JetBrains.Annotations" Version="10.4.0"></PackageReference>
14-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="1.3.2"></PackageReference>
15-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.2"></PackageReference>
16-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="1.3.2"></PackageReference>
17-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3"></PackageReference>
18-
<PackageReference Include="NSubstitute" Version="1.10.0"></PackageReference>
19-
<PackageReference Include="coverlet.msbuild" Version="2.1.1" />
20-
<PackageReference Include="NUnit" Version="3.9.0"></PackageReference>
21-
<packagereference Include="NUnit3TestAdapter" Version="3.9.0"></packagereference>
22-
<PackageReference Include="ObjectApproval" Version="2.1.0"></PackageReference>
23-
<PackageReference Include="Shouldly" Version="3.0.0"></PackageReference>
24-
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2"></PackageReference>
25-
<PackageReference Include="System.Collections.Immutable" Version="1.3.1"></PackageReference>
26-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.548" />
27-
<PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" />
11+
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1"></PackageReference>
12+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.8.2"></PackageReference>
13+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.8.2"></PackageReference>
14+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2"></PackageReference>
15+
<PackageReference Include="NSubstitute" Version="3.1.0"></PackageReference>
16+
<PackageReference Include="coverlet.msbuild" Version="2.3.1">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
19+
</PackageReference>
20+
<PackageReference Include="NUnit" Version="3.11.0"></PackageReference>
21+
<packagereference Include="NUnit3TestAdapter" Version="3.11.0"></packagereference>
22+
<PackageReference Include="ObjectApproval" Version="2.2.0"></PackageReference>
23+
<PackageReference Include="Shouldly" Version="3.0.2"></PackageReference>
24+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.6.85" />
2825
</ItemGroup>
2926
<ItemGroup>
3027
<Content Include="Approved\**\*.txt" />

‎src/GitVersionTask/GitVersionTask.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@
5353
<PrivateAssets>All</PrivateAssets>
5454
</PackageReference>
5555
<!--See https://github.com/Microsoft/msbuild/issues/3671 for reason for the ExcludeAssets against msbuild packagerefernces -->
56-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.548" ExcludeAssets="runtime" />
57-
<PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" ExcludeAssets="runtime" />
58-
<PackageReference Include="UtilPack.NuGet.MSBuild" Version="$(PackageVersion_UtilPackNuGetMSBuild)" />
56+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.6.85" ExcludeAssets="runtime" />
57+
<PackageReference Include="UtilPack.NuGet.MSBuild" Version="$(PackageVersion_UtilPackNuGetMSBuild)">
58+
<PrivateAssets>all</PrivateAssets>
59+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
60+
</PackageReference>
5961
</ItemGroup>
6062

6163
<ItemGroup>

‎src/GitVersionTask/UtilPack.Version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<PackageVersion_UtilPackNuGetMSBuild>2.7.0</PackageVersion_UtilPackNuGetMSBuild>
3+
<PackageVersion_UtilPackNuGetMSBuild>2.9.0</PackageVersion_UtilPackNuGetMSBuild>
44
</PropertyGroup>
55
</Project>
66

0 commit comments

Comments
 (0)