Skip to content

Commit 4d1d6ff

Browse files
authored
Merge pull request #131 from PrometheusClientNet/extract-abstractions
Extract abstractions into separate assembly
2 parents d312416 + e60f138 commit 4d1d6ff

File tree

92 files changed

+95
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+95
-112
lines changed

.github/workflows/master.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ jobs:
2424
- name: Publish to Codecov
2525
uses: codecov/codecov-action@v1
2626
- name: Pack artifacts
27-
run: dotnet pack src/Prometheus.Client -c Release --no-build --version-suffix dev-$(date +%s) -o artifacts/
27+
run: |
28+
dotnet pack src/Prometheus.Client -c Release --no-build --version-suffix dev-$(date +%s) -o artifacts/
29+
dotnet pack src/Prometheus.Client.Abstractions -c Release --no-build --version-suffix dev-$(date +%s) -o artifacts/
2830
- name: Upload artifacts
2931
uses: actions/upload-artifact@v2
3032
with:

.github/workflows/production.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ jobs:
1818
- name: Tests
1919
run: dotnet test -c Release --no-build
2020
- name: Pack artifacts
21-
run: dotnet pack src/Prometheus.Client -c Release --no-build -o artifacts/
21+
run: |
22+
dotnet pack src/Prometheus.Client -c Release --no-build -o artifacts/
23+
dotnet pack src/Prometheus.Client.Abstractions -c Release --no-build -o artifacts/
2224
- name: Publish artifacts
2325
uses: actions/upload-artifact@v2
2426
with:

Prometheus.Client.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ ProjectSection(SolutionItems) = preProject
4242
.github\workflows\production.yml = .github\workflows\production.yml
4343
EndProjectSection
4444
EndProject
45+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prometheus.Client.Abstractions", "src\Prometheus.Client.Abstractions\Prometheus.Client.Abstractions.csproj", "{9A9877F3-719E-4237-BE84-6008E214B7FD}"
46+
EndProject
4547
Global
4648
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4749
Debug|Any CPU = Debug|Any CPU
@@ -64,6 +66,10 @@ Global
6466
{5B614BED-2C54-40F3-8F01-3995E4298137}.Debug|Any CPU.Build.0 = Debug|Any CPU
6567
{5B614BED-2C54-40F3-8F01-3995E4298137}.Release|Any CPU.ActiveCfg = Release|Any CPU
6668
{5B614BED-2C54-40F3-8F01-3995E4298137}.Release|Any CPU.Build.0 = Release|Any CPU
69+
{9A9877F3-719E-4237-BE84-6008E214B7FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70+
{9A9877F3-719E-4237-BE84-6008E214B7FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
71+
{9A9877F3-719E-4237-BE84-6008E214B7FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
72+
{9A9877F3-719E-4237-BE84-6008E214B7FD}.Release|Any CPU.Build.0 = Release|Any CPU
6773
EndGlobalSection
6874
GlobalSection(SolutionProperties) = preSolution
6975
HideSolutionNode = FALSE
@@ -74,6 +80,7 @@ Global
7480
{7938605B-A516-4B8C-A8E0-40901CB903DE} = {FE42C2D5-9D20-44A2-A9ED-477527A832AD}
7581
{5B614BED-2C54-40F3-8F01-3995E4298137} = {FE42C2D5-9D20-44A2-A9ED-477527A832AD}
7682
{C9643321-CB54-4E2E-B02D-6A6538F3B45F} = {7F0C12DB-909E-4061-80C2-87CE8DF7CDA7}
83+
{9A9877F3-719E-4237-BE84-6008E214B7FD} = {D994EEE1-3786-4FDF-8A49-76D8B9819A29}
7784
EndGlobalSection
7885
GlobalSection(ExtensibilityGlobals) = postSolution
7986
SolutionGuid = {A21B7555-E98B-4C23-9545-70BCF791DE3E}

src/Prometheus.Client/Collectors/Abstractions/ICollector.cs renamed to src/Prometheus.Client.Abstractions/Collectors/ICollector.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Generic;
2-
using Prometheus.Client.MetricsWriter.Abstractions;
2+
using Prometheus.Client.MetricsWriter;
33

4-
namespace Prometheus.Client.Collectors.Abstractions
4+
namespace Prometheus.Client.Collectors
55
{
66
public interface ICollector
77
{

src/Prometheus.Client/Collectors/Abstractions/ICollectorRegistry.cs renamed to src/Prometheus.Client.Abstractions/Collectors/ICollectorRegistry.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.Threading.Tasks;
3-
using Prometheus.Client.MetricsWriter.Abstractions;
3+
using Prometheus.Client.MetricsWriter;
44

5-
namespace Prometheus.Client.Collectors.Abstractions
5+
namespace Prometheus.Client.Collectors
66
{
77
public interface ICollectorRegistry
88
{

src/Prometheus.Client/CounterExtensions.cs renamed to src/Prometheus.Client.Abstractions/CounterExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#if HasITuple
33
using System.Runtime.CompilerServices;
44
#endif
5-
using Prometheus.Client.Abstractions;
65

76
namespace Prometheus.Client
87
{

src/Prometheus.Client/CounterInt64Extensions.cs renamed to src/Prometheus.Client.Abstractions/CounterInt64Extensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#if HasITuple
33
using System.Runtime.CompilerServices;
44
#endif
5-
using Prometheus.Client.Abstractions;
65

76
namespace Prometheus.Client
87
{

src/Prometheus.Client/GaugeExtensions.cs renamed to src/Prometheus.Client.Abstractions/GaugeExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#if HasITuple
33
using System.Runtime.CompilerServices;
44
#endif
5-
using Prometheus.Client.Abstractions;
65

76
namespace Prometheus.Client
87
{

src/Prometheus.Client/GaugeInt64Extensions.cs renamed to src/Prometheus.Client.Abstractions/GaugeInt64Extensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#if HasITuple
33
using System.Runtime.CompilerServices;
44
#endif
5-
using Prometheus.Client.Abstractions;
65

76
namespace Prometheus.Client
87
{

0 commit comments

Comments
 (0)