merge fixes

This commit is contained in:
Adam Hathcock
2026-10-01 17:06:26 +01:00
157 changed files with 6962 additions and 2407 deletions

View File

@@ -41,13 +41,13 @@
},
"Microsoft.SourceLink.GitHub": {
"type": "Direct",
"requested": "[10.0.301, )",
"resolved": "10.0.301",
"contentHash": "S9U9Ye2bylMeDkzdNh+TsbRUNr6rkBORrnXDk45maPIxVvTmHV1SN2/qtZ/6yO7cdWmQv1LHv77yIeG6Q3nvMQ==",
"requested": "[10.0.401, )",
"resolved": "10.0.401",
"contentHash": "LGmlwgP1Cx37JEWzyjS0o1/+xs/s/e3E2TBSuogI5ePA/9L0pfIfeYX0k5in7Bfcw8Nn2y2sG9jXxydTjiR2Fg==",
"dependencies": {
"Microsoft.Build.Tasks.Git": "10.0.301",
"Microsoft.SourceLink.Common": "10.0.301",
"System.IO.Hashing": "10.0.10"
"Microsoft.Build.Tasks.Git": "10.0.401",
"Microsoft.SourceLink.Common": "10.0.401",
"System.IO.Hashing": "10.0.12"
}
},
"Microsoft.VisualStudio.Threading.Analyzers": {
@@ -64,9 +64,9 @@
},
"Zomp.SyncMethodGenerator": {
"type": "Direct",
"requested": "[2.0.42, )",
"resolved": "2.0.42",
"contentHash": "kf2PvmD9N5xIzsdf6vy5tk2w0hlD7+Kbd3w/wFmgozgHTKJlh2RNiS+Jx+4d1AtgyJVBD0CO0nofbThu5zTsgQ=="
"requested": "[2.0.56, )",
"resolved": "2.0.56",
"contentHash": "P1iMA1meu0uX8YcPWhkFnpzV3e+QFDDYMU6hMNyofS+pBlLgeVV7QevBmJmJ/mrxA1jujo3cqNaO1IapdfjOlA=="
},
"BenchmarkDotNet.Annotations": {
"type": "Transitive",
@@ -111,10 +111,10 @@
},
"Microsoft.Build.Tasks.Git": {
"type": "Transitive",
"resolved": "10.0.301",
"contentHash": "9Tah8f2BYuXlff9nIsJAeQJcqnijJTXNraIcTOF2f/f9kLmg0HNWPlMemnD6FBLd/UQcE0s9Vze2zCkA6nrZAA==",
"resolved": "10.0.401",
"contentHash": "ZYctNuT10V9IYyCFydy63DXx0ggZQuynuzQOdLvW62dPgzjIz7f0ISEP75RGiq1jFQh8p6TmGSqxeQZQ87LCig==",
"dependencies": {
"System.IO.Hashing": "10.0.10"
"System.IO.Hashing": "10.0.12"
}
},
"Microsoft.CodeAnalysis.Analyzers": {
@@ -219,8 +219,8 @@
},
"Microsoft.SourceLink.Common": {
"type": "Transitive",
"resolved": "10.0.301",
"contentHash": "oz44EclJdAYVZcRb9dSbWd+6RaE+8a4j5zdE+O7yw5qPRZZhu3pcpDZ/Moy6pLeIXZqBP1FMd8CSE0sgJAGV0g=="
"resolved": "10.0.401",
"contentHash": "u3rLxIwi/9MqDFaWGE/QQgLR1NBEzLOW2lv5+9OrZPDBYIAmFdYSWCWrR1ufpXWOqFn+x02TgKropl/oDuHmgA=="
},
"Perfolizer": {
"type": "Transitive",
@@ -242,8 +242,8 @@
},
"System.IO.Hashing": {
"type": "Transitive",
"resolved": "10.0.10",
"contentHash": "eE839zyWZD/UBZYzP2lu9fhHX6RWe63/jz3Jxf+JumzO/db+Vc2s7CMiDwxk9ti2NTUft2tdRx31Rw2OjKbecA=="
"resolved": "10.0.12",
"contentHash": "jDix4bBMYnpZdSPcnY+KDV6ik3SRMzpMKby/bZl/XUwIiflwRNAFZ0oOl61R/pSaveIJ8t1gs2BUlrGsPs/bcg=="
},
"System.Management": {
"type": "Transitive",