From fab3caec0bb6d3c33a8f921035c0629ea2f87fcf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 10 Jul 2024 06:10:59 +0000 Subject: [PATCH 1/3] Update .NET SDK Update .NET SDK to version 8.0.303. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: github-actions[bot] --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 71a59c79..a147c071 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.302", + "version": "8.0.303", "allowPrerelease": false, "rollForward": "latestPatch" }, From 5d09f5094c26d518d25f8400dc4ac64fbed76e09 Mon Sep 17 00:00:00 2001 From: Frans van Dorsselaer <17404029+dorssel@users.noreply.github.com> Date: Wed, 10 Jul 2024 21:30:59 +0200 Subject: [PATCH 2/3] Fix transitive dependency vulnerability - Force System.Text.Json to version >= 8.0.4 --- Directory.Packages.props | 2 ++ UnitTests/packages.lock.json | 17 +++++++------ Usbipd.Automation/packages.lock.json | 6 ++--- Usbipd/packages.lock.json | 37 ++++++++++++++-------------- 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 0973f93c..62d2f3f8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -27,5 +27,7 @@ SPDX-License-Identifier: GPL-3.0-only + + \ No newline at end of file diff --git a/UnitTests/packages.lock.json b/UnitTests/packages.lock.json index d93b3571..116c3e18 100644 --- a/UnitTests/packages.lock.json +++ b/UnitTests/packages.lock.json @@ -479,14 +479,6 @@ "resolved": "8.0.0", "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", - "dependencies": { - "System.Text.Encodings.Web": "8.0.0" - } - }, "usbipd": { "type": "Project", "dependencies": { @@ -514,6 +506,15 @@ "requested": "[2.0.0-beta4.22272.1, )", "resolved": "2.0.0-beta4.22272.1", "contentHash": "1uqED/q2H0kKoLJ4+hI2iPSBSEdTuhfCYADeJrAqERmiGQ2NNacYKRNEQ+gFbU4glgVyK8rxI+ZOe1onEtr/Pg==" + }, + "System.Text.Json": { + "type": "CentralTransitive", + "requested": "[8.0.4, )", + "resolved": "8.0.4", + "contentHash": "bAkhgDJ88XTsqczoxEMliSrpijKZHhbJQldhAmObj/RbrN3sU5dcokuXmWJWsdQAhiMJ9bTayWsL1C9fbbCRhw==", + "dependencies": { + "System.Text.Encodings.Web": "8.0.0" + } } } } diff --git a/Usbipd.Automation/packages.lock.json b/Usbipd.Automation/packages.lock.json index 8af8270c..6804f0a0 100644 --- a/Usbipd.Automation/packages.lock.json +++ b/Usbipd.Automation/packages.lock.json @@ -32,9 +32,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ==" + "requested": "[8.0.7, )", + "resolved": "8.0.7", + "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ==" } } } diff --git a/Usbipd/packages.lock.json b/Usbipd/packages.lock.json index 37924064..06f8c6b1 100644 --- a/Usbipd/packages.lock.json +++ b/Usbipd/packages.lock.json @@ -10,9 +10,9 @@ }, "Microsoft.DotNet.ILCompiler": { "type": "Direct", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "u3mX8tpzurjYoh4FcSdK+nDeEk29XvFCPM91jW0JVyQxdi2LlwHIn7Ac7qVLkxwcCdPPHHfPj6mgxfeNRQXu0Q==" + "requested": "[8.0.7, )", + "resolved": "8.0.7", + "contentHash": "5Vkl5384rfKZmK7rVm8pjuMk2Cweaqd+rPwL86bddhInHdBg3ClO9H0cqwd7kXf+F8/aXuZxKAnl6izzaWkfUw==" }, "Microsoft.Extensions.Hosting.WindowsServices": { "type": "Direct", @@ -27,9 +27,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ==" + "requested": "[8.0.7, )", + "resolved": "8.0.7", + "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ==" }, "Microsoft.Windows.CsWin32": { "type": "Direct", @@ -371,32 +371,33 @@ "resolved": "8.0.0", "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" }, + "usbipd.automation": { + "type": "Project" + }, "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "type": "CentralTransitive", + "requested": "[8.0.4, )", + "resolved": "8.0.4", + "contentHash": "bAkhgDJ88XTsqczoxEMliSrpijKZHhbJQldhAmObj/RbrN3sU5dcokuXmWJWsdQAhiMJ9bTayWsL1C9fbbCRhw==", "dependencies": { "System.Text.Encodings.Web": "8.0.0" } - }, - "usbipd.automation": { - "type": "Project" } }, "net8.0-windows10.0.17763/win-x64": { "Microsoft.DotNet.ILCompiler": { "type": "Direct", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "u3mX8tpzurjYoh4FcSdK+nDeEk29XvFCPM91jW0JVyQxdi2LlwHIn7Ac7qVLkxwcCdPPHHfPj6mgxfeNRQXu0Q==", + "requested": "[8.0.7, )", + "resolved": "8.0.7", + "contentHash": "5Vkl5384rfKZmK7rVm8pjuMk2Cweaqd+rPwL86bddhInHdBg3ClO9H0cqwd7kXf+F8/aXuZxKAnl6izzaWkfUw==", "dependencies": { - "runtime.win-x64.Microsoft.DotNet.ILCompiler": "8.0.6" + "runtime.win-x64.Microsoft.DotNet.ILCompiler": "8.0.7" } }, "runtime.win-x64.Microsoft.DotNet.ILCompiler": { "type": "Transitive", - "resolved": "8.0.6", - "contentHash": "cF6f7h5TL8rfwPNoog4vEVH2Fy1tu1Zcy40Wel3Poe4qdkFXHhNXp3Px4bPmzCcwig/SA7KmFuZ5RtEUz72I9w==" + "resolved": "8.0.7", + "contentHash": "kUazvjyqorb1NBOJPs39l9rRU6eGfSwayfJjZ2KZJ/e/1GKYtCClVx6zy0HTA1L3XH4AoEGhhk29ogz7NhZBYg==" }, "System.Diagnostics.EventLog": { "type": "Transitive", From b27a5fb12c495338235f03bccdbcb3da3f26ee35 Mon Sep 17 00:00:00 2001 From: Frans van Dorsselaer <17404029+dorssel@users.noreply.github.com> Date: Wed, 10 Jul 2024 21:31:16 +0200 Subject: [PATCH 3/3] Fix linter warnings --- .editorconfig | 3 +++ .mega-linter.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index baf536d1..35f0a074 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,9 @@ root = true # All files [*] indent_style = space +# Solution files (auto-generated, but sometimes manually edited) +[*.sln] +indent_style = tab # Code files [*.{cs,csx,vb,vbx}] indent_size = 4 diff --git a/.mega-linter.yml b/.mega-linter.yml index 9151eb45..a1614a0c 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -32,4 +32,4 @@ XML_XMLLINT_FILE_EXTENSIONS: - .wxs # Exclude verbatim copies of external sources that are not under our control. # Also exclude auto-generated files. -FILTER_REGEX_EXCLUDE: COPYING\.md|LICENSES/|Drivers/VBoxUSB/|Drivers/VBoxUSBMon/|packages.lock.json +FILTER_REGEX_EXCLUDE: COPYING\.md|LICENSES/|Drivers/VBoxUSB/|Drivers/VBoxUSBMon/|packages.lock.json|Usbipd.Automation/usb.ids