Skip to content

Commit 3d1d3af

Browse files
authored
Put registry binaries alongside scripts (#125)
* Put registry binaries alongside scripts * Smbios RAM Memory Size check
1 parent c8535de commit 3d1d3af

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
// version number
1010
def base_version = '1.5.0'
11-
def base_release = 'beta2'
11+
def base_release = 'beta3'
1212
def archive_version = "${base_version}-${base_release}"
1313

1414
version = "${base_version}${base_release}"
@@ -215,7 +215,7 @@ def checkFilesExist(ArrayList<File> fileList, String destinationIfExists) {
215215
tasks.register("distZipWin", Zip) {
216216
dependsOn tasks.named("distZip")
217217

218-
def destinationInZip = tasks.distZip.archiveBaseName.get() + "${File.separator}scripts${File.separator}windows"
218+
def destinationInZip = tasks.distZip.archiveBaseName.get() + "-${version}${File.separator}scripts${File.separator}windows"
219219
def zipOutputDestination = getZipOutputPath()
220220
def runtime = getDotnetRuntimeWin()
221221
def archiveName = tasks.distZip.archiveBaseName.get() + ".${archive_version}.${runtime}.zip"
@@ -239,7 +239,7 @@ tasks.register("distZipWin", Zip) {
239239
tasks.register("distZipLinux", Zip) {
240240
dependsOn tasks.named("distZip")
241241

242-
def destinationInZip = tasks.distZip.archiveBaseName.get() + "${File.separator}scripts"
242+
def destinationInZip = tasks.distZip.archiveBaseName.get() + "-${version}${File.separator}scripts"
243243
def zipOutputDestination = getZipOutputPath()
244244
def runtime = getDotnetRuntimeLinux()
245245
def archiveName = tasks.distZip.archiveBaseName.get() + ".${archive_version}.${runtime}.zip"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>0.7.6</Version>
3+
<Version>0.8.1</Version>
44
</PropertyGroup>
55
</Project>

dotnet/ComponentClassRegistry/Smbios/src/SmbiosHardwareManifestPlugin.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public static void AddComponentsToManifestV2(IDictionary<int, IList<SmbiosTable>
9191
component.SERIAL = Strref(table, 0x18);
9292
component.REVISION = Strref(table, 0x2B);
9393
component.FIELDREPLACEABLE = "";
94-
addComponent = true;
94+
addComponent = !Value(table, 0x0C, 2).Equals("0000"); // Size of the memory device; If the value is 0, no memory device is installed in the socket.
9595
break;
9696
case 0x0001: // SYSTEM
9797
component.COMPONENTCLASS.COMPONENTCLASSREGISTRY = dmtfRegistryOid;

0 commit comments

Comments
 (0)