Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Net40 0.47 influxdb1x #135

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open

Net40 0.47 influxdb1x #135

wants to merge 67 commits into from

Commits on Jul 29, 2014

  1. .net 40 support: added Task.Delay and Task.FromResult equivalents

    Iulian Margarintescu committed Jul 29, 2014
    Configuration menu
    Copy the full SHA
    3362f31 View commit details
    Browse the repository at this point in the history

  2. first try of .net 4.0 version

    Iulian Margarintescu committed Jul 29, 2014
    Configuration menu
    Copy the full SHA
    9ade14b View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Src/Metrics.Tests/packages.config
    Iulian Margarintescu committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    ba8b093 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into net40

    Iulian Margarintescu committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    8999174 View commit details
    Browse the repository at this point in the history

  3. fix tests project file

    Iulian Margarintescu committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    7adfddf View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2014

  1. Merge branch 'dev' into net40 

    Conflicts:
	Samples/NancyFx.Sample/packages.config
	Src/Adapters/Owin.Metrics/packages.config
	Src/Metrics.Tests/packages.config
    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    f780ff4 View commit details
    Browse the repository at this point in the history

  2. remove owin from .net 40 tests

    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    23b1190 View commit details
    Browse the repository at this point in the history

  3. switch xunit nuget to net4.0

    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    22aa8c4 View commit details
    Browse the repository at this point in the history

  4. retarget nuget for log4net to .net40

    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    476038a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' into net40

    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    8f6a514 View commit details
    Browse the repository at this point in the history

  6. fix runtime version for sample console

    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    8b7c513 View commit details
    Browse the repository at this point in the history

  7. remove owin metrics from tests on net40

    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    dc6d080 View commit details
    Browse the repository at this point in the history

  8. remove 4.5 dependencies from tests

    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    0c840d8 View commit details
    Browse the repository at this point in the history

  9. remove samples & mono build conf

    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    1da2843 View commit details
    Browse the repository at this point in the history

  10. add specific net40 build script

    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    db47e5b View commit details
    Browse the repository at this point in the history

  11. publish .net40 to nuget

    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    407b071 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into net40

    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    b420e07 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'dev' into net40

    @etishor
    etishor committed Aug 16, 2014
    Configuration menu
    Copy the full SHA
    dcb5257 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	SharedAssemblyInfo.cs
    Iulian Margarintescu committed Sep 16, 2014
    Configuration menu
    Copy the full SHA
    d363476 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2014

  1. Merge branch 'dev' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	Src/Metrics.Tests/OwinAdapter/OwinMetricsTestData.cs
	Src/Metrics.Tests/OwinAdapter/OwinMiddlewareTests.cs
	Src/Metrics/Utils/ActionScheduler.cs
    Iulian Margarintescu committed Sep 18, 2014
    Configuration menu
    Copy the full SHA
    564466f View commit details
    Browse the repository at this point in the history

  2. use same version as 4.5 version

    Iulian Margarintescu committed Sep 18, 2014
    Configuration menu
    Copy the full SHA
    169ea97 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2014

  1. Merge branch 'dev' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	Src/Metrics.Tests/packages.config
	Src/Metrics/Utils/ActionScheduler.cs
    @etishor
    etishor committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    aa82315 View commit details
    Browse the repository at this point in the history

  2. fix net40 tests

    @etishor
    etishor committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    acfdf4a View commit details
    Browse the repository at this point in the history

  3. bump version, push to nuget

    @etishor
    etishor committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    f62317e View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	SharedAssemblyInfo.cs
    @etishor
    etishor committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    da26d2c View commit details
    Browse the repository at this point in the history

  2. bump version, push to nuget

    @etishor
    etishor committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    902386d View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	SharedAssemblyInfo.cs
	Src/Metrics.Tests/OwinAdapter/OwinMiddlewareTests.cs
	create-nuget.bat
    @etishor
    etishor committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    3c1f354 View commit details
    Browse the repository at this point in the history

  2. fix tests csproj

    @etishor
    etishor committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    7f160a3 View commit details
    Browse the repository at this point in the history

  3. bump version, push to nuget

    @etishor
    etishor committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    bf786c1 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2014

  1. Merge branch 'dev' into net40 

    Conflicts:
	create-nuget.bat
    Iulian Margarintescu committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    bdcada2 View commit details
    Browse the repository at this point in the history

  2. added icon to nuget packages

    Iulian Margarintescu committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    fb76535 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	Samples/Owin.Sample/App.config
    @etishor
    etishor committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    4589010 View commit details
    Browse the repository at this point in the history

  2. update version, push to nuget

    @etishor
    etishor committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    a7a7116 View commit details
    Browse the repository at this point in the history

  3. remove owin sample

    @etishor
    etishor committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    668ffe1 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	Samples/Owin.Sample/Program.cs
    Iulian Margarintescu committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    9013cf4 View commit details
    Browse the repository at this point in the history

  2. bump nuget version

    Iulian Margarintescu committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    f241c4e View commit details
    Browse the repository at this point in the history

  3. remove async code

    Iulian Margarintescu committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    ebc9198 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2014

  1. Merge branch 'dev' into net40

    @etishor
    etishor committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    6416ea9 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	SharedAssemblyInfo.cs
	Src/Metrics/Visualization/MetricsHttpListener.cs
    Iulian Margarintescu committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    8912337 View commit details
    Browse the repository at this point in the history

  2. bump version, push to nuget

    Iulian Margarintescu committed Oct 17, 2014
    Configuration menu
    Copy the full SHA
    08c443c View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	Samples/Owin.Sample/App.config
	Samples/Owin.Sample/Program.cs
	Src/Metrics.Tests/OwinAdapter/OwinMiddlewareTests.cs
	Src/Metrics.Tests/app.config
	Src/Metrics/RemoteMetrics/RemoteMetricsContext.cs
	Src/Metrics/Visualization/MetricsHttpListener.cs
    Iulian Margarintescu committed Oct 28, 2014
    Configuration menu
    Copy the full SHA
    2b2e390 View commit details
    Browse the repository at this point in the history

  2. .net 40 fixes

    Iulian Margarintescu committed Oct 28, 2014
    Configuration menu
    Copy the full SHA
    fec0039 View commit details
    Browse the repository at this point in the history

  3. push nuget

    Iulian Margarintescu committed Oct 28, 2014
    Configuration menu
    Copy the full SHA
    6f6457d View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	SharedAssemblyInfo.cs
    Iulian Margarintescu committed Oct 29, 2014
    Configuration menu
    Copy the full SHA
    0159594 View commit details
    Browse the repository at this point in the history

  2. bump version, push to nuget

    Iulian Margarintescu committed Oct 29, 2014
    Configuration menu
    Copy the full SHA
    371cc92 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	SharedAssemblyInfo.cs
    Iulian Margarintescu committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    f46abb3 View commit details
    Browse the repository at this point in the history

  2. bump version, push nuget

    Iulian Margarintescu committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    1e45918 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	SharedAssemblyInfo.cs
    Iulian Margarintescu committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    32acdc6 View commit details
    Browse the repository at this point in the history

  2. bump version

    Iulian Margarintescu committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    28a8e69 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	Samples/Metrics.SampleReporter/packages.config
	Samples/Metrics.SamplesConsole/App.config
	Samples/Owin.Sample/App.config
	Samples/Owin.Sample/Owin.Sample.csproj
	Samples/Owin.Sample/packages.config
	SharedAssemblyInfo.cs
	Src/Adapters/Metrics.NLog/packages.config
	Src/Adapters/Nancy.Metrics/packages.config
	Src/Metrics.Tests/packages.config
	Src/Metrics/Utils/ActionScheduler.cs
	Src/Metrics/Visualization/MetricsHttpListener.cs
	create-nuget.bat
    @etishor
    etishor committed Nov 16, 2014
    Configuration menu
    Copy the full SHA
    f814540 View commit details
    Browse the repository at this point in the history

  2. bump version, push nuget

    @etishor
    etishor committed Nov 16, 2014
    Configuration menu
    Copy the full SHA
    ad43c68 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	Src/Metrics/Visualization/MetricsHttpListener.cs
    Iulian Margarintescu committed Nov 26, 2014
    Configuration menu
    Copy the full SHA
    e7b9d13 View commit details
    Browse the repository at this point in the history

  2. bump version, push nuget

    Iulian Margarintescu committed Nov 26, 2014
    Configuration menu
    Copy the full SHA
    0cc7c98 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	Src/Metrics.Tests/packages.config
    @etishor
    etishor committed Dec 14, 2014
    Configuration menu
    Copy the full SHA
    1a5b759 View commit details
    Browse the repository at this point in the history

  2. bump version, push nuget

    @etishor
    etishor committed Dec 14, 2014
    Configuration menu
    Copy the full SHA
    c93740e View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	Src/Metrics.Tests/OwinAdapter/OwinMiddlewareTests.cs
	Src/Metrics.Tests/packages.config
    Iulian Margarintescu committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    4fd06de View commit details
    Browse the repository at this point in the history

  2. bump version, push nuget

    Iulian Margarintescu committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    0064c0d View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2014

  1. Merge branch 'master' into net40 

    Conflicts:
	Src/Metrics.Tests/packages.config
	create-nuget.bat
    Iulian Margarintescu committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    33b6060 View commit details
    Browse the repository at this point in the history

  2. fix build script

    Iulian Margarintescu committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    d3f259c View commit details
    Browse the repository at this point in the history

  3. fix build for net40

    Iulian Margarintescu committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    6d8bacf View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2015

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
	Src/Adapters/Metrics.NLog/packages.config
	Src/Adapters/Nancy.Metrics/packages.config
	Src/Metrics.Tests/packages.config
	Src/Metrics/RemoteMetrics/RemoteMetricsContext.cs
	Src/Metrics/Utils/ActionScheduler.cs
    Iulian Margarintescu committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    169f8a3 View commit details
    Browse the repository at this point in the history

  2. bump package versions

    Iulian Margarintescu committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    17b6917 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2015

  1. Merge branch 'master' into net40 

    Conflicts:
	Publishing/push-nuget.bat
    Iulian Margarintescu committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    456a71a View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2017

  1. update all code in Metrics.Net Project to 0.4.7

    @shamork
    shamork committed Jan 7, 2017
    Configuration menu
    Copy the full SHA
    25c2ace View commit details
    Browse the repository at this point in the history

  2. update influxdb support to 1.0x 

    All related code are copied from https://github.com/mnadel/Metrics.NET.InfluxDB/
    @shamork
    shamork committed Jan 7, 2017
    Configuration menu
    Copy the full SHA
    4901de1 View commit details
    Browse the repository at this point in the history

  3. update nuget package

    @shamork
    shamork committed Jan 7, 2017
    Configuration menu
    Copy the full SHA
    eabe20b View commit details
    Browse the repository at this point in the history

  4. updated nuget package

    @shamork
    shamork committed Jan 7, 2017
    Configuration menu
    Copy the full SHA
    9758d90 View commit details
    Browse the repository at this point in the history