Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ikopylov committed Nov 27, 2017
2 parents 8a91fbe + 843574b commit ccff422
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*.suo
*.user
*.sln.docstates
*.sln.ide
.vs/

# Build results

Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ Main features:


Supported metrics (counter types):
- Number of Items (example: measure umber of received requests);
- Number of Items (example: measure number of received requests);
- Operations per Second (example: measure performance of your code);
- Average Count (example: measure average size of queue);
- Average Time (example: measure average execution time of your functions);
- Moment Time (example: fixate time of some process that executing only once);
- Elapsed Time (example: measure the total execution time of your application).
- Elapsed Time (example: measure the total execution time of your application);
- Delta (example: measure changes in processing rate);



Expand Down
3 changes: 3 additions & 0 deletions ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
v2.2.0 (27.11.2017)
- DeltaCounter added

v2.1.2 (17.05.2017)
- Performance: avoid closure creation in MultiInstanceCategory

Expand Down
6 changes: 2 additions & 4 deletions src/PerformanceCounters_Solution.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qoollo.PerformanceCounters", "Qoollo.PerformanceCounters\Qoollo.PerformanceCounters.csproj", "{B921E9E9-F32E-4959-A9F1-734F66DD4FE8}"
EndProject
Expand All @@ -14,8 +14,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{638B81A2-C646-42C2-98C3-A9FFC39F1E01}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,6 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
2 changes: 1 addition & 1 deletion src/Qoollo.PerformanceCounters/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.2")]
[assembly: AssemblyVersion("2.2.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Library for collecting and tracking performance metrics in your .NET applications.</description>
<releaseNotes>
v2.1.2 (17.05.2017)
- Performance: avoid closure creation in MultiInstanceCategory
v2.2.0 (27.11.2017)
- DeltaCounter added
</releaseNotes>
<copyright>Copyright 2014</copyright>
<tags>Qoollo PerformanceCounters PerformanceCounter PerfCounters Performance Perf Counters Counter Health Profiling Monitoring perfmon Graphite</tags>
Expand Down

0 comments on commit ccff422

Please sign in to comment.