Skip to content

Commit 807f0bc

Browse files
committed
Move Owin to External Lib. Add examples. Fix some bugs
1 parent 6fd43e9 commit 807f0bc

Some content is hidden

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

68 files changed

+930
-5520
lines changed

.gitattributes

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
*.sln merge=union
7+
*.csproj merge=union
8+
*.vbproj merge=union
9+
*.fsproj merge=union
10+
*.dbproj merge=union
11+
12+
# Standard to msysgit
13+
*.doc diff=astextplain
14+
*.DOC diff=astextplain
15+
*.docx diff=astextplain
16+
*.DOCX diff=astextplain
17+
*.dot diff=astextplain
18+
*.DOT diff=astextplain
19+
*.pdf diff=astextplain
20+
*.PDF diff=astextplain
21+
*.rtf diff=astextplain
22+
*.RTF diff=astextplain

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
*.user
33
*.suo
44
*.exe
5-
*.lock.json
65

76
.vs
87
bin
98
obj
9+
packages

Prometheus.Client.Tests/Prometheus.Client.Tests.xproj

Lines changed: 0 additions & 19 deletions
This file was deleted.

Prometheus.Client.Tests/project.json

Lines changed: 0 additions & 33 deletions
This file was deleted.

Prometheus.Client.sln

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,58 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.4
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D994EEE1-3786-4FDF-8A49-76D8B9819A29}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4AF762EE-AC2C-481B-8D03-2AC5234E8723}"
99
ProjectSection(SolutionItems) = preProject
10-
global.json = global.json
10+
LICENSE = LICENSE
1111
README.md = README.md
1212
EndProjectSection
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2D96C0A4-CA7D-49E1-AB75-967CFEBB1EC6}"
1515
EndProject
16-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Prometheus.Client", "Prometheus.Client\Prometheus.Client.xproj", "{F376826E-C202-4265-8CD8-F1F8C132A013}"
16+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{E4FCD5AF-30E0-4194-A7CC-875967A45A53}"
1717
EndProject
18-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Prometheus.Client.Tests", "Prometheus.Client.Tests\Prometheus.Client.Tests.xproj", "{39307509-C927-4974-9114-E036C8F7DF54}"
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiApplication", "examples\WebApiApplication\WebApiApplication.csproj", "{22C001AB-416F-4BA0-9F93-870ED8EFE294}"
19+
EndProject
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prometheus.Client", "src\Prometheus.Client\Prometheus.Client.csproj", "{B0E7B525-2F11-446F-A2F3-9A07083E3D6E}"
21+
EndProject
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prometheus.Client.Tests", "test\Prometheus.Client.Tests\Prometheus.Client.Tests.csproj", "{6BE45D44-1C0F-41C5-BC87-53938FD6FCFE}"
23+
EndProject
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebCoreApplication", "examples\WebCoreApplication\WebCoreApplication.csproj", "{C5BE25DF-83C1-44FC-82C2-43A6A5F63A6A}"
1925
EndProject
2026
Global
2127
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2228
Debug|Any CPU = Debug|Any CPU
2329
Release|Any CPU = Release|Any CPU
2430
EndGlobalSection
2531
GlobalSection(ProjectConfigurationPlatforms) = postSolution
26-
{F376826E-C202-4265-8CD8-F1F8C132A013}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{F376826E-C202-4265-8CD8-F1F8C132A013}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{F376826E-C202-4265-8CD8-F1F8C132A013}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{F376826E-C202-4265-8CD8-F1F8C132A013}.Release|Any CPU.Build.0 = Release|Any CPU
30-
{39307509-C927-4974-9114-E036C8F7DF54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31-
{39307509-C927-4974-9114-E036C8F7DF54}.Debug|Any CPU.Build.0 = Debug|Any CPU
32-
{39307509-C927-4974-9114-E036C8F7DF54}.Release|Any CPU.ActiveCfg = Release|Any CPU
33-
{39307509-C927-4974-9114-E036C8F7DF54}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{22C001AB-416F-4BA0-9F93-870ED8EFE294}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{22C001AB-416F-4BA0-9F93-870ED8EFE294}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{22C001AB-416F-4BA0-9F93-870ED8EFE294}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{22C001AB-416F-4BA0-9F93-870ED8EFE294}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{B0E7B525-2F11-446F-A2F3-9A07083E3D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{B0E7B525-2F11-446F-A2F3-9A07083E3D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{B0E7B525-2F11-446F-A2F3-9A07083E3D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{B0E7B525-2F11-446F-A2F3-9A07083E3D6E}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{6BE45D44-1C0F-41C5-BC87-53938FD6FCFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{6BE45D44-1C0F-41C5-BC87-53938FD6FCFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{6BE45D44-1C0F-41C5-BC87-53938FD6FCFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{6BE45D44-1C0F-41C5-BC87-53938FD6FCFE}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{C5BE25DF-83C1-44FC-82C2-43A6A5F63A6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{C5BE25DF-83C1-44FC-82C2-43A6A5F63A6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{C5BE25DF-83C1-44FC-82C2-43A6A5F63A6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
47+
{C5BE25DF-83C1-44FC-82C2-43A6A5F63A6A}.Release|Any CPU.Build.0 = Release|Any CPU
3448
EndGlobalSection
3549
GlobalSection(SolutionProperties) = preSolution
3650
HideSolutionNode = FALSE
3751
EndGlobalSection
3852
GlobalSection(NestedProjects) = preSolution
39-
{F376826E-C202-4265-8CD8-F1F8C132A013} = {D994EEE1-3786-4FDF-8A49-76D8B9819A29}
40-
{39307509-C927-4974-9114-E036C8F7DF54} = {2D96C0A4-CA7D-49E1-AB75-967CFEBB1EC6}
53+
{22C001AB-416F-4BA0-9F93-870ED8EFE294} = {E4FCD5AF-30E0-4194-A7CC-875967A45A53}
54+
{B0E7B525-2F11-446F-A2F3-9A07083E3D6E} = {D994EEE1-3786-4FDF-8A49-76D8B9819A29}
55+
{6BE45D44-1C0F-41C5-BC87-53938FD6FCFE} = {2D96C0A4-CA7D-49E1-AB75-967CFEBB1EC6}
56+
{C5BE25DF-83C1-44FC-82C2-43A6A5F63A6A} = {E4FCD5AF-30E0-4194-A7CC-875967A45A53}
4157
EndGlobalSection
4258
EndGlobal

Prometheus.Client/Owin/CollectorLocator.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

Prometheus.Client/Owin/PrometheusExtensions.cs

Lines changed: 0 additions & 101 deletions
This file was deleted.

Prometheus.Client/Owin/PrometheusOptions.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

Prometheus.Client/Prometheus.Client.xproj

Lines changed: 0 additions & 19 deletions
This file was deleted.

Prometheus.Client/project.json

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)