From 781039ef94198b7e206ed345497893ba57438050 Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 02:52:27 -0700 Subject: [PATCH 01/15] sign assembly with strong name --- .../prometheus-net.DotNetRuntime.csproj | 2 ++ .../prometheus-net.DotNetRuntime.snk | Bin 0 -> 596 bytes 2 files changed, 2 insertions(+) create mode 100644 src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.snk diff --git a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj index ca2e2cf..e5ca592 100644 --- a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj +++ b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj @@ -28,6 +28,8 @@ 8 true 1701;1702;CS1591; + true + prometheus-net.DotNetRuntime.snk diff --git a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.snk b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.snk new file mode 100644 index 0000000000000000000000000000000000000000..b338cc80bf361a4c1544879e827ac92ef18760d5 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097@U^TwtuoRW^P_(a#9Sd*7PWCHzKasWW z$0F+=5mU-&uNj9>yP!FH?3il0;`IdVl(#ACYp5Ruk|6a7^q)&Bg+rr=E+-W0=0FlB z1-62vckK5?f=Q^1sUEhW-6C{GC?Ti@3~mgLD7P||I~jXaWKidHLkUT&JrPZ~`0czi z&a9(648}*bR#GqtFP+OWwi{PW6b1D!KjcL<97d$Tk@&H}XM@*RTy|1(#M-k2IyW0Q z8xYG;!ThI!QLg*j8OleL?B3ubEAc*MjTPHh?V)O=n9fHMUO9i#y@;O(mRiv#E*<9! z&8h4i`_wkTTyUCJBy)VGuRu(M`76K+-98d*?&W#X4+<7LVuu|8Duo`~(b(+MOD&v= zQwH?XWfnI6ST-;}V)49mKjbag1OP3NxcD$~BB9QR)7i*Lsi*~(&whl_N;S52|Bu1E zj4%h5L0rOq^E{yi9f)<+Q3&oM$-2S0+OxO8noXREPnbZoge;+X+so>Ir!cvLyO*B- zM^Gn|6RDK`Yr_nn-9B<2>*5FrEhBva8bY4@)org_zZ!Fw)EUvo2vxKWWCMZG}H%`u_T~r-<1-00`D(I>CI?G_0ZOZ<{LXQr& i*n(|qNK~d63^GbfS;(*X@#^4BiT8?Ih7^aMA}JWxq8I7_ literal 0 HcmV?d00001 From 605b4f0ee813e2703e4a9c89f7577bc66e427f6a Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 02:57:49 -0700 Subject: [PATCH 02/15] signing tests --- .../prometheus-net.DotNetRuntime.Tests.csproj | 2 ++ .../prometheus-net.DotNetRuntime.snk | Bin 0 -> 596 bytes 2 files changed, 2 insertions(+) create mode 100644 src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.snk diff --git a/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.Tests.csproj b/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.Tests.csproj index ca23a85..5bb3174 100644 --- a/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.Tests.csproj +++ b/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.Tests.csproj @@ -16,6 +16,8 @@ ReleaseV2;DebugV2;DebugV3;ReleaseV3 AnyCPU true + true + prometheus-net.DotNetRuntime.snk diff --git a/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.snk b/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.snk new file mode 100644 index 0000000000000000000000000000000000000000..b338cc80bf361a4c1544879e827ac92ef18760d5 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097@U^TwtuoRW^P_(a#9Sd*7PWCHzKasWW z$0F+=5mU-&uNj9>yP!FH?3il0;`IdVl(#ACYp5Ruk|6a7^q)&Bg+rr=E+-W0=0FlB z1-62vckK5?f=Q^1sUEhW-6C{GC?Ti@3~mgLD7P||I~jXaWKidHLkUT&JrPZ~`0czi z&a9(648}*bR#GqtFP+OWwi{PW6b1D!KjcL<97d$Tk@&H}XM@*RTy|1(#M-k2IyW0Q z8xYG;!ThI!QLg*j8OleL?B3ubEAc*MjTPHh?V)O=n9fHMUO9i#y@;O(mRiv#E*<9! z&8h4i`_wkTTyUCJBy)VGuRu(M`76K+-98d*?&W#X4+<7LVuu|8Duo`~(b(+MOD&v= zQwH?XWfnI6ST-;}V)49mKjbag1OP3NxcD$~BB9QR)7i*Lsi*~(&whl_N;S52|Bu1E zj4%h5L0rOq^E{yi9f)<+Q3&oM$-2S0+OxO8noXREPnbZoge;+X+so>Ir!cvLyO*B- zM^Gn|6RDK`Yr_nn-9B<2>*5FrEhBva8bY4@)org_zZ!Fw)EUvo2vxKWWCMZG}H%`u_T~r-<1-00`D(I>CI?G_0ZOZ<{LXQr& i*n(|qNK~d63^GbfS;(*X@#^4BiT8?Ih7^aMA}JWxq8I7_ literal 0 HcmV?d00001 From 36ff0f1fb28ed4c64ffed1301b76cd38d4cacfcc Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 03:08:31 -0700 Subject: [PATCH 03/15] assembly reference with public key --- src/prometheus-net.DotNetRuntime/Properties.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/prometheus-net.DotNetRuntime/Properties.cs b/src/prometheus-net.DotNetRuntime/Properties.cs index 5d287e3..e9179d7 100644 --- a/src/prometheus-net.DotNetRuntime/Properties.cs +++ b/src/prometheus-net.DotNetRuntime/Properties.cs @@ -1,2 +1,6 @@ using System.Runtime.CompilerServices; -[assembly:InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests")] \ No newline at end of file +[assembly:InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a16035bee2b014 +95f350b4af8a1d0b6fc44ef62b773f91b5eec722eb1f1153ca68af198750bba0397bec986abae2 +f504ec94b729eb6ba81f059220f509f49f4b2b8543a3882e2714ebe640122705b682a577ecf745 +8249a88ca91eb6a1dd2274462821a8060c6e0c8e28b732953b197b546450e774430949ac3d114d +b8f8edbc")] \ No newline at end of file From 86c679e52d293eaedb320e9707a30d020a3033de Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 03:12:41 -0700 Subject: [PATCH 04/15] public key formating --- src/prometheus-net.DotNetRuntime/Properties.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/prometheus-net.DotNetRuntime/Properties.cs b/src/prometheus-net.DotNetRuntime/Properties.cs index e9179d7..c891ff1 100644 --- a/src/prometheus-net.DotNetRuntime/Properties.cs +++ b/src/prometheus-net.DotNetRuntime/Properties.cs @@ -1,6 +1,6 @@ using System.Runtime.CompilerServices; -[assembly:InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a16035bee2b014 -95f350b4af8a1d0b6fc44ef62b773f91b5eec722eb1f1153ca68af198750bba0397bec986abae2 -f504ec94b729eb6ba81f059220f509f49f4b2b8543a3882e2714ebe640122705b682a577ecf745 -8249a88ca91eb6a1dd2274462821a8060c6e0c8e28b732953b197b546450e774430949ac3d114d -b8f8edbc")] \ No newline at end of file +[assembly:InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests, PublicKey=00240000048000009400000006020000" + + "00240000525341310004000001000100a16035bee2b01495f350b4af8a1d0b6fc44ef62b773f91b" + + "5eec722eb1f1153ca68af198750bba0397bec986abae2f504ec94b729eb6ba81f059220f509f49f4" + + "b2b8543a3882e2714ebe640122705b682a577ecf7458249a88ca91eb6a1dd2274462821a8060c6e0" + + "c8e28b732953b197b546450e774430949ac3d114db8f8edbc")] \ No newline at end of file From f257fa2855507873306c3013f764873ff4fdfb95 Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 03:19:30 -0700 Subject: [PATCH 05/15] Latest version of prometheus --- .../prometheus-net.DotNetRuntime.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj index e5ca592..3d21440 100644 --- a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj +++ b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj @@ -58,7 +58,7 @@ - + From 26a6545a3c676c4d88f43eb0bbe5040d1874051e Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 03:35:27 -0700 Subject: [PATCH 06/15] sign only v3 as v2 prometheus-netstandard isn't signed --- .../prometheus-net.DotNetRuntime.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj index 3d21440..7309e16 100644 --- a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj +++ b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj @@ -7,6 +7,8 @@ 3 $(DefineConstants);PROMV3 + true + prometheus-net.DotNetRuntime.snk @@ -28,8 +30,6 @@ 8 true 1701;1702;CS1591; - true - prometheus-net.DotNetRuntime.snk @@ -54,11 +54,11 @@ - + - + From 81bcbaec4dd3e8abc0997bb2c25001bed520c6f7 Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 03:59:25 -0700 Subject: [PATCH 07/15] strong name with seperate package. remove properties.cs which isn't being used --- prometheus-net.DotNetRuntime.sln | 35 ++++++++++--- .../Properties.cs | 6 --- .../prometheus-net.DotNetRuntime.csproj | 2 - ...rometheus-net.DotNetRuntimeStrongV3.csproj | 51 +++++++++++++++++++ 4 files changed, 78 insertions(+), 16 deletions(-) delete mode 100644 src/prometheus-net.DotNetRuntime/Properties.cs create mode 100644 src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj diff --git a/prometheus-net.DotNetRuntime.sln b/prometheus-net.DotNetRuntime.sln index 79d2954..d111705 100644 --- a/prometheus-net.DotNetRuntime.sln +++ b/prometheus-net.DotNetRuntime.sln @@ -1,35 +1,40 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "prometheus-net.DotNetRuntime", "src\prometheus-net.DotNetRuntime\prometheus-net.DotNetRuntime.csproj", "{A40AD08A-53CB-40F3-A6D8-6FFCEC024289}" +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1062 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "prometheus-net.DotNetRuntime", "src\prometheus-net.DotNetRuntime\prometheus-net.DotNetRuntime.csproj", "{A40AD08A-53CB-40F3-A6D8-6FFCEC024289}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "prometheus-net.DotNetRuntime.Tests", "src\prometheus-net.DotNetRuntime.Tests\prometheus-net.DotNetRuntime.Tests.csproj", "{7F4E2E72-5745-4312-B238-CD7B731957B0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "prometheus-net.DotNetRuntime.Tests", "src\prometheus-net.DotNetRuntime.Tests\prometheus-net.DotNetRuntime.Tests.csproj", "{7F4E2E72-5745-4312-B238-CD7B731957B0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{31AD912F-A1DC-434A-8C8D-049F4BBD67D4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetCoreExample", "examples\AspNetCoreExample\AspNetCoreExample.csproj", "{D01E9ED3-E35C-4F44-A5AD-5350E43AA636}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreExample", "examples\AspNetCoreExample\AspNetCoreExample.csproj", "{D01E9ED3-E35C-4F44-A5AD-5350E43AA636}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "prometheus-net.DotNetRuntimeStrongV3", "src\prometheus-net.DotNetRuntime\prometheus-net.DotNetRuntimeStrongV3.csproj", "{4331C56B-5A8A-420F-986D-9938153F3F3F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - ReleaseV2|Any CPU = ReleaseV2|Any CPU DebugV2|Any CPU = DebugV2|Any CPU DebugV3|Any CPU = DebugV3|Any CPU + ReleaseV2|Any CPU = ReleaseV2|Any CPU ReleaseV3|Any CPU = ReleaseV3|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A40AD08A-53CB-40F3-A6D8-6FFCEC024289}.ReleaseV2|Any CPU.ActiveCfg = ReleaseV2|Any CPU - {A40AD08A-53CB-40F3-A6D8-6FFCEC024289}.ReleaseV2|Any CPU.Build.0 = ReleaseV2|Any CPU {A40AD08A-53CB-40F3-A6D8-6FFCEC024289}.DebugV2|Any CPU.ActiveCfg = DebugV2|Any CPU {A40AD08A-53CB-40F3-A6D8-6FFCEC024289}.DebugV2|Any CPU.Build.0 = DebugV2|Any CPU {A40AD08A-53CB-40F3-A6D8-6FFCEC024289}.DebugV3|Any CPU.ActiveCfg = DebugV3|Any CPU {A40AD08A-53CB-40F3-A6D8-6FFCEC024289}.DebugV3|Any CPU.Build.0 = DebugV3|Any CPU + {A40AD08A-53CB-40F3-A6D8-6FFCEC024289}.ReleaseV2|Any CPU.ActiveCfg = ReleaseV2|Any CPU + {A40AD08A-53CB-40F3-A6D8-6FFCEC024289}.ReleaseV2|Any CPU.Build.0 = ReleaseV2|Any CPU {A40AD08A-53CB-40F3-A6D8-6FFCEC024289}.ReleaseV3|Any CPU.ActiveCfg = ReleaseV3|Any CPU {A40AD08A-53CB-40F3-A6D8-6FFCEC024289}.ReleaseV3|Any CPU.Build.0 = ReleaseV3|Any CPU - {7F4E2E72-5745-4312-B238-CD7B731957B0}.ReleaseV2|Any CPU.ActiveCfg = ReleaseV2|Any CPU - {7F4E2E72-5745-4312-B238-CD7B731957B0}.ReleaseV2|Any CPU.Build.0 = ReleaseV2|Any CPU {7F4E2E72-5745-4312-B238-CD7B731957B0}.DebugV2|Any CPU.ActiveCfg = DebugV2|Any CPU {7F4E2E72-5745-4312-B238-CD7B731957B0}.DebugV2|Any CPU.Build.0 = DebugV2|Any CPU {7F4E2E72-5745-4312-B238-CD7B731957B0}.DebugV3|Any CPU.ActiveCfg = DebugV3|Any CPU {7F4E2E72-5745-4312-B238-CD7B731957B0}.DebugV3|Any CPU.Build.0 = DebugV3|Any CPU + {7F4E2E72-5745-4312-B238-CD7B731957B0}.ReleaseV2|Any CPU.ActiveCfg = ReleaseV2|Any CPU + {7F4E2E72-5745-4312-B238-CD7B731957B0}.ReleaseV2|Any CPU.Build.0 = ReleaseV2|Any CPU {7F4E2E72-5745-4312-B238-CD7B731957B0}.ReleaseV3|Any CPU.ActiveCfg = ReleaseV3|Any CPU {7F4E2E72-5745-4312-B238-CD7B731957B0}.ReleaseV3|Any CPU.Build.0 = ReleaseV3|Any CPU {D01E9ED3-E35C-4F44-A5AD-5350E43AA636}.DebugV2|Any CPU.ActiveCfg = DebugV2|Any CPU @@ -40,8 +45,22 @@ Global {D01E9ED3-E35C-4F44-A5AD-5350E43AA636}.ReleaseV2|Any CPU.Build.0 = ReleaseV2|Any CPU {D01E9ED3-E35C-4F44-A5AD-5350E43AA636}.ReleaseV3|Any CPU.ActiveCfg = ReleaseV3|Any CPU {D01E9ED3-E35C-4F44-A5AD-5350E43AA636}.ReleaseV3|Any CPU.Build.0 = ReleaseV3|Any CPU + {4331C56B-5A8A-420F-986D-9938153F3F3F}.DebugV2|Any CPU.ActiveCfg = DebugV2|Any CPU + {4331C56B-5A8A-420F-986D-9938153F3F3F}.DebugV2|Any CPU.Build.0 = DebugV2|Any CPU + {4331C56B-5A8A-420F-986D-9938153F3F3F}.DebugV3|Any CPU.ActiveCfg = DebugV3|Any CPU + {4331C56B-5A8A-420F-986D-9938153F3F3F}.DebugV3|Any CPU.Build.0 = DebugV3|Any CPU + {4331C56B-5A8A-420F-986D-9938153F3F3F}.ReleaseV2|Any CPU.ActiveCfg = ReleaseV2|Any CPU + {4331C56B-5A8A-420F-986D-9938153F3F3F}.ReleaseV2|Any CPU.Build.0 = ReleaseV2|Any CPU + {4331C56B-5A8A-420F-986D-9938153F3F3F}.ReleaseV3|Any CPU.ActiveCfg = ReleaseV3|Any CPU + {4331C56B-5A8A-420F-986D-9938153F3F3F}.ReleaseV3|Any CPU.Build.0 = ReleaseV3|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {D01E9ED3-E35C-4F44-A5AD-5350E43AA636} = {31AD912F-A1DC-434A-8C8D-049F4BBD67D4} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0090A9BC-338B-4893-B820-FBE972E28E02} + EndGlobalSection EndGlobal diff --git a/src/prometheus-net.DotNetRuntime/Properties.cs b/src/prometheus-net.DotNetRuntime/Properties.cs deleted file mode 100644 index c891ff1..0000000 --- a/src/prometheus-net.DotNetRuntime/Properties.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Runtime.CompilerServices; -[assembly:InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests, PublicKey=00240000048000009400000006020000" + - "00240000525341310004000001000100a16035bee2b01495f350b4af8a1d0b6fc44ef62b773f91b" + - "5eec722eb1f1153ca68af198750bba0397bec986abae2f504ec94b729eb6ba81f059220f509f49f4" + - "b2b8543a3882e2714ebe640122705b682a577ecf7458249a88ca91eb6a1dd2274462821a8060c6e0" + - "c8e28b732953b197b546450e774430949ac3d114db8f8edbc")] \ No newline at end of file diff --git a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj index 7309e16..238ede2 100644 --- a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj +++ b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj @@ -7,8 +7,6 @@ 3 $(DefineConstants);PROMV3 - true - prometheus-net.DotNetRuntime.snk diff --git a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj new file mode 100644 index 0000000..8293bb2 --- /dev/null +++ b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj @@ -0,0 +1,51 @@ + + + 3 + $(DefineConstants);PROMV3 + true + prometheus-net.DotNetRuntime.snk + + + + 3 + Prometheus.DotNetRuntime + prometheus-net.DotNetRuntime + prometheus-net.DotNetRuntime + $(PromMajorVersion).3.1 + James Luck + Prometheus prometheus-net IOnDemandCollector runtime metrics gc jit threadpool contention stats + https://github.com/djluck/prometheus-net.DotNetRuntime + + Exposes .NET core runtime metrics (GC, JIT, lock contention, thread pool) using the prometheus-net package. + + https://github.com/djluck/prometheus-net.DotNetRuntime/blob/master/LICENSE.txt + ReleaseV2;DebugV2;DebugV3;ReleaseV3 + AnyCPU + netcoreapp2.2;netcoreapp3.0;netstandard2.1 + 8 + true + 1701;1702;CS1591; + + + + + + + + true + + + + true + false + + + + bin\ReleaseV3\prometheus-net.DotNetRuntime.xml + + + + + + + From 9e3cdfb87957b4f00ca013db0ba7cafd9f73c43c Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 04:05:36 -0700 Subject: [PATCH 08/15] Adding propeties back --- src/prometheus-net.DotNetRuntime/Properties.cs | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/prometheus-net.DotNetRuntime/Properties.cs diff --git a/src/prometheus-net.DotNetRuntime/Properties.cs b/src/prometheus-net.DotNetRuntime/Properties.cs new file mode 100644 index 0000000..fc97db7 --- /dev/null +++ b/src/prometheus-net.DotNetRuntime/Properties.cs @@ -0,0 +1,6 @@ +using System.Runtime.CompilerServices; +[assembly: InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests, PublicKey=00240000048000009400000006020000" + + "00240000525341310004000001000100a16035bee2b01495f350b4af8a1d0b6fc44ef62b773f91b" + + "5eec722eb1f1153ca68af198750bba0397bec986abae2f504ec94b729eb6ba81f059220f509f49f4" + + "b2b8543a3882e2714ebe640122705b682a577ecf7458249a88ca91eb6a1dd2274462821a8060c6e0" + + "c8e28b732953b197b546450e774430949ac3d114db8f8edbc")] From ac7f809ef037c15fae79250af1dfad7f48cf1bc6 Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 04:26:08 -0700 Subject: [PATCH 09/15] remove public key --- src/prometheus-net.DotNetRuntime/Properties.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/prometheus-net.DotNetRuntime/Properties.cs b/src/prometheus-net.DotNetRuntime/Properties.cs index fc97db7..de7d4c1 100644 --- a/src/prometheus-net.DotNetRuntime/Properties.cs +++ b/src/prometheus-net.DotNetRuntime/Properties.cs @@ -1,6 +1,2 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests, PublicKey=00240000048000009400000006020000" + - "00240000525341310004000001000100a16035bee2b01495f350b4af8a1d0b6fc44ef62b773f91b" + - "5eec722eb1f1153ca68af198750bba0397bec986abae2f504ec94b729eb6ba81f059220f509f49f4" + - "b2b8543a3882e2714ebe640122705b682a577ecf7458249a88ca91eb6a1dd2274462821a8060c6e0" + - "c8e28b732953b197b546450e774430949ac3d114db8f8edbc")] +[assembly: InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests")] From ea1747e4d846e24df0d6649e97f210ad5dcce98c Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 04:28:31 -0700 Subject: [PATCH 10/15] adding pkey --- src/prometheus-net.DotNetRuntime/Properties.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/prometheus-net.DotNetRuntime/Properties.cs b/src/prometheus-net.DotNetRuntime/Properties.cs index de7d4c1..fc97db7 100644 --- a/src/prometheus-net.DotNetRuntime/Properties.cs +++ b/src/prometheus-net.DotNetRuntime/Properties.cs @@ -1,2 +1,6 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests")] +[assembly: InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests, PublicKey=00240000048000009400000006020000" + + "00240000525341310004000001000100a16035bee2b01495f350b4af8a1d0b6fc44ef62b773f91b" + + "5eec722eb1f1153ca68af198750bba0397bec986abae2f504ec94b729eb6ba81f059220f509f49f4" + + "b2b8543a3882e2714ebe640122705b682a577ecf7458249a88ca91eb6a1dd2274462821a8060c6e0" + + "c8e28b732953b197b546450e774430949ac3d114db8f8edbc")] From 9f82ee6a2060ac9fbddaff6eb8faddc4e07b854d Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 04:35:41 -0700 Subject: [PATCH 11/15] sign assembly without looking for v3 --- .../prometheus-net.DotNetRuntimeStrongV3.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj index 8293bb2..672a350 100644 --- a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj +++ b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj @@ -2,8 +2,6 @@ 3 $(DefineConstants);PROMV3 - true - prometheus-net.DotNetRuntime.snk @@ -25,6 +23,8 @@ 8 true 1701;1702;CS1591; + true + prometheus-net.DotNetRuntime.snk From 4dec2bf8d885a12a95f7fa311804a8bc987f8f53 Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 04:38:25 -0700 Subject: [PATCH 12/15] define promv3 constant --- .../prometheus-net.DotNetRuntimeStrongV3.csproj | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj index 672a350..945ce47 100644 --- a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj +++ b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj @@ -1,11 +1,8 @@  - - 3 - $(DefineConstants);PROMV3 - 3 + $(DefineConstants);PROMV3 Prometheus.DotNetRuntime prometheus-net.DotNetRuntime prometheus-net.DotNetRuntime From 15629c1cbc15e3dc1215d041e8c59446659f383b Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 04:42:43 -0700 Subject: [PATCH 13/15] remove unnecessary configurations --- .../prometheus-net.DotNetRuntimeStrongV3.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj index 945ce47..38451d1 100644 --- a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj +++ b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj @@ -14,7 +14,7 @@ Exposes .NET core runtime metrics (GC, JIT, lock contention, thread pool) using the prometheus-net package. https://github.com/djluck/prometheus-net.DotNetRuntime/blob/master/LICENSE.txt - ReleaseV2;DebugV2;DebugV3;ReleaseV3 + DebugV3;ReleaseV3 AnyCPU netcoreapp2.2;netcoreapp3.0;netstandard2.1 8 From 56bad19ec295df50db05c83edf62fd71e814a5f0 Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 14:28:28 -0700 Subject: [PATCH 14/15] test run failure fix --- prometheus-net.DotNetRuntime.sln | 18 +++++++++--------- .../prometheus-net.DotNetRuntime.Tests.csproj | 2 -- .../prometheus-net.DotNetRuntime.snk | Bin 596 -> 0 bytes .../Properties.cs | 6 +----- ...rometheus-net.DotNetRuntimeStrongV3.csproj | 6 +----- 5 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.snk diff --git a/prometheus-net.DotNetRuntime.sln b/prometheus-net.DotNetRuntime.sln index d111705..7b13b28 100644 --- a/prometheus-net.DotNetRuntime.sln +++ b/prometheus-net.DotNetRuntime.sln @@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{31 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreExample", "examples\AspNetCoreExample\AspNetCoreExample.csproj", "{D01E9ED3-E35C-4F44-A5AD-5350E43AA636}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "prometheus-net.DotNetRuntimeStrongV3", "src\prometheus-net.DotNetRuntime\prometheus-net.DotNetRuntimeStrongV3.csproj", "{4331C56B-5A8A-420F-986D-9938153F3F3F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "prometheus-net.DotNetRuntimeStrongV3", "src\prometheus-net.DotNetRuntime\prometheus-net.DotNetRuntimeStrongV3.csproj", "{8D2B905C-C2BB-4264-B187-B921E481B49C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -45,14 +45,14 @@ Global {D01E9ED3-E35C-4F44-A5AD-5350E43AA636}.ReleaseV2|Any CPU.Build.0 = ReleaseV2|Any CPU {D01E9ED3-E35C-4F44-A5AD-5350E43AA636}.ReleaseV3|Any CPU.ActiveCfg = ReleaseV3|Any CPU {D01E9ED3-E35C-4F44-A5AD-5350E43AA636}.ReleaseV3|Any CPU.Build.0 = ReleaseV3|Any CPU - {4331C56B-5A8A-420F-986D-9938153F3F3F}.DebugV2|Any CPU.ActiveCfg = DebugV2|Any CPU - {4331C56B-5A8A-420F-986D-9938153F3F3F}.DebugV2|Any CPU.Build.0 = DebugV2|Any CPU - {4331C56B-5A8A-420F-986D-9938153F3F3F}.DebugV3|Any CPU.ActiveCfg = DebugV3|Any CPU - {4331C56B-5A8A-420F-986D-9938153F3F3F}.DebugV3|Any CPU.Build.0 = DebugV3|Any CPU - {4331C56B-5A8A-420F-986D-9938153F3F3F}.ReleaseV2|Any CPU.ActiveCfg = ReleaseV2|Any CPU - {4331C56B-5A8A-420F-986D-9938153F3F3F}.ReleaseV2|Any CPU.Build.0 = ReleaseV2|Any CPU - {4331C56B-5A8A-420F-986D-9938153F3F3F}.ReleaseV3|Any CPU.ActiveCfg = ReleaseV3|Any CPU - {4331C56B-5A8A-420F-986D-9938153F3F3F}.ReleaseV3|Any CPU.Build.0 = ReleaseV3|Any CPU + {8D2B905C-C2BB-4264-B187-B921E481B49C}.DebugV2|Any CPU.ActiveCfg = DebugV3|Any CPU + {8D2B905C-C2BB-4264-B187-B921E481B49C}.DebugV2|Any CPU.Build.0 = DebugV3|Any CPU + {8D2B905C-C2BB-4264-B187-B921E481B49C}.DebugV3|Any CPU.ActiveCfg = DebugV3|Any CPU + {8D2B905C-C2BB-4264-B187-B921E481B49C}.DebugV3|Any CPU.Build.0 = DebugV3|Any CPU + {8D2B905C-C2BB-4264-B187-B921E481B49C}.ReleaseV2|Any CPU.ActiveCfg = ReleaseV3|Any CPU + {8D2B905C-C2BB-4264-B187-B921E481B49C}.ReleaseV2|Any CPU.Build.0 = ReleaseV3|Any CPU + {8D2B905C-C2BB-4264-B187-B921E481B49C}.ReleaseV3|Any CPU.ActiveCfg = ReleaseV3|Any CPU + {8D2B905C-C2BB-4264-B187-B921E481B49C}.ReleaseV3|Any CPU.Build.0 = ReleaseV3|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.Tests.csproj b/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.Tests.csproj index 5bb3174..ca23a85 100644 --- a/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.Tests.csproj +++ b/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.Tests.csproj @@ -16,8 +16,6 @@ ReleaseV2;DebugV2;DebugV3;ReleaseV3 AnyCPU true - true - prometheus-net.DotNetRuntime.snk diff --git a/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.snk b/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.snk deleted file mode 100644 index b338cc80bf361a4c1544879e827ac92ef18760d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097@U^TwtuoRW^P_(a#9Sd*7PWCHzKasWW z$0F+=5mU-&uNj9>yP!FH?3il0;`IdVl(#ACYp5Ruk|6a7^q)&Bg+rr=E+-W0=0FlB z1-62vckK5?f=Q^1sUEhW-6C{GC?Ti@3~mgLD7P||I~jXaWKidHLkUT&JrPZ~`0czi z&a9(648}*bR#GqtFP+OWwi{PW6b1D!KjcL<97d$Tk@&H}XM@*RTy|1(#M-k2IyW0Q z8xYG;!ThI!QLg*j8OleL?B3ubEAc*MjTPHh?V)O=n9fHMUO9i#y@;O(mRiv#E*<9! z&8h4i`_wkTTyUCJBy)VGuRu(M`76K+-98d*?&W#X4+<7LVuu|8Duo`~(b(+MOD&v= zQwH?XWfnI6ST-;}V)49mKjbag1OP3NxcD$~BB9QR)7i*Lsi*~(&whl_N;S52|Bu1E zj4%h5L0rOq^E{yi9f)<+Q3&oM$-2S0+OxO8noXREPnbZoge;+X+so>Ir!cvLyO*B- zM^Gn|6RDK`Yr_nn-9B<2>*5FrEhBva8bY4@)org_zZ!Fw)EUvo2vxKWWCMZG}H%`u_T~r-<1-00`D(I>CI?G_0ZOZ<{LXQr& i*n(|qNK~d63^GbfS;(*X@#^4BiT8?Ih7^aMA}JWxq8I7_ diff --git a/src/prometheus-net.DotNetRuntime/Properties.cs b/src/prometheus-net.DotNetRuntime/Properties.cs index fc97db7..de7d4c1 100644 --- a/src/prometheus-net.DotNetRuntime/Properties.cs +++ b/src/prometheus-net.DotNetRuntime/Properties.cs @@ -1,6 +1,2 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests, PublicKey=00240000048000009400000006020000" + - "00240000525341310004000001000100a16035bee2b01495f350b4af8a1d0b6fc44ef62b773f91b" + - "5eec722eb1f1153ca68af198750bba0397bec986abae2f504ec94b729eb6ba81f059220f509f49f4" + - "b2b8543a3882e2714ebe640122705b682a577ecf7458249a88ca91eb6a1dd2274462821a8060c6e0" + - "c8e28b732953b197b546450e774430949ac3d114db8f8edbc")] +[assembly: InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests")] diff --git a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj index 38451d1..b038f52 100644 --- a/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj +++ b/src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj @@ -16,7 +16,7 @@ https://github.com/djluck/prometheus-net.DotNetRuntime/blob/master/LICENSE.txt DebugV3;ReleaseV3 AnyCPU - netcoreapp2.2;netcoreapp3.0;netstandard2.1 + netcoreapp3.0 8 true 1701;1702;CS1591; @@ -24,10 +24,6 @@ prometheus-net.DotNetRuntime.snk - - - - true From 140f763fc877b5aa4a76b505078b3395082477e7 Mon Sep 17 00:00:00 2001 From: Rama Krishnam Raju Potturi Date: Thu, 26 Mar 2020 14:33:45 -0700 Subject: [PATCH 15/15] remove strongV3 reference --- prometheus-net.DotNetRuntime.sln | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/prometheus-net.DotNetRuntime.sln b/prometheus-net.DotNetRuntime.sln index 7b13b28..f1f7e98 100644 --- a/prometheus-net.DotNetRuntime.sln +++ b/prometheus-net.DotNetRuntime.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.1062 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29905.134 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "prometheus-net.DotNetRuntime", "src\prometheus-net.DotNetRuntime\prometheus-net.DotNetRuntime.csproj", "{A40AD08A-53CB-40F3-A6D8-6FFCEC024289}" EndProject @@ -11,8 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{31 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreExample", "examples\AspNetCoreExample\AspNetCoreExample.csproj", "{D01E9ED3-E35C-4F44-A5AD-5350E43AA636}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "prometheus-net.DotNetRuntimeStrongV3", "src\prometheus-net.DotNetRuntime\prometheus-net.DotNetRuntimeStrongV3.csproj", "{8D2B905C-C2BB-4264-B187-B921E481B49C}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution DebugV2|Any CPU = DebugV2|Any CPU @@ -45,14 +43,6 @@ Global {D01E9ED3-E35C-4F44-A5AD-5350E43AA636}.ReleaseV2|Any CPU.Build.0 = ReleaseV2|Any CPU {D01E9ED3-E35C-4F44-A5AD-5350E43AA636}.ReleaseV3|Any CPU.ActiveCfg = ReleaseV3|Any CPU {D01E9ED3-E35C-4F44-A5AD-5350E43AA636}.ReleaseV3|Any CPU.Build.0 = ReleaseV3|Any CPU - {8D2B905C-C2BB-4264-B187-B921E481B49C}.DebugV2|Any CPU.ActiveCfg = DebugV3|Any CPU - {8D2B905C-C2BB-4264-B187-B921E481B49C}.DebugV2|Any CPU.Build.0 = DebugV3|Any CPU - {8D2B905C-C2BB-4264-B187-B921E481B49C}.DebugV3|Any CPU.ActiveCfg = DebugV3|Any CPU - {8D2B905C-C2BB-4264-B187-B921E481B49C}.DebugV3|Any CPU.Build.0 = DebugV3|Any CPU - {8D2B905C-C2BB-4264-B187-B921E481B49C}.ReleaseV2|Any CPU.ActiveCfg = ReleaseV3|Any CPU - {8D2B905C-C2BB-4264-B187-B921E481B49C}.ReleaseV2|Any CPU.Build.0 = ReleaseV3|Any CPU - {8D2B905C-C2BB-4264-B187-B921E481B49C}.ReleaseV3|Any CPU.ActiveCfg = ReleaseV3|Any CPU - {8D2B905C-C2BB-4264-B187-B921E481B49C}.ReleaseV3|Any CPU.Build.0 = ReleaseV3|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE