Skip to content
This repository was archived by the owner on Dec 11, 2020. It is now read-only.

Commit db0f16a

Browse files
david-driscolldavid-driscoll
authored
Updated dependencies (#363)
1 parent ed317d9 commit db0f16a

15 files changed

Lines changed: 1572 additions & 82 deletions

‎.build/.build.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
77
<RootNamespace></RootNamespace>
88
<IsPackable>False</IsPackable>

‎.build/Build.CI.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ public static RocketSurgeonGitHubActionsConfiguration Middleware(RocketSurgeonGi
6666
new SetupDotNetStep("Use .NET Core 3.1 SDK") {
6767
DotNetVersion = "3.1.x"
6868
},
69+
new SetupDotNetStep("Use .NET Core 5.0 SDK") {
70+
DotNetVersion = "5.0.x"
71+
},
6972
});
7073

7174
buildJob.Steps.Add(new UsingStep("Publish Coverage")

‎.config/dotnet-tools.json‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,36 @@
11
{
2-
"version": 1,
3-
"isRoot": true,
4-
"tools": {
5-
"dotnet-outdated": {
6-
"version": "2.11.0",
7-
"commands": ["dotnet-outdated"]
8-
},
9-
"gitversion.tool": {
10-
"version": "5.3.5",
11-
"commands": ["dotnet-gitversion"]
12-
},
13-
"dotnet-reportgenerator-globaltool": {
14-
"version": "4.6.1",
15-
"commands": ["reportgenerator"]
16-
},
17-
"nuke.globaltool": {
18-
"version": "0.24.11",
19-
"commands": ["nuke"]
20-
},
21-
"codecov.tool": {
22-
"version": "1.11.1",
23-
"commands": ["codecov"]
24-
}
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"dotnet-outdated": {
6+
"version": "2.11.0",
7+
"commands": [
8+
"dotnet-outdated"
9+
]
10+
},
11+
"gitversion.tool": {
12+
"version": "5.5.1",
13+
"commands": [
14+
"dotnet-gitversion"
15+
]
16+
},
17+
"dotnet-reportgenerator-globaltool": {
18+
"version": "4.8.1",
19+
"commands": [
20+
"reportgenerator"
21+
]
22+
},
23+
"nuke.globaltool": {
24+
"version": "5.0.0",
25+
"commands": [
26+
"nuke"
27+
]
28+
},
29+
"codecov.tool": {
30+
"version": "1.12.3",
31+
"commands": [
32+
"codecov"
33+
]
2534
}
26-
}
35+
}
36+
}

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ jobs:
5252
uses: actions/setup-dotnet@v1
5353
with:
5454
dotnet-version: '3.1.x'
55+
- name: 🔨 Use .NET Core 5.0 SDK
56+
uses: actions/setup-dotnet@v1
57+
with:
58+
dotnet-version: '5.0.x'
5559

5660
- name: 🎁 dotnet tool restore
5761
run: |

‎GitVersion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
assembly-versioning-scheme: MajorMinorPatch
22
mode: ContinuousDeployment
3-
continuous-delivery-fallback-tag: beta
3+
continuous-delivery-fallback-tag: ci
44
next-version: 0.1.0
55
branches:
66
next:

‎NuGet.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
</packageRestore>
77
<packageSources>
88
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
9-
<add key="Packages" value="https://rocketsurgeonsguild.pkgs.visualstudio.com/Libraries/_packaging/Packages/nuget/v3/index.json" />
9+
<!-- <add key="Packages" value="https://rocketsurgeonsguild.pkgs.visualstudio.com/Libraries/_packaging/Packages/nuget/v3/index.json" /> -->
10+
<add key="5.0.100-rtm.20526.5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/5.0.100-rtm.20526.5/nuget/v3/index.json" />
1011
</packageSources>
1112
<!-- used to store credentials -->
1213
<packageSourceCredentials />

‎Packages.props‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,35 @@
1313
<GlobalPackageReference Include="Roslynator.Analyzers" Version="3.0.0" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<PackageReference Update="GitVersion.Tool" Version="5.5.0" />
16+
<PackageReference Update="GitVersion.Tool" Version="5.5.1" />
1717
<PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2020.2.4" />
18-
<PackageReference Update="Nuke.Common" Version="0.25.0-alpha0334" />
19-
<PackageReference Update="ReportGenerator" Version="4.7.1" />
20-
<PackageReference Update="Rocket.Surgery.Nuke" Version="0.14.0-beta.8" />
18+
<PackageReference Update="Nuke.Common" Version="5.0.0" />
19+
<PackageReference Update="ReportGenerator" Version="4.8.1" />
20+
<PackageReference Update="Rocket.Surgery.Nuke" Version="0.14.2" />
2121
</ItemGroup>
2222
<ItemGroup>
23-
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
23+
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0" />
2424
<PackageReference Update="NodaTime" Version="3.0.3" />
2525
<PackageReference Update="NodaTime.Serialization.JsonNet" Version="3.0.0" />
2626
<PackageReference Update="NodaTime.Serialization.SystemTextJson" Version="1.0.0" />
2727
<PackageReference Update="Rocket.Surgery.Build.Information" Version="3.3.11" />
28-
<PackageReference Update="Rocket.Surgery.Conventions.Abstractions" Version="10.0.0-beta.44" />
28+
<PackageReference Update="Rocket.Surgery.Conventions.Abstractions" Version="10.0.0-beta.98" />
2929
<PackageReference Update="Rocket.Surgery.Extensions.Abstractions" Version="10.0.0" />
3030
</ItemGroup>
3131
<ItemGroup>
32-
<PackageReference Update="Bogus" Version="31.0.3" />
32+
<PackageReference Update="Bogus" Version="32.0.1" />
3333
<PackageReference Update="coverlet.collector" Version="1.3.0" />
3434
<PackageReference Update="coverlet.msbuild" Version="2.9.0" />
3535
<PackageReference Update="FakeItEasy" Version="6.2.1" />
3636
<PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
3737
<PackageReference Update="FluentAssertions" Version="5.10.3" />
3838
<PackageReference Update="FluentAssertions.Analyzers" Version="0.11.4" />
3939
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.8.0" />
40-
<PackageReference Update="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="5.3.0" />
41-
<PackageReference Update="Rocket.Surgery.Extensions.Testing.XUnit" Version="5.3.0" />
40+
<PackageReference Update="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="6.0.0" />
41+
<PackageReference Update="Rocket.Surgery.Extensions.Testing.XUnit" Version="6.0.0" />
4242
<PackageReference Update="xunit" Version="2.4.1" />
4343
<PackageReference Update="xunit.analyzers" Version="0.10.0" />
4444
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
4545
</ItemGroup>
46-
</Project>
46+
<Import Project="$(MSBuildThisFileDirectory)/Packages.support.props" Condition="Exists('$(MSBuildThisFileDirectory)/Packages.support.props')" />
47+
</Project>

‎Packages.support.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
4+
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
5+
</ItemGroup>
6+
</Project>

‎Readme.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ TBD
3333
[github-license-badge]: https://img.shields.io/github/license/RocketSurgeonsGuild/AspNetCore.Extensions.svg?style=flat "License"
3434
[codecov]: https://codecov.io/gh/RocketSurgeonsGuild/AspNetCore.Extensions
3535
[codecov-badge]: https://img.shields.io/codecov/c/github/RocketSurgeonsGuild/AspNetCore.Extensions.svg?color=E03997&label=codecov&logo=codecov&logoColor=E03997&style=flat "Code Coverage"
36-
[azurepipelines]: https://rocketsurgeonsguild.visualstudio.com/Libraries/_build/latest?definitionId=34&branchName=master
36+
[azurepipelines]: https://dev.azure.com/rocketsurgeonsguild/Libraries/_build/latest?definitionId=34&branchName=master
3737
[azurepipelines-badge]: https://img.shields.io/azure-devops/build/rocketsurgeonsguild/Libraries/34.svg?color=98C6FF&label=azure%20pipelines&logo=azuredevops&logoColor=98C6FF&style=flat "Azure Pipelines Status"
38-
[azurepipelines-history]: https://rocketsurgeonsguild.visualstudio.com/Libraries/_build?definitionId=34&branchName=master
38+
[azurepipelines-history]: https://dev.azure.com/rocketsurgeonsguild/Libraries/_build?definitionId=34&branchName=master
3939
[azurepipelines-history-badge]: https://buildstats.info/azurepipelines/chart/rocketsurgeonsguild/Libraries/34?includeBuildsFromPullRequest=false "Azure Pipelines History"
4040
[github]: https://github.com/RocketSurgeonsGuild/AspNetCore.Extensions/actions?query=workflow%3Aci
4141
[github-badge]: https://img.shields.io/github/workflow/status/RocketSurgeonsGuild/AspNetCore.Extensions/ci.svg?label=github&logo=github&color=b845fc&logoColor=b845fc&style=flat "GitHub Actions Status"

‎azure-pipelines.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,9 @@ jobs:
8383
- template: support/install-dotnet.yml@rsg
8484
parameters:
8585
DotNetSdk:
86-
- '2.x'
87-
- '3.x'
86+
- '2.1.x'
87+
- '3.1.x'
88+
- '5.0.x'
8889

8990
- task: DotNetCoreCLI@2
9091
displayName: 'dotnet tool restore'

0 commit comments

Comments
 (0)