Skip to content

Commit

Permalink
Updated to dotnet core 3.1 over 3.0 +semver:minor
Browse files Browse the repository at this point in the history
  • Loading branch information
david-driscoll committed Jan 6, 2020
1 parent f0e016b commit a00a4d3
Show file tree
Hide file tree
Showing 6 changed files with 98 additions and 107 deletions.
78 changes: 32 additions & 46 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,34 @@
{
"version": 1,
"isRoot": true,
"tools": {
"nukeeper": {
"version": "0.25.0",
"commands": [
"nukeeper"
]
},
"dotnet-outdated": {
"version": "2.6.0",
"commands": [
"dotnet-outdated"
]
},
"gitversion.tool": {
"version": "5.1.2",
"commands": [
"dotnet-gitversion"
]
},
"dotnet-reportgenerator-globaltool": {
"version": "4.3.6",
"commands": [
"reportgenerator"
]
},
"nuke.globaltool": {
"version": "0.23.3",
"commands": [
"nuke"
]
},
"gitreleasemanager.tool": {
"version": "0.8.0",
"commands": [
"dotnet-gitreleasemanager"
]
},
"codecov.tool": {
"version": "1.8.0",
"commands": [
"codecov"
]
"version": 1,
"isRoot": true,
"tools": {
"nukeeper": {
"version": "0.26.0",
"commands": ["nukeeper"]
},
"dotnet-outdated": {
"version": "2.8.0",
"commands": ["dotnet-outdated"]
},
"gitversion.tool": {
"version": "5.1.3",
"commands": ["dotnet-gitversion"]
},
"dotnet-reportgenerator-globaltool": {
"version": "4.4.0",
"commands": ["reportgenerator"]
},
"nuke.globaltool": {
"version": "0.23.4",
"commands": ["nuke"]
},
"gitreleasemanager.tool": {
"version": "0.9.0",
"commands": ["dotnet-gitreleasemanager"]
},
"codecov.tool": {
"version": "1.9.0",
"commands": ["codecov"]
}
}
}
}
}
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<PackageTags Condition="$(MSBuildProjectName.Contains('Abstractions'))">$(PackageTags);abstractions</PackageTags>
<LangVersion>8.0</LangVersion>
<Nullable>enable</Nullable>
<LegacySupportPackagesProps>Packages.support.props</LegacySupportPackagesProps>
</PropertyGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)/.tmp/packageicon.png" Condition="Exists('$(MSBuildThisFileDirectory)/.tmp/packageicon.png')" Pack="true" PackagePath="/images/" Visible="false" />
Expand Down
7 changes: 4 additions & 3 deletions Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
<PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2019.3.1" />
<PackageReference Update="Nuke.Common" Version="0.23.4" />
<PackageReference Update="ReportGenerator" Version="4.4.0" />
<PackageReference Update="Rocket.Surgery.Nuke.DotNetCore" Version="0.10.1" />
<PackageReference Update="Rocket.Surgery.Nuke.DotNetCore" Version="0.11.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="3.3.0" />
<PackageReference Update="Bogus" Version="28.4.4" />
<PackageReference Update="coverlet.collector" Version="1.1.0" />
<PackageReference Update="coverlet.msbuild" Version="2.7.0" />
<PackageReference Update="coverlet.collector" Version="1.2.0" />
<PackageReference Update="coverlet.msbuild" Version="2.8.0" />
<PackageReference Update="FakeItEasy" Version="5.5.0" />
<PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="5.5.0" />
<PackageReference Update="FluentAssertions" Version="5.10.0" />
Expand All @@ -28,4 +28,5 @@
<PackageReference Update="xunit.analyzers" Version="0.10.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)/$(LegacySupportPackagesProps)" Condition="Exists('$(MSBuildThisFileDirectory)/$(LegacySupportPackagesProps)')" />
</Project>
3 changes: 3 additions & 0 deletions Packages.support.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
</Project>
114 changes: 57 additions & 57 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
trigger:
batch: true
branches:
include:
- master
- refs/tags/*
paths:
exclude:
- '**/*.md'
- '.appveyor.yml'
- '.codecov.yml'
- 'GitVersion.yml'
- 'GitReleaseManager.yaml'
- .vscode/*
- .git*
- .editorconfig
- .nuke
- LICENSE
batch: true
branches:
include:
- master
- refs/tags/*
paths:
exclude:
- '**/*.md'
- '.appveyor.yml'
- '.codecov.yml'
- 'GitVersion.yml'
- 'GitReleaseManager.yaml'
- .vscode/*
- .git*
- .editorconfig
- .nuke
- LICENSE

pr:
autoCancel: true
branches:
include:
- master
autoCancel: true
branches:
include:
- master

resources:
repositories:
- repository: rsg
type: github
name: RocketSurgeonsGuild/AzureDevopsTemplates
ref: refs/tags/v0.11.1
endpoint: github
repositories:
- repository: rsg
type: github
name: RocketSurgeonsGuild/AzureDevopsTemplates
ref: refs/tags/v0.11.1
endpoint: github

variables:
- name: CONFIGURATION
value: Release
- name: VERBOSITY
value: Normal
- name: COVERAGE
value: "$(Agent.BuildDirectory)/c"
- name: ARTIFACTS
value: $(Build.ArtifactStagingDirectory)
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
value: "true"
- name: CodeCovToken
value: 'c93f6719-da50-4d00-ba2b-b73fd95239e0'
- group: rsg-bot
- name: CONFIGURATION
value: Release
- name: VERBOSITY
value: Normal
- name: COVERAGE
value: '$(Agent.BuildDirectory)/c'
- name: ARTIFACTS
value: $(Build.ArtifactStagingDirectory)
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
value: 'true'
- name: CodeCovToken
value: 'c93f6719-da50-4d00-ba2b-b73fd95239e0'
- group: rsg-bot

jobs:
- template: pipeline/nuke.yml@rsg
parameters:
AuthNuGetFeeds:
- name: RocketSurgeonsGuild
source: https://nuget.pkg.github.com/RocketSurgeonsGuild/index.json
username: $(GitHub.UserName)
password: $(GitHub.Token)
Configuration: $(Configuration)
Verbosity: $(Verbosity)
GitHub: true
GitHubAuthVariableGroup: rsg-bot
GitHubPackages: true
MyGetPackages: false
DotNetSdk:
- "2.x"
- "3.x"
NuGetVersion: "5.3.1"
- template: pipeline/nuke.yml@rsg
parameters:
AuthNuGetFeeds:
- name: RocketSurgeonsGuild
source: https://nuget.pkg.github.com/RocketSurgeonsGuild/index.json
username: $(GitHub.UserName)
password: $(GitHub.Token)
Configuration: $(Configuration)
Verbosity: $(Verbosity)
GitHub: true
GitHubAuthVariableGroup: rsg-bot
GitHubPackages: true
MyGetPackages: false
DotNetSdk:
- '2.x'
- '3.x'
NuGetVersion: '5.4.0'
2 changes: 1 addition & 1 deletion test/Information.Tests/Rocket.Surgery.MSBuild.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
</PropertyGroup>
</Project>

0 comments on commit a00a4d3

Please sign in to comment.