Skip to content

Commit

Permalink
fixed build
Browse files Browse the repository at this point in the history
  • Loading branch information
@DSilence
DSilence committed Feb 16, 2021
1 parent 3598b6c commit 9996713
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 84 deletions.
146 changes: 75 additions & 71 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
@@ -1,84 +1,88 @@
# ASP.NET Core

# Build and test ASP.NET Core projects targeting .NET Core.
# Add steps that run tests, create a NuGet package, deploy, and more:
# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core

jobs:
- job: OSX
pool:
vmImage: 'xcode9-macos10.13'
steps:
- task: Bash@3
inputs:
targetType: 'filePath'
filePath: 'build.sh'
arguments: '-configuration $(buildConfiguration) -target CiNonWin -framework netcoreapp2.1'
failOnStderr: true
displayName: 'Build'
- task: PublishTestResults@2
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/tests'
displayName: 'Publish Test results'
- task: PublishCodeCoverageResults@1
inputs:
codeCoverageTool: "cobertura"
summaryFileLocation: "$(Build.SourcesDirectory)/artifacts/coverage/*.xml"
failIfCoverageEmpty: true
displayName: 'Publish Code Coverage'
- job: OSX
pool:
vmImage: 'macOS-latest'
steps:
- task: Bash@3
continueOnError: true
inputs:
targetType: 'filePath'
filePath: 'build.sh'
arguments: '-configuration $(buildConfiguration) -target CiNonWin -framework netcoreapp2.1'
failOnStderr: true
displayName: 'Build'
- task: PublishTestResults@2
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/tests'
displayName: 'Publish Test results'
- task: PublishCodeCoverageResults@1
inputs:
codeCoverageTool: "cobertura"
summaryFileLocation: "$(Build.SourcesDirectory)/artifacts/coverage/*.xml"
failIfCoverageEmpty: true
displayName: 'Publish Code Coverage'

- job: Ubuntu
pool:
vmImage: 'ubuntu-16.04'
steps:
- task: Bash@3
inputs:
targetType: 'filePath'
filePath: 'build.sh'
arguments: '-configuration $(buildConfiguration) -target CiNonWin -framework netcoreapp2.1'
failOnStderr: true
displayName: 'Build'
- task: PublishTestResults@2
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/tests'
displayName: 'Publish Test results'
- job: Ubuntu
pool:
vmImage: 'ubuntu-latest'
steps:
- task: Bash@3
continueOnError: true
inputs:
targetType: 'filePath'
filePath: 'build.sh'
arguments: '-configuration $(buildConfiguration) -target CiNonWin -framework netcoreapp2.1'
failOnStderr: true
displayName: 'Build'
- task: PublishTestResults@2
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/tests'
displayName: 'Publish Test results'

- job: Windows
pool:
vmImage: 'vs2017-win2016'
steps:
- task: PowerShell@2
inputs:
targetType: 'filePath'
filePath: 'build.ps1'
arguments: '-configuration $(buildConfiguration) -target Ci'
failOnStderr: true
displayName: 'Build'
- task: PublishTestResults@2
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/tests'
displayName: 'Publish Test results'
- task: PublishCodeCoverageResults@1
inputs:
codeCoverageTool: "cobertura"
summaryFileLocation: "$(Build.SourcesDirectory)/artifacts/coverage/*.xml"
failIfCoverageEmpty: true
displayName: 'Publish Code Coverage'
- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: '$(Build.SourcesDirectory)/artifacts/nuget'
artifactName: 'Nuget'
displayName: 'Publish Artifacts'
- job: Windows
pool:
vmImage: 'windows-latest'
steps:
- task: PowerShell@2
continueOnError: true
inputs:
targetType: 'filePath'
filePath: 'build.ps1'
arguments: '-configuration $(buildConfiguration) -target Ci'
failOnStderr: true
displayName: 'Build'
- task: PublishTestResults@2
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/tests'
displayName: 'Publish Test results'
- task: PublishCodeCoverageResults@1
inputs:
codeCoverageTool: "cobertura"
summaryFileLocation: "$(Build.SourcesDirectory)/artifacts/coverage/*.xml"
failIfCoverageEmpty: true
displayName: 'Publish Code Coverage'
- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: '$(Build.SourcesDirectory)/artifacts/nuget'
artifactName: 'Nuget'
displayName: 'Publish Artifacts'

trigger:
- master
- develop
- release/*
- master
- develop
- release/*

variables:
buildConfiguration: 'Release'
Expand Down
16 changes: 9 additions & 7 deletions build/Build.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using Nuke.Common;
using Nuke.Common.Git;
using Nuke.Common.IO;
using Nuke.Common.ProjectModel;
using Nuke.Common.Tooling;
using Nuke.Common.Tools.DotNet;
using Nuke.Common.Tools.GitVersion;
using Nuke.Common.Utilities.Collections;
using static Nuke.Common.IO.FileSystemTasks;
using static Nuke.Common.IO.PathConstruction;
using static Nuke.Common.Tools.DotNet.DotNetTasks;
Expand All @@ -15,23 +17,23 @@ class Build : NukeBuild
[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
readonly string Configuration = IsLocalBuild ? "Debug" : "Release";

[Parameter("Explicit framework to build")] readonly string Framework = null;
[Parameter("Explicit framework to build")] readonly string Framework = "";

[Parameter("Collect code coverage. Default is 'true'")] readonly bool? Cover = true;

[Parameter("Coverage threshold. Default is 80%")] readonly int Threshold = 80;

[Solution("src/NodaTime.Serialization.Utf8Json/NodaTime.Serialization.Utf8Json.sln")] readonly Solution Solution;
[GitRepository] readonly GitRepository GitRepository;
[GitVersion] readonly GitVersion GitVersion;
[GitVersion(Framework = "netcoreapp3.1")] readonly GitVersion GitVersion;

AbsolutePath SourceDirectory => RootDirectory / "src";
AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";

Target Clean => _ => _
.Executes(() =>
{
DeleteDirectories(GlobDirectories(SourceDirectory, "**/bin", "**/obj"));
GlobDirectories(SourceDirectory, "**/bin", "**/obj").ForEach(DeleteDirectory);
EnsureCleanDirectory(ArtifactsDirectory);
});

Expand All @@ -50,8 +52,8 @@ class Build : NukeBuild
DotNetBuild(s => s
.SetProjectFile(Solution)
.SetConfiguration(Configuration)
.SetAssemblyVersion(GitVersion.GetNormalizedAssemblyVersion())
.SetFileVersion(GitVersion.GetNormalizedFileVersion())
.SetAssemblyVersion($"{GitVersion.Major}.{GitVersion.Minor}.0")
.SetFileVersion(GitVersion.MajorMinorPatch)
.SetInformationalVersion(GitVersion.InformationalVersion)
.SetFramework(Framework)
.EnableNoRestore()
Expand All @@ -69,9 +71,9 @@ class Build : NukeBuild
.EnableNoBuild()
.EnableNoRestore()
.SetLogger("trx")
.SetLogOutput(true)
.EnableProcessLogOutput()
.SetFramework(Framework)
.SetArgumentConfigurator(arguments => arguments.Add("/p:CollectCoverage={0}", Cover)
.SetProcessArgumentConfigurator(arguments => arguments.Add("/p:CollectCoverage={0}", Cover)
.Add("/p:CoverletOutput={0}/", ArtifactsDirectory / "coverage")
.Add("/p:Threshold={0}", Threshold)
.Add("/p:UseSourceLink={0}", "true")
Expand Down
6 changes: 3 additions & 3 deletions build/_build.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<RootNamespace></RootNamespace>
<IsPackable>False</IsPackable>
<NoWarn>CS0649;CS0169</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="0.16.0" />
<PackageReference Include="GitVersion.CommandLine.DotNetCore" Version="4.0.1-beta1-49" />
<PackageReference Include="Nuke.Common" Version="5.0.2" />
<PackageDownload Include="GitVersion.Tool" Version="[5.6.6]" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions ...ion.Utf8Json/.idea/.idea.NodaTime.Serialization.Utf8Json/.idea/projectSettingsUpdater.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions .../DS.NodaTime.Serialization.Utf8Json.Tests/DS.NodaTime.Serialization.Utf8Json.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="coverlet.msbuild" Version="3.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="NodaTime" Version="2.0.0" />
<PackageReference Include="Utf8Json" Version="1.3.7" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
2 changes: 1 addition & 1 deletion ...ion.Utf8Json/DS.NodaTime.Serialization.Utf8Json/DS.NodaTime.Serialization.Utf8Json.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="NodaTime" Version="2.0.0" />
<PackageReference Include="Utf8Json" Version="1.3.7" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

</Project>

0 comments on commit 9996713

Please sign in to comment.