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

sign assembly with strong name #31

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

sign assembly with strong name #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
781039e
sign assembly with strong name
rapottu Mar 26, 2020
605b4f0
signing tests
rapottu Mar 26, 2020
36ff0f1
assembly reference with public key
rapottu Mar 26, 2020
86c679e
public key formating
rapottu Mar 26, 2020
f257fa2
Latest version of prometheus
rapottu Mar 26, 2020
26a6545
sign only v3 as v2 prometheus-netstandard isn't signed
rapottu Mar 26, 2020
81bcbae
strong name with seperate package. remove properties.cs which isn't b…
rapottu Mar 26, 2020
9e3cdfb
Adding propeties back
rapottu Mar 26, 2020
ac7f809
remove public key
rapottu Mar 26, 2020
ea1747e
adding pkey
rapottu Mar 26, 2020
9f82ee6
sign assembly without looking for v3
rapottu Mar 26, 2020
4dec2bf
define promv3 constant
rapottu Mar 26, 2020
15629c1
remove unnecessary configurations
rapottu Mar 26, 2020
56bad19
test run failure fix
rapottu Mar 26, 2020
140f763
remove strongV3 reference
rapottu Mar 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions prometheus-net.DotNetRuntime.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,38 @@

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 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
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
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
Expand All @@ -41,7 +44,13 @@ Global
{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
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
4 changes: 2 additions & 2 deletions src/prometheus-net.DotNetRuntime/Properties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
using System.Runtime.CompilerServices;
[assembly:InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests")]
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("prometheus-net.DotNetRuntime.Tests")]
2 changes: 1 addition & 1 deletion src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</PropertyGroup>

<ItemGroup Condition="$(PromMajorVersion) == '3'">
<PackageReference Include="prometheus-net" Version="3.1.2" />
<PackageReference Include="prometheus-net" Version="3.5.0" />
</ItemGroup>

<ItemGroup Condition="$(PromMajorVersion) == '2'">
Expand Down
Binary file added src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.snk
View file
Open in desktop
Binary file not shown.
44 changes: 44 additions & 0 deletions src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntimeStrongV3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PromMajorVersion Condition="$(PromMajorVersion) == ''">3</PromMajorVersion>
<DefineConstants>$(DefineConstants);PROMV3</DefineConstants>
<RootNamespace>Prometheus.DotNetRuntime</RootNamespace>
<AssemblyName>prometheus-net.DotNetRuntime</AssemblyName>
<PackageId>prometheus-net.DotNetRuntime</PackageId>
<Version>$(PromMajorVersion).3.1</Version>
<Authors>James Luck</Authors>
<PackageTags>Prometheus prometheus-net IOnDemandCollector runtime metrics gc jit threadpool contention stats</PackageTags>
<PackageProjectUrl>https://github.com/djluck/prometheus-net.DotNetRuntime</PackageProjectUrl>
<Description>
Exposes .NET core runtime metrics (GC, JIT, lock contention, thread pool) using the prometheus-net package.
</Description>
<PackageLicense>https://github.com/djluck/prometheus-net.DotNetRuntime/blob/master/LICENSE.txt</PackageLicense>
<Configurations>DebugV3;ReleaseV3</Configurations>
<Platforms>AnyCPU</Platforms>
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
<LangVersion>8</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1701;1702;CS1591;</NoWarn>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>prometheus-net.DotNetRuntime.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<PropertyGroup Condition=" $(Configuration.StartsWith('Release')) ">
<Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
</PropertyGroup>

<PropertyGroup Condition=" $(Configuration.StartsWith('Debug')) ">
<DebugSymbols Condition=" '$(DebugSymbols)' == '' ">true</DebugSymbols>
<Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseV3' ">
<DocumentationFile>bin\ReleaseV3\prometheus-net.DotNetRuntime.xml</DocumentationFile>
</PropertyGroup>

<ItemGroup Condition="$(PromMajorVersion) == '3'">
<PackageReference Include="prometheus-net" Version="3.5.0" />
</ItemGroup>

</Project>