Skip to content
This repository has been archived by the owner on Mar 26, 2019. It is now read-only.

Commit

Permalink
Merge pull request #14 from alhardy/dev
Browse files Browse the repository at this point in the history
1.0.0 release changes
  • Loading branch information
alhardy authored Mar 21, 2017
2 parents 8776794 + 22535d6 commit 78d4947
Show file tree
Hide file tree
Showing 32 changed files with 1,256 additions and 703 deletions.
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ BuildOutput/*
WebPublish
WebPublish/*

#Cake
tools/*
!tools/packages.config

.vs

# visual studio database projects
Expand All @@ -84,3 +88,15 @@ BDN.Generated/*
scripts/BenchMarkDotNet.Artifacts
scripts/BenchMarkDotNet.Artifacts/*
**/BenchMarkDotNet.Artifacts/*
!/benchmarks/App.Metrics.Benchmarks.Runner/BenchMarkDotNet.Artifacts/*
/benchmarks/App.Metrics.Benchmarks.Runner/BenchMarkDotNet.Artifacts/*.log
/benchmarks/App.Metrics.Benchmarks.Runner/BenchMarkDotNet.Artifacts/results/*.csv
/benchmarks/App.Metrics.Benchmarks.Runner/BenchMarkDotNet.Artifacts/results/*.html

#NDepend
*.ndproj
NDependOut/*

#DotCover
Session/*
Session.html
37 changes: 37 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
notifications:
email:
recipients:
- [email protected]

language: csharp
# dotnet: 1.0.0-preview2-003131
os:
- osx
- linux
script:
- ./build_travis.sh

# .NET CLI require Ubuntu 14.04
sudo: required
dist: trusty
addons:
apt:
packages:
- gettext
- libcurl4-openssl-dev
- libicu-dev
- libssl-dev
- libunwind8

# .NET CLI require OSX 10.10
osx_image: xcode7.1
before_install:
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi

mono:
- 4.6.0

cache:
directories:
- src/packages
- tools
35 changes: 26 additions & 9 deletions AppMetrics.Reporters.sln
Original file line number Diff line number Diff line change
@@ -1,29 +1,44 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2D805782-756E-4C98-B22E-F502BEE95318}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{31A4DDB1-952E-4EED-96EF-29C669279A86}"
ProjectSection(SolutionItems) = preProject
.travis.yml = .travis.yml
AppMetrics.ruleset = AppMetrics.ruleset
appveyor.yml = appveyor.yml
GitReleaseManager.yaml = GitReleaseManager.yaml
global.json = global.json
ISSUE_TEMPLATE.md = ISSUE_TEMPLATE.md
stylecop.json = stylecop.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DD2E4647-7125-4CE3-9BA5-B45A26113A31}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "App.Metrics.Extensions.Reporting.Console", "src\App.Metrics.Extensions.Reporting.Console\App.Metrics.Extensions.Reporting.Console.xproj", "{2017C0A4-7CBE-4834-A5EA-D8D9C7E37698}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.Extensions.Reporting.Console", "src\App.Metrics.Extensions.Reporting.Console\App.Metrics.Extensions.Reporting.Console.csproj", "{2017C0A4-7CBE-4834-A5EA-D8D9C7E37698}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.Extensions.Reporting.TextFile", "src\App.Metrics.Extensions.Reporting.TextFile\App.Metrics.Extensions.Reporting.TextFile.csproj", "{2B01FDF8-8E73-4904-9B2C-5BFA505BFF5F}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "App.Metrics.Extensions.Reporting.TextFile", "src\App.Metrics.Extensions.Reporting.TextFile\App.Metrics.Extensions.Reporting.TextFile.xproj", "{2B01FDF8-8E73-4904-9B2C-5BFA505BFF5F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.Extensions.Reporting.InfluxDB", "src\App.Metrics.Extensions.Reporting.InfluxDB\App.Metrics.Extensions.Reporting.InfluxDB.csproj", "{F07C2053-2AD0-4FA0-8265-761FCE289F59}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "App.Metrics.Extensions.Reporting.InfluxDB", "src\App.Metrics.Extensions.Reporting.InfluxDB\App.Metrics.Extensions.Reporting.InfluxDB.xproj", "{F07C2053-2AD0-4FA0-8265-761FCE289F59}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.Extensions.Reporting.InfluxDB.Facts", "test\App.Metrics.Extensions.Reporting.InfluxDB.Facts\App.Metrics.Extensions.Reporting.InfluxDB.Facts.csproj", "{84005F55-AF0E-40F4-A596-129E19C418CE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cake", "Cake", "{E1A943F7-5493-4B64-A448-3E9EEA582E20}"
ProjectSection(SolutionItems) = preProject
build.cake = build.cake
build.ps1 = build.ps1
build.sh = build.sh
build_travis.sh = build_travis.sh
tools\packages.config = tools\packages.config
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "App.Metrics.Extensions.Reporting.InfluxDB.Facts", "test\App.Metrics.Extensions.Reporting.InfluxDB.Facts\App.Metrics.Extensions.Reporting.InfluxDB.Facts.xproj", "{84005F55-AF0E-40F4-A596-129E19C418CE}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Git", "Git", "{4199989A-27B6-4A6A-99C2-1AF6B01DA5EB}"
ProjectSection(SolutionItems) = preProject
GitReleaseManager.yaml = GitReleaseManager.yaml
ISSUE_TEMPLATE.md = ISSUE_TEMPLATE.md
PULL_REQUEST_TEMPLATE.md = PULL_REQUEST_TEMPLATE.md
README.md = README.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -56,5 +71,7 @@ Global
{2B01FDF8-8E73-4904-9B2C-5BFA505BFF5F} = {2D805782-756E-4C98-B22E-F502BEE95318}
{F07C2053-2AD0-4FA0-8265-761FCE289F59} = {2D805782-756E-4C98-B22E-F502BEE95318}
{84005F55-AF0E-40F4-A596-129E19C418CE} = {DD2E4647-7125-4CE3-9BA5-B45A26113A31}
{E1A943F7-5493-4B64-A448-3E9EEA582E20} = {31A4DDB1-952E-4EED-96EF-29C669279A86}
{4199989A-27B6-4A6A-99C2-1AF6B01DA5EB} = {31A4DDB1-952E-4EED-96EF-29C669279A86}
EndGlobalSection
EndGlobal
19 changes: 11 additions & 8 deletions AppMetrics.ruleset
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<Rule Id="UseConfigureAwait" Action="Error" />
</Rules>
<Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
<Rule Id="AD0001" Action="None" />
<Rule Id="CA1001" Action="Warning" />
<Rule Id="CA1009" Action="Warning" />
<Rule Id="CA1016" Action="Warning" />
Expand Down Expand Up @@ -87,8 +88,9 @@
<Rule Id="SA1121" Action="Error" />
<Rule Id="SA1122" Action="Error" />
<Rule Id="SA1133" Action="Error" />
<Rule Id="SA1200" Action="None" />
<Rule Id="SA1201" Action="None" />
<Rule Id="SA1137" Action="None" />
<Rule Id="SA1200" Action="None" />
<Rule Id="SA1201" Action="None" />
<Rule Id="SA1300" Action="Error" />
<Rule Id="SA1302" Action="Error" />
<Rule Id="SA1303" Action="Error" />
Expand All @@ -107,12 +109,13 @@
<Rule Id="SA1408" Action="Error" />
<Rule Id="SA1410" Action="Error" />
<Rule Id="SA1411" Action="Error" />
<Rule Id="SA1412" Action="Warning" />
<Rule Id="SA1502" Action="None" />
<Rule Id="SA1503" Action="Error" />
<Rule Id="SA1512" Action="None" />
<Rule Id="SA1515" Action="None" />
<Rule Id="SA1518" Action="None" />
<Rule Id="SA1412" Action="None" />
<Rule Id="SA1413" Action="None" />
<Rule Id="SA1502" Action="None" />
<Rule Id="SA1503" Action="Error" />
<Rule Id="SA1512" Action="None" />
<Rule Id="SA1515" Action="None" />
<Rule Id="SA1518" Action="None" />
<Rule Id="SA1600" Action="None" />
<Rule Id="SA1603" Action="Error" />
<Rule Id="SA1609" Action="Warning" />
Expand Down
71 changes: 70 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# App Metrics Reporters

[![Official Site](https://img.shields.io/badge/site-appmetrics-blue.svg)](https://alhardy.github.io/app-metrics-docs/getting-started/intro.html) [![Build status](https://ci.appveyor.com/api/projects/status/pomm2m6yfwm6twl7?svg=true)](https://ci.appveyor.com/project/alhardy/appmetrics-reporters) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Coverage Status](https://coveralls.io/repos/github/alhardy/AppMetrics.Reporters/badge.svg?branch=master)](https://coveralls.io/github/alhardy/AppMetrics.Reporters?branch=master)
[![Official Site](https://img.shields.io/badge/site-appmetrics-blue.svg)](https://alhardy.github.io/app-metrics-docs/getting-started/intro.html) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Coverage Status](https://coveralls.io/repos/github/alhardy/AppMetrics.Reporters/badge.svg?branch=master)](https://coveralls.io/github/alhardy/AppMetrics.Reporters?branch=master)

|AppVeyor|Travis|
|:--------:|:--------:|
|[![Build status](https://ci.appveyor.com/api/projects/status/pomm2m6yfwm6twl7?svg=true)](https://ci.appveyor.com/project/alhardy/appmetrics-reporters/branch/master)|[![Build status](https://travis-ci.org/alhardy/AppMetrics.Reporters.svg?branch=1.0.0)](https://travis-ci.org/alhardy/AppMetrics.Reporters?branch=master)|

|Package|Dev Release|Pre Release|Latest Release|
|------|:--------:|:--------:|:--------:|
Expand All @@ -12,14 +16,79 @@

The repo contains reporting extension packages to [App Metrics](https://github.com/alhardy/AppMetrics).

## How to build

[AppVeyor](https://ci.appveyor.com/project/alhardy/appmetrics-reporters/branch/master) and [Travis CI](https://travis-ci.org/alhardy/AppMetrics.Reporters) builds are triggered on commits and PRs to `dev` and `master` branches.

See the following for build arguments and running locally.

|Configuration|Description|Default|Environment|Required|
|------|--------|:--------:|:--------:|:--------:|
|BuildConfiguration|The configuration to run the build, **Debug** or **Release** |*Release*|All|Optional|
|PreReleaseSuffix|The pre-release suffix for versioning nuget package artifacts e.g. `beta`|*ci*|All|Optional|
|CoverWith|**DotCover** or **OpenCover** to calculate and report code coverage, **None** to skip. When not **None**, a coverage file and html report will be generated at `./artifacts/coverage`|*OpenCover*|Windows Only|Optional|
|SkipCodeInspect|**false** to run ReSharper code inspect and report results, **true** to skip. When **true**, the code inspection html report and xml output will be generated at `./artifacts/resharper-reports`|*false*|Windows Only|Optional|
|BuildNumber|The build number to use for pre-release versions|*0*|All|Optional|


### Windows

Run `build.ps1` from the repositories root directory.

```
.\build.ps1'
```

**With Arguments**

```
.\build.ps1 --ScriptArgs '-BuildConfiguration=Release -PreReleaseSuffix=beta -CoverWith=OpenCover -SkipCodeInspect=false -BuildNumber=1'
```

### Linux & OSX

Run `build.sh` from the repositories root directory. Code Coverage reports are now supported on Linux and OSX, it will be skipped running in these environments.

```
.\build.sh'
```

**With Arguments**

```
.\build.sh --ScriptArgs '-BuildConfiguration=Release -PreReleaseSuffix=beta -BuildNumber=1'
```

> #### Nuget Packages
> Nuget packages won't be generated on non-windows environments by default.
>
> Unfortunately there is [currently no way out-of-the-box to conditionally build & pack a project by framework](https://github.com/dotnet/roslyn-project-system/issues/1586#issuecomment-280978851). Because `App.Metrics` packages target `.NET 4.5.2` as well as `dotnet standard` there is a work around in the build script to force `dotnet standard` on build but no work around for packaging on non-windows environments.
## Contributing

See the [contribution guidlines](https://github.com/alhardy/AppMetrics/blob/master/CONTRIBUTING.md) in the [main repo](https://github.com/alhardy/AppMetrics) for details.

## Acknowledgements

* [InfluxDB](https://www.influxdata.com/time-series-platform/influxdb/)
* [DocFX](https://dotnet.github.io/docfx/)
* [Fluent Assertions](http://www.fluentassertions.com/)
* [XUnit](https://xunit.github.io/)
* [StyleCopAnalyzers](https://github.com/DotNetAnalyzers/StyleCopAnalyzers)
* [Cake](https://github.com/cake-build/cake)
* [OpenCover](https://github.com/OpenCover/opencover)

***Thanks for providing free open source licensing***

* [Jetbrains](https://www.jetbrains.com/dotnet/)
* [AppVeyor](https://www.appveyor.com/)
* [Travis CI](https://travis-ci.org/)
* [Coveralls](https://coveralls.io/)

## License

This library is release under Apache 2.0 License ( see LICENSE ) Copyright (c) 2016 Allan Hardy

----------

[![](https://codescene.io/projects/868/status.svg) Get more details at **codescene.io**.](https://codescene.io/projects/868/jobs/latest-successful/results)
17 changes: 14 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
version: 1.0.{build}
nuget:
disable_publish_on_pr: true
image: Visual Studio 2017
environment:
COVERALLS_REPO_TOKEN:
secure: /E0lZiubAjZhemO2k7Y0q7oJZivfJaFrFrcNHCCtNiGkTuJj50HWsgzIN9YZGQ6x
PreReleaseSuffix: stable
CoverWith: OpenCover
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
build_script:
- cmd: build.cmd
- ps: .\build.ps1 -Target AppVeyor
test: off
artifacts:
- path: artifacts/packages/*.nupkg
- path: artifacts/coverage/*.xml
- path: artifacts/test-results/*.trx
- path: artifacts/resharper-reports/*.xml
- path: artifacts/resharper-reports/*.html
- path: artifacts/coverage/coverage.dcvr
deploy:
- provider: NuGet
server: https://www.myget.org/F/alhardy/api/v2/package
Expand Down
Loading

0 comments on commit 78d4947

Please sign in to comment.