diff --git a/Directory.Build.props b/Directory.Build.props index 055b4ce1..b13508f3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/global.json b/global.json index 423c2e22..36394634 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.404", + "version": "8.0.0", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ecab1726..dbd79d78 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -4,7 +4,7 @@ The Neo Project The Neo Project 2015-2023 The Neo Project - net7.0 + net8.0 enable 10 enable @@ -19,7 +19,7 @@ ../neo-cli.ico - 3.6.2 + 3.7.5 diff --git a/src/assertions/assertions.csproj b/src/assertions/assertions.csproj index 53e33929..aa042694 100644 --- a/src/assertions/assertions.csproj +++ b/src/assertions/assertions.csproj @@ -10,8 +10,8 @@ - - + + @@ -23,4 +23,9 @@ + + + + + \ No newline at end of file diff --git a/src/bctklib/bctklib.csproj b/src/bctklib/bctklib.csproj index 315b8c7a..8374ecc1 100644 --- a/src/bctklib/bctklib.csproj +++ b/src/bctklib/bctklib.csproj @@ -14,13 +14,16 @@ - + - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/bctklib/smart-contract/TestApplicationEngine.cs b/src/bctklib/smart-contract/TestApplicationEngine.cs index 81cc6ef6..f5b2e52a 100644 --- a/src/bctklib/smart-contract/TestApplicationEngine.cs +++ b/src/bctklib/smart-contract/TestApplicationEngine.cs @@ -31,7 +31,7 @@ public partial class TestApplicationEngine : ApplicationEngine static TestApplicationEngine() { var builder = ImmutableDictionary.CreateBuilder(); - builder.Add(OverrideDescriptor(ApplicationEngine.System_Runtime_CheckWitness, nameof(CheckWitnessOverride))); + builder.Add(OverrideDescriptor(System_Runtime_CheckWitness, nameof(CheckWitnessOverride))); overriddenServices = builder.ToImmutable(); static KeyValuePair OverrideDescriptor(InteropDescriptor descriptor, string overrideMethodName) @@ -200,7 +200,7 @@ public override VMState Execute() return base.Execute(); } - protected override void LoadContext(ExecutionContext context) + public override void LoadContext(ExecutionContext context) { base.LoadContext(context); coverageWriter?.WriteContext(context); @@ -310,15 +310,15 @@ private void OnNotify(object? sender, NotifyEventArgs args) bool CheckWitnessOverride(byte[] hashOrPubkey) => witnessChecker(hashOrPubkey); - protected override void OnSysCall(uint methodHash) + protected override void OnSysCall(InteropDescriptor descriptor) { - if (overriddenServices.TryGetValue(methodHash, out var descriptor)) + if (overriddenServices.TryGetValue(descriptor, out var overrideDescriptor)) { - base.OnSysCall(descriptor); + base.OnSysCall(overrideDescriptor); } else { - base.OnSysCall(methodHash); + base.OnSysCall(descriptor); } } } diff --git a/src/build-tasks/build-tasks.csproj b/src/build-tasks/build-tasks.csproj index f9d6ce1d..71044f84 100644 --- a/src/build-tasks/build-tasks.csproj +++ b/src/build-tasks/build-tasks.csproj @@ -24,11 +24,15 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all + + + + diff --git a/src/collector/collector.csproj b/src/collector/collector.csproj index 6397f9d8..37778baf 100644 --- a/src/collector/collector.csproj +++ b/src/collector/collector.csproj @@ -18,13 +18,17 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + + + + + diff --git a/src/neoxp/neoxp.csproj b/src/neoxp/neoxp.csproj index 25e77172..aa5a6643 100644 --- a/src/neoxp/neoxp.csproj +++ b/src/neoxp/neoxp.csproj @@ -11,8 +11,9 @@ - - + + + @@ -20,4 +21,8 @@ + + + + \ No newline at end of file diff --git a/src/runner/runner.csproj b/src/runner/runner.csproj index 525ad518..86eb919a 100644 --- a/src/runner/runner.csproj +++ b/src/runner/runner.csproj @@ -12,13 +12,17 @@ - - - + + + + + + + diff --git a/src/test-harness/test-harness.csproj b/src/test-harness/test-harness.csproj index 9722f711..12abee6d 100644 --- a/src/test-harness/test-harness.csproj +++ b/src/test-harness/test-harness.csproj @@ -9,11 +9,15 @@ - + + + + + \ No newline at end of file diff --git a/src/trace/neotrace.csproj b/src/trace/neotrace.csproj index 56e52894..7c52672c 100644 --- a/src/trace/neotrace.csproj +++ b/src/trace/neotrace.csproj @@ -9,9 +9,12 @@ - + + + + diff --git a/src/worknet/neoworknet.csproj b/src/worknet/neoworknet.csproj index 8daa081e..a015ecac 100644 --- a/src/worknet/neoworknet.csproj +++ b/src/worknet/neoworknet.csproj @@ -11,7 +11,7 @@ - + @@ -19,4 +19,8 @@ + + + + diff --git a/test/test-build-tasks/test-build-tasks.csproj b/test/test-build-tasks/test-build-tasks.csproj index 8a0c37c3..086d2d2d 100644 --- a/test/test-build-tasks/test-build-tasks.csproj +++ b/test/test-build-tasks/test-build-tasks.csproj @@ -5,7 +5,7 @@ false IDE1006;NU1701 build_tasks - net7.0 + net8.0 @@ -22,28 +22,32 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + - - + + - + - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all + + + + diff --git a/test/test-collector/test-collector.csproj b/test/test-collector/test-collector.csproj index 44ca2fa1..c0253864 100644 --- a/test/test-collector/test-collector.csproj +++ b/test/test-collector/test-collector.csproj @@ -4,7 +4,7 @@ false enable test_collector - net7.0 + net8.0 @@ -16,17 +16,21 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all + + + + diff --git a/test/test.bctklib/test.bctklib.csproj b/test/test.bctklib/test.bctklib.csproj index b175f970..b3b17693 100644 --- a/test/test.bctklib/test.bctklib.csproj +++ b/test/test.bctklib/test.bctklib.csproj @@ -2,7 +2,7 @@ false enable - net7.0 + net8.0 @@ -11,24 +11,24 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + \ No newline at end of file