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

Commit

Permalink
Updated to latest build and deps
Browse files Browse the repository at this point in the history
  • Loading branch information
david-driscoll committed Feb 23, 2020
1 parent 833a457 commit 76d5f2c
Show file tree
Hide file tree
Showing 6 changed files with 180 additions and 69 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ image: Visual Studio 2019
init:
- git config --global core.autocrlf input
build_script:
- cmd: choco install dotnetcore-sdk --version=3.0.100
- cmd: choco install dotnetcore-sdk --version=3.1.102
- ps: .\build.ps1
test: off
after_build:
Expand Down
6 changes: 6 additions & 0 deletions .build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
[PublicAPI]
[CheckBuildProjectConfigurations]
[UnsetVisualStudioEnvironmentVariables]
[AzurePipelinesSteps(
InvokedTargets = new[] { nameof(Restore), nameof(Build), nameof(Test), nameof(Pack) },
NonEntryTargets = new[] { nameof(BuildVersion), nameof(Generate_Code_Coverage_Reports) },
ExcludedTargets = new[] { nameof(Clean), nameof(Restore), nameof(DotnetToolRestore) },
Parameters = new[] { nameof(CoverageDirectory), nameof(ArtifactsDirectory), nameof(Verbosity), nameof(Configuration) }
)]
[PackageIcon(
"https://raw.githubusercontent.com/RocketSurgeonsGuild/graphics/master/png/social-square-thrust-rounded.png"
)]
Expand Down
13 changes: 12 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,16 @@
"singleQuote": true,
"arrowParens": "avoid",
"bracketSpacing": true,
"printWidth": 120
"printWidth": 120,
"overrides": [
{
"files": [
"*.yml",
"*.yaml"
],
"options": {
"tabWidth": 2
}
}
]
}
24 changes: 12 additions & 12 deletions Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
<GlobalPackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" />
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.CI" Version="0.3.0" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.GitVersion" Version="0.3.0" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.JetBrains.Annotations" Version="0.3.0" Condition="'$(MSBuildProjectName)'!='.build'" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.CI" Version="0.3.1" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.GitVersion" Version="0.3.1" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.JetBrains.Annotations" Version="0.3.1" Condition="'$(MSBuildProjectName)'!='.build'" />
<!-- <GlobalPackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="2.9.8" /> -->
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.Metadata" Version="0.3.0" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="0.3.0" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.Metadata" Version="0.3.1" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="0.3.1" />
<GlobalPackageReference Include="Roslynator.Analyzers" Version="2.3.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="GitVersion.Tool" Version="5.1.3" />
<PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2019.3.2" />
<PackageReference Update="Nuke.Common" Version="0.23.6" />
<PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2019.3.3" />
<PackageReference Update="Nuke.Common" Version="0.24.2" />
<PackageReference Update="ReportGenerator" Version="4.4.7" />
<PackageReference Update="Rocket.Surgery.Nuke.DotNetCore" Version="0.12.0" />
<PackageReference Update="Rocket.Surgery.Nuke.DotNetCore" Version="0.13.1" />
</ItemGroup>
<ItemGroup></ItemGroup>
<ItemGroup>
Expand All @@ -31,15 +31,15 @@
<PackageReference Update="Rocket.Surgery.Hosting.Abstractions" Version="9.1.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Bogus" Version="28.4.4" />
<PackageReference Update="Bogus" Version="29.0.1" />
<PackageReference Update="coverlet.collector" Version="1.2.0" />
<PackageReference Update="coverlet.msbuild" Version="2.8.0" />
<PackageReference Update="FakeItEasy" Version="6.0.0" />
<PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
<PackageReference Update="FluentAssertions" Version="5.10.0" />
<PackageReference Update="FluentAssertions" Version="5.10.2" />
<PackageReference Update="FluentAssertions.Analyzers" Version="0.11.4" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Update="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="3.4.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Update="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="4.1.1" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="xunit.analyzers" Version="0.10.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
Expand Down
29 changes: 29 additions & 0 deletions azure-pipelines.nuke.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# ------------------------------------------------------------------------------
# <auto-generated>
#
# This code was generated.
#
# - To turn off auto-generation set:
#
# [AzurePipelinesSteps (AutoGenerate = false)]
#
# - To trigger manual generation invoke:
#
# nuke --configure-build-server --host AzurePipelines
#
# </auto-generated>
# ------------------------------------------------------------------------------

#
parameters:
Configuration: 'Release'
Artifacts: ''
Coverage: ''
Verbosity: 'Normal'
steps:
- pwsh: ./build.ps1 BuildVersion Build --skip --configuration '${{ parameters.Configuration }}' --artifacts '${{ parameters.Artifacts }}' --coverage '${{ parameters.Coverage }}' --verbosity '${{ parameters.Verbosity }}'
displayName: '⚙ Build'
- pwsh: ./build.ps1 Generate_Code_Coverage_Reports Test --skip --configuration '${{ parameters.Configuration }}' --artifacts '${{ parameters.Artifacts }}' --coverage '${{ parameters.Coverage }}' --verbosity '${{ parameters.Verbosity }}'
displayName: '🚦 Test'
- pwsh: ./build.ps1 Pack --skip --configuration '${{ parameters.Configuration }}' --artifacts '${{ parameters.Artifacts }}' --coverage '${{ parameters.Coverage }}' --verbosity '${{ parameters.Verbosity }}'
displayName: '📦 Pack'
175 changes: 120 additions & 55 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,66 +1,131 @@
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.8
endpoint: github
repositories:
- repository: rsg
type: github
name: RocketSurgeonsGuild/AzureDevopsTemplates
ref: refs/tags/v0.12.0
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: '7dfeb756-b27e-47ec-8906-a349cf7e0688'
- 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: '7dfeb756-b27e-47ec-8906-a349cf7e0688'
- group: rsg-bot
# Fixes the github package repo warnings on restore
- name: EmitAssetsLogMessages
value: false
- name: HideWarningsAndErrors
value: true

jobs:
- template: pipeline/nuke.yml@rsg
parameters:
- template: jobs/gitversion.yml@rsg
- template: jobs/publish-release.yml@rsg
parameters:
EnableReleaseNotes: true
GitHub: true
GitHubPackages: true
GitHubAuthVariableGroup: rsg-bot
PublishNuGetPackagesFromArtifact: 'NuGet - Windows'
AuthNuGetFeeds:
- name: RocketSurgeonsGuild
source: https://nuget.pkg.github.com/RocketSurgeonsGuild/index.json
username: $(GitHub.UserName)
password: $(GitHub.Token)

- job: Build
dependsOn:
- ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/v') }}:
- GitHub_Draft_Release
variables:
- group: rsg-bot
strategy:
matrix:
Windows:
BuildName: 'Windows'
ImageName: 'windows-latest'
Linux:
BuildName: 'Linux'
ImageName: 'ubuntu-latest'
macOS:
BuildName: 'macOS'
ImageName: 'macOS-latest'
pool:
vmImage: $(ImageName)
steps:
- template: support/mono.yml@rsg
- ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/v') }}:
- template: support/download-release-notes.yml@rsg
- template: support/install-dotnet.yml@rsg
parameters:
DotNetSdk:
- '2.x'
- '3.x'
AuthNuGetFeeds:
- name: RocketSurgeonsGuild
source: https://nuget.pkg.github.com/RocketSurgeonsGuild/index.json
username: $(GitHub.UserName)
password: $(GitHub.Token)
- name: RocketSurgeonsGuild
source: https://nuget.pkg.github.com/RocketSurgeonsGuild/index.json
username: $(GitHub.UserName)
password: $(GitHub.Token)
- template: support/gitversion-hack.yml@rsg

- task: DotNetCoreCLI@2
displayName: 'dotnet tool restore'
inputs:
command: custom
custom: tool
arguments: 'restore'

- task: DotNetCoreCLI@2
displayName: 'dotnet restore'
inputs:
command: restore
feedsToUse: config
nugetConfigPath: NuGet.config
verbosityRestore: Minimal

- template: ./azure-pipelines.nuke.yml
parameters:
Artifacts: $(Artifacts)
Configuration: $(Configuration)
Verbosity: $(Verbosity)
GitHub: true
GitHubAuthVariableGroup: rsg-bot
GitHubPackages: true
MyGetPackages: false
DotNetSdk:
- '2.x'
- '3.x'
NuGetVersion: '5.4.0'
Coverage: $(Coverage)

- template: support/publish-artifacts.yml@rsg
parameters:
Artifacts: $(Artifacts)
Configuration: $(Configuration)
Coverage: $(Coverage)
Postfix: ' - $(BuildName)'
PublishVSTest: true

0 comments on commit 76d5f2c

Please sign in to comment.