Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to net50 and net50 sdk #308

Merged
merged 2 commits into from
Nov 11, 2020
Merged

Updated to net50 and net50 sdk #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70db539
Updated to net50 and net50 sdk
david-driscoll Nov 11, 2020
2970734
Updated dependencies
david-driscoll Nov 11, 2020
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
2 changes: 1 addition & 1 deletion .build/.build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<RootNamespace></RootNamespace>
<IsPackable>False</IsPackable>
Expand Down
3 changes: 3 additions & 0 deletions .build/Build.CI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ public static RocketSurgeonGitHubActionsConfiguration Middleware(RocketSurgeonGi
new SetupDotNetStep("Use .NET Core 3.1 SDK") {
DotNetVersion = "3.1.x"
},
new SetupDotNetStep("Use .NET Core 5.0 SDK") {
DotNetVersion = "5.0.x"
},
});

buildJob.Steps.Add(new UsingStep("Publish Coverage")
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.x'
- name: 🔨 Use .NET Core 5.0 SDK
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'

- name: 🎁 dotnet tool restore
run: |
Expand Down
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="Packages" value="https://rocketsurgeonsguild.pkgs.visualstudio.com/Libraries/_packaging/Packages/nuget/v3/index.json" />
<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" />
</packageSources>
<!-- used to store credentials -->
<packageSourceCredentials />
Expand Down
31 changes: 16 additions & 15 deletions Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@
<ItemGroup>
<PackageReference Update="GitVersion.Tool" Version="5.5.0" />
<PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2020.2.4" />
<PackageReference Update="Nuke.Common" Version="0.25.0-alpha0334" />
<PackageReference Update="Nuke.Common" Version="0.25.0" />
<PackageReference Update="ReportGenerator" Version="4.7.1" />
<PackageReference Update="Rocket.Surgery.Nuke" Version="0.14.0-beta.31" />
<PackageReference Update="Rocket.Surgery.Nuke" Version="0.14.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.Extensions.Configuration" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.Configuration.Ini" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Ini" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
<PackageReference Update="NetEscapades.Configuration.Yaml" Version="2.0.1" />
<PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Update="System.Interactive" Version="4.1.1" />
<PackageReference Update="System.Interactive.Async" Version="4.1.1" />
<PackageReference Update="System.Reactive" Version="4.4.1" />
<PackageReference Update="System.Reactive.Observable.Aliases" Version="4.4.1" />
<PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Update="System.Interactive" Version="5.0.0" />
<PackageReference Update="System.Interactive.Async" Version="5.0.0" />
<PackageReference Update="System.Reactive" Version="5.0.0" />
<PackageReference Update="System.Reactive.Observable.Aliases" Version="5.0.0" />
<PackageReference Update="System.Reflection.Emit.Lightweight" Version="4.7.0" />
<PackageReference Update="Microsoft.Reactive.Testing" Version="4.4.1" />
<PackageReference Update="Microsoft.Reactive.Testing" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Bogus" Version="31.0.3" />
Expand All @@ -52,4 +52,5 @@
<PackageReference Update="xunit.analyzers" Version="0.10.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)/Packages.support.props" Condition="Exists('$(MSBuildThisFileDirectory)/Packages.support.props')" />
</Project>
21 changes: 17 additions & 4 deletions Packages.support.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netcoreapp2.1'">
<PackageReference Update="Microsoft.Extensions.Configuration" Version="2.1.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Update="Microsoft.Extensions.Configuration" Version="2.2.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="2.2.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Ini" Version="2.2.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Update="Microsoft.Extensions.Configuration" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.Configuration.Ini" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="3.1.5" />
</ItemGroup>
</Project>
5 changes: 3 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,9 @@ jobs:
- template: support/install-dotnet.yml@rsg
parameters:
DotNetSdk:
- '2.x'
- '3.x'
- '2.1.x'
- '3.1.x'
- '5.0.x'

- task: DotNetCoreCLI@2
displayName: 'dotnet tool restore'
Expand Down
7 changes: 0 additions & 7 deletions global.json
View file
Open in desktop

This file was deleted.

Loading