Skip to content

Commit

Permalink
+semver: minor drop net461 dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
david-driscoll committed Oct 8, 2018
1 parent 38c4288 commit d96e70e
Show file tree
Hide file tree
Showing 13 changed files with 195 additions and 44 deletions.
51 changes: 51 additions & 0 deletions .pipelines/azure-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
parameters:
Script: 'cakefile.cake'
Target: 'Default'
Configuration: 'Release'
Coverage: '$(Agent.BuildDirectory)/c'
Artifacts: $(Build.ArtifactStagingDirectory)
Verbosity: ''

steps:
- script: $(Agent.ToolsDirectory)/dotnet-cake cakefile.cake --Target="Default" --Configuration="$(Configuration)" --Artifacts="$(Artifacts)" --Coverage="$(Coverage)" --verbosity=$(Verbosity)
displayName: 'dotnet cake'
env:
Configuration: ${{ parameters.Configuration }}
Artifacts: ${{ parameters.Artifacts }}
VstsArtifacts: ${{ parameters.Artifacts }}
Coverage: ${{ parameters.Coverage }}
VstsCoverage: ${{ parameters.Coverage }}
Verbosity: ${{ parameters.Verbosity }}

- task: PublishTestResults@2
displayName: Publish Tests
condition: always()
inputs:
testRunner: "XUnit"
testResultsFiles: "$(Artifacts)/test/**/*.xml"
testRunTitle: "XUnit Results - $(system.phaseName)"
buildPlatform: ${{ parameters.os }}
buildConfiguration: ${{ parameters.Configuration }}
env:
Artifacts: ${{ parameters.Artifacts }}

- task: PublishCodeCoverageResults@1
displayName: Publish Code Coverage
condition: always()
inputs:
codeCoverageTool: "Cobertura"
summaryFileLocation: "$(Coverage)/solution.cobertura"
reportDirectory: "$(Coverage)/report/"
# failIfCoverageEmpty: "true"
env:
Coverage: ${{ parameters.Coverage }}

- task: PublishBuildArtifacts@1
displayName: Publish Logs
condition: always()
inputs:
PathtoPublish: "$(Artifacts)/logs/"
ArtifactName: "Logs - $(system.phaseName)"
ArtifactType: "Container"
env:
Artifacts: ${{ parameters.Artifacts }}
21 changes: 21 additions & 0 deletions .pipelines/dotnet-core.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
parameters:
BuildScript: 'cakefile.cake'
Target: 'Default'
CakeVersion: ''
DotNetVersion: ''

steps:
- task: DotNetCoreInstaller@0
displayName: Install dotnet $(DotNetVersion)
inputs:
packageType: 'sdk'
version: ${{ parameters.DotNetVersion }}

- task: DotNetCoreCLI@2
displayName: 'dotnet install cake'
inputs:
command: custom
custom: tool
arguments: 'install Cake.Tool --version $(CakeVersion) --tool-path $(Agent.ToolsDirectory)'
env:
CakeVersion: ${{ parameters.CakeVersion }}
16 changes: 16 additions & 0 deletions .pipelines/gitversion-restore.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
parameters:
targetPath: "$(Build.ArtifactStagingDirectory)"

steps:
- task: DownloadBuildArtifacts@0
displayName: "Download GitVersion Variables"
inputs:
specificBuildWithTriggering: true
downloadType: single
artifactName: gitversion
pipelineId: GitVersion
targetPath: ${{ parameters.targetPath }}
- task: RocketSurgeonsGuild.variable-tools.DeserializeVariables.DeserializeVariables@1
displayName: 'Deserialize GitVersion'
inputs:
jsonfiles: ${{ format('{0}/**/meta.json', parameters.targetPath) }}
27 changes: 27 additions & 0 deletions .pipelines/gitversion-store.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
parameters:
targetPath: "$(Build.ArtifactStagingDirectory)/gitversion/"
version: '4.0.0-beta0012'
NuGetVersion: ''

steps:
- task: NuGetToolInstaller@0
displayName: "Get NuGet"
inputs:
versionSpec: ${{ parameters.NuGetVersion }}
- script: nuget install GitVersion.CommandLine -Version %VersionToInstall% -ExcludeVersion
displayName: Install GitVersion
env:
VersionToInstall: ${{ parameters.version }}
- script: GitVersion.exe /output buildserver
displayName: Run GitVersion
workingDirectory: GitVersion.CommandLine/tools/
- task: RocketSurgeonsGuild.variable-tools.SerializeVariables.SerializeVariables@1
displayName: "Serialize GitVersion Variables"
inputs:
filename: ${{ format('{0}/meta.json', parameters.targetPath) }}
prefixes: GITVERSION
- task: PublishBuildArtifacts@1
displayName: "Publish GitVersion Variables"
inputs:
pathtoPublish: ${{ parameters.targetPath }}
artifactName: gitversion
30 changes: 0 additions & 30 deletions .travis.yml

This file was deleted.

16 changes: 8 additions & 8 deletions Common.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<PackageReference Update="System.Collections.Immutable" Version="1.5.0" />
<PackageReference Update="System.Interactive.Async.Providers" Version="3.2.0" />
<PackageReference Update="System.Interactive.Providers" Version="3.2.0" />
<PackageReference Update="System.Reactive" Version="4.1.0" />
<PackageReference Update="System.Reactive.Observable.Aliases" Version="4.1.0" />
<PackageReference Update="System.Reactive" Version="4.1.1" />
<PackageReference Update="System.Reactive.Observable.Aliases" Version="4.1.1" />
<PackageReference Update="System.Reflection.Emit.Lightweight" Version="4.3.0" />
</ItemGroup>
<ItemGroup>
Expand All @@ -17,13 +17,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Update="Autofac.Extras.FakeItEasy" Version="5.0.1" />
<PackageReference Update="Bogus" Version="23.0.3" />
<PackageReference Update="coverlet.msbuild" Version="2.2.1" />
<PackageReference Update="FakeItEasy" Version="4.8.0" />
<PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="4.8.0" />
<PackageReference Update="FluentAssertions" Version="5.4.1" />
<PackageReference Update="Bogus" Version="24.3.0" />
<PackageReference Update="coverlet.msbuild" Version="2.3.0" />
<PackageReference Update="FakeItEasy" Version="4.9.1" />
<PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="4.9.1" />
<PackageReference Update="FluentAssertions" Version="5.4.2" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Update="Rocket.Surgery.Extensions.Testing" Version="0.9.0" />
<PackageReference Update="Rocket.Surgery.Extensions.Testing" Version="0.10.0" />
<PackageReference Update="xunit" Version="2.4.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Update="XunitXml.TestLogger" Version="2.0.0" />
Expand Down
65 changes: 65 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
variables:
Configuration: Release
Verbosity: Normal
Coverage: "$(Agent.BuildDirectory)/c"
VstsCoverage: "$(Coverage)"
Artifacts: $(Build.ArtifactStagingDirectory)
VstsArtifacts: "$(Artifacts)"
# system.enableAccessToken: 'true'
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
DotNetVersion: "2.1.403"
NuGetVersion: "4.7.1"
CakeVersion: "0.30.0"
jobs:
- job: GitVersion
pool:
vmImage: "VS2017-Win2016"
steps:
- template: .pipelines/gitversion-store.yml
parameters:
NuGetVersion: "$(NuGetVersion)"

- job: macOS
dependsOn: GitVersion
pool:
vmImage: "macOS-10.13"
steps:
- template: .pipelines/gitversion-restore.yml
- template: .pipelines/dotnet-core.yml
parameters:
CakeVersion: "$(CakeVersion)"
DotNetVersion: "$(DotNetVersion)"
- template: .pipelines/azure-build.yml
parameters:
Configuration: "$(Configuration)"
Verbosity: "$(Verbosity)"

- job: Linux
dependsOn: GitVersion
pool:
vmImage: "Ubuntu-16.04"
steps:
- template: .pipelines/gitversion-restore.yml
- template: .pipelines/dotnet-core.yml
parameters:
CakeVersion: "$(CakeVersion)"
DotNetVersion: "$(DotNetVersion)"
- template: .pipelines/azure-build.yml
parameters:
Configuration: "$(Configuration)"
Verbosity: "$(Verbosity)"

- job: Windows
dependsOn: GitVersion
pool:
vmImage: "VS2017-Win2016"
steps:
- template: .pipelines/gitversion-restore.yml
- template: .pipelines/dotnet-core.yml
parameters:
CakeVersion: "$(CakeVersion)"
DotNetVersion: "$(DotNetVersion)"
- template: .pipelines/azure-build.yml
parameters:
Configuration: "$(Configuration)"
Verbosity: "$(Verbosity)"
2 changes: 1 addition & 1 deletion cakefile.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.7.0";
#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.7.3";

Task("Default")
.IsDependentOn("dotnet");
Expand Down
2 changes: 1 addition & 1 deletion src/Extensions/Rocket.Surgery.Extensions.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Reactive" />
Expand Down
2 changes: 1 addition & 1 deletion src/Task.Extensions/Rocket.Surgery.Task.Extensions.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion test/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<CollectCoverage>true</CollectCoverage>
<CoverletOutputFormat>json,lcov,cobertura</CoverletOutputFormat>
<CoverletOutput>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('Common.Build.props', '$(MSBuildThisFileDirectory)../'))))/coverage/$(MSBuildProjectName.Replace('.', '-'))-$(TargetFramework)/</CoverletOutput>
<CoverletOutput Condition="'$(TF_BUILD)'==''">$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('Common.Build.props', '$(MSBuildThisFileDirectory)../'))))/coverage/$(MSBuildProjectName.Replace('.', '-'))/</CoverletOutput>
<CoverletOutput Condition="'$(TF_BUILD)'!=''">$(VstsCoverage)/$(MSBuildProjectName.Replace('.', '-'))/</CoverletOutput>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;netcoreapp2.1;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Extensions\Rocket.Surgery.Extensions.csproj" />
Expand Down

0 comments on commit d96e70e

Please sign in to comment.