Skip to content

Commit a04c375

Browse files
rzanderrzander
committed
Fix issue in ID Lookup
1 parent 612a393 commit a04c375

8 files changed

+24
-22
lines changed

‎source/JainDBTest/JainDBTest.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
15-
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
16-
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
15+
<PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
16+
<PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎source/docker-compose.ci.build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3'
1+
version: '3.4'
22

33
services:
44
ci-build:

‎source/docker-compose.dcproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" Sdk="Microsoft.Docker.Sdk">
33
<PropertyGroup Label="Globals">
4-
<ProjectVersion>2.0</ProjectVersion>
4+
<ProjectVersion>2.1</ProjectVersion>
55
<DockerTargetOS>Linux</DockerTargetOS>
66
<ProjectGuid>405d1a24-398e-46d7-aa8c-9c79aa26d656</ProjectGuid>
77
<DockerLaunchBrowser>True</DockerLaunchBrowser>

‎source/docker-compose.override.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3'
1+
version: '3.4'
22

33
services:
44
jaindb:

‎source/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3'
1+
version: '3.4'
22

33
services:
44
jaindb:

‎source/jaindb/inventory.ps1

+3-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,9 @@ function SetID {
160160

161161
$object = New-Object PSObject
162162
getinv -Name "Battery" -WMIClass "win32_Battery" -Properties @("BatteryStatus", "Caption", "Chemitry", "#Name", "Status", "PowerManagementCapabilities", "#DeviceID") -AppendObject ([ref]$object)
163-
getinv -Name "BIOS" -WMIClass "win32_BIOS" -Properties @("Name", "Manufacturer", "Version", "#SerialNumber") -AppendObject ([ref]$object)
163+
$bios = getinv -Name "BIOS" -WMIClass "win32_BIOS" -Properties @("Name", "Manufacturer", "Version", "#SerialNumber") #-AppendObject ([ref]$object)
164+
$bios | Add-Member -MemberType NoteProperty -Name "#DeviceHardwareData" -Value ((Get-WMIObject -Namespace root/cimv2/mdm/dmmap -Class MDM_DevDetail_Ext01 -Filter "InstanceID='Ext' AND ParentID='./DevDetail'").DeviceHardwareData) -ea SilentlyContinue
165+
$object | Add-Member -MemberType NoteProperty -Name "BIOS" -Value $bios -ea SilentlyContinue
164166
getinv -Name "Processor" -WMIClass "win32_Processor" -Properties @("Name", "Manufacturer", "Family", "NumberOfCores", "NumberOfEnabledCore", "NumberOfLogicalProcessors", "L2CacheSize", "L3CacheSize", "#ProcessorId") -AppendObject ([ref]$object)
165167
getinv -Name "Memory" -WMIClass "win32_PhysicalMemory" -Properties @("Manufacturer", "ConfiguredClockSpeed", "ConfiguredVoltage", "PartNumber", "FormFactor", "DataWidth", "Speed", "SMBIOSMemoryType", "Name" , "Capacity" , "#SerialNumber") -AppendObject ([ref]$object)
166168
getinv -Name "OS" -WMIClass "win32_OperatingSystem" -Properties @("BuildNumber", "BootDevice", "Caption", "CodeSet", "CountryCode", "@CurrentTimeZone", "EncryptionLevel", "Locale", "Manufacturer", "MUILanguages", "OperatingSystemSKU", "OSArchitecture", "OSLanguage", "SystemDrive", "Version", "#InstallDate", "@LastBootUpTime") -AppendObject ([ref]$object)

‎source/jaindb/jaindb.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public static string LookupID(string name, string value)
106106
try
107107
{
108108
//Check in MemoryCache
109-
if (_cache.TryGetValue("ID-" + name, out sResult))
109+
if (_cache.TryGetValue("ID-" + name + value, out sResult))
110110
{
111111
return sResult;
112112
}
@@ -120,7 +120,7 @@ public static string LookupID(string name, string value)
120120
if (!string.IsNullOrEmpty(sResult))
121121
{
122122
var cacheEntryOptions = new MemoryCacheEntryOptions().SetSlidingExpiration(TimeSpan.FromSeconds(60)); //cache ID for 1min
123-
_cache.Set("ID-" + name, sResult, cacheEntryOptions);
123+
_cache.Set("ID-" + name + value, sResult, cacheEntryOptions);
124124
}
125125

126126
return sResult;
@@ -135,7 +135,7 @@ public static string LookupID(string name, string value)
135135
if (!string.IsNullOrEmpty(sResult))
136136
{
137137
var cacheEntryOptions = new MemoryCacheEntryOptions().SetSlidingExpiration(TimeSpan.FromSeconds(300)); //cache ID for 5min
138-
_cache.Set("ID-" + name, sResult, cacheEntryOptions);
138+
_cache.Set("ID-" + name + value, sResult, cacheEntryOptions);
139139
}
140140

141141
return sResult;

‎source/jaindb/jaindb.csproj

+11-11
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<RepositoryUrl>https://github.com/rzander/jaindb</RepositoryUrl>
1414
<PackageTags>blockchain json</PackageTags>
1515
<Version>1.0.0</Version>
16-
<AssemblyVersion>1.0.0.72</AssemblyVersion>
17-
<FileVersion>0.0.0.72</FileVersion>
16+
<AssemblyVersion>1.0.0.73</AssemblyVersion>
17+
<FileVersion>1.0.0.73</FileVersion>
1818
<StartupObject>jaindb.Program</StartupObject>
1919
<UserSecretsId>fcfd6c0a-e53c-46cb-8a9d-b786c0579861</UserSecretsId>
2020
</PropertyGroup>
@@ -56,16 +56,16 @@
5656
<ItemGroup>
5757
<PackageReference Include="JsonDiffPatch.Net" Version="2.1.0" />
5858
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.3.0" />
59-
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.0" />
60-
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.1.0" />
61-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
62-
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.0" />
63-
<PackageReference Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.0" />
64-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.0" />
59+
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
60+
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.1.1" />
61+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
62+
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
63+
<PackageReference Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.1" />
64+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
6565
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="1.9.1" />
66-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.0" />
67-
<PackageReference Include="Microsoft.OData.Core" Version="7.4.4" />
68-
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.0" />
66+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
67+
<PackageReference Include="Microsoft.OData.Core" Version="7.5.0" />
68+
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.1" />
6969
<PackageReference Include="Moon.AspNetCore.Authentication.Basic" Version="4.0.1" />
7070
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
7171
<PackageReference Include="RethinkDb.Driver" Version="2.3.23" />

0 commit comments

Comments
 (0)