Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
- Use original [Mono.Reflection](https://www.nuget.org/packages/Mono.Reflection/2.0.0) package instead of forked one.
- Use strongly-named [GrEmit](https://github.com/skbkontur/gremit) assembly.
  • Loading branch information
AndrewKostousov committed Aug 26, 2020
1 parent 6ee39f1 commit f42b9f8
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 17 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
dist: xenial
sudo: false
language: csharp
dotnet: 3.1.200
dotnet: 3.1.300
mono: none
before_install:
- sudo apt-get install dotnet-sdk-2.1
script:
- git fetch --unshallow # in order to make Nerdbank.GitVersioning.Tasks.GetBuildVersion work
- dotnet restore ./GroBuf.sln --verbosity m
- dotnet build --configuration Release --framework netstandard2.0 ./GroBuf/GroBuf.csproj
- dotnet build --configuration Release --framework netcoreapp2.1 ./GroBuf.Tests/GroBuf.Tests.csproj
- dotnet build --configuration Release --framework netcoreapp3.1 ./GroBuf.Tests/GroBuf.Tests.csproj
- dotnet test --no-build --configuration Release --framework netcoreapp2.1 --filter TestCategory!=LongRunning ./GroBuf.Tests/GroBuf.Tests.csproj
- dotnet test --no-build --configuration Release --framework netcoreapp3.1 --filter TestCategory!=LongRunning ./GroBuf.Tests/GroBuf.Tests.csproj
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v1.6.x - 2020.08.26
- Use original [Mono.Reflection](https://www.nuget.org/packages/Mono.Reflection/2.0.0) package instead of forked one.
- Use strongly-named [GrEmit](https://github.com/skbkontur/gremit) assembly.

## v1.5.3 - 2020.04.03
- Fix GroBuf to work on .NET Core 3 (issue [#18](https://github.com/skbkontur/GroBuf/issues/18)).
- Use [SourceLink](https://github.com/dotnet/sourcelink) to help ReSharper decompiler show actual code.
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.74" PrivateAssets="All" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/skbkontur/GroBuf</RepositoryUrl>
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
<PackageReleaseNotes>$(RepositoryUrl)/releases/tag/v$(MajorMinorVersion)-release</PackageReleaseNotes>
<PackageReleaseNotes>$(RepositoryUrl)/releases</PackageReleaseNotes>
</PropertyGroup>
</Target>

Expand Down
12 changes: 4 additions & 8 deletions GroBuf.Tests/GroBuf.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,15 @@

<PropertyGroup>
<IsPackable>false</IsPackable>
<TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
<PackageReference Include="protobuf-net" Version="2.4.4" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net45'">
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="protobuf-net" Version="3.0.29" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions GroBuf/GroBuf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GrEmit" Version="3.2.2" />
<PackageReference Include="Mono.Reflection.Core" Version="1.1.1" />
<PackageReference Include="GrEmit" Version="3.3.7" />
<PackageReference Include="Mono.Reflection" Version="2.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.1.200"
"version": "3.1.300"
}
}
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.5",
"version": "1.6",
"assemblyVersion": {
"precision": "build"
},
Expand Down

0 comments on commit f42b9f8

Please sign in to comment.