diff --git a/global.json b/global.json index 2a1043b5..70e3dcc5 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.301" + "version": "7.0.100" } } diff --git a/gm_dotnet_managed/GmodNET.API/GmodNET.API.csproj b/gm_dotnet_managed/GmodNET.API/GmodNET.API.csproj index 48932499..78c19640 100644 --- a/gm_dotnet_managed/GmodNET.API/GmodNET.API.csproj +++ b/gm_dotnet_managed/GmodNET.API/GmodNET.API.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 MIT GmodNET API GmodNET API library contains all necessary interfaces to write a GmodNET module. diff --git a/gm_dotnet_managed/GmodNET/GmodNET.csproj b/gm_dotnet_managed/GmodNET/GmodNET.csproj index 9c5ddf7f..0c7fc51e 100644 --- a/gm_dotnet_managed/GmodNET/GmodNET.csproj +++ b/gm_dotnet_managed/GmodNET/GmodNET.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 GmodNET.BuidReq GmodNET managed module loader. MIT diff --git a/gm_dotnet_managed/Tests/Tests.csproj b/gm_dotnet_managed/Tests/Tests.csproj index 6714f19d..74f94255 100644 --- a/gm_dotnet_managed/Tests/Tests.csproj +++ b/gm_dotnet_managed/Tests/Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 diff --git a/gm_dotnet_native/external_includes/netcore/hostfxr.h b/gm_dotnet_native/external_includes/netcore/hostfxr.h index 49afae3d..591a8ebb 100644 --- a/gm_dotnet_native/external_includes/netcore/hostfxr.h +++ b/gm_dotnet_native/external_includes/netcore/hostfxr.h @@ -64,7 +64,7 @@ typedef void(HOSTFXR_CALLTYPE *hostfxr_error_writer_fn)(const char_t *message); // By default no callback is registered in which case the errors are written to stderr. // // Each call to the error writer is sort of like writing a single line (the EOL character is omitted). -// Multiple calls to the error writer may occure for one failure. +// Multiple calls to the error writer may occur for one failure. // // If the hostfxr invokes functions in hostpolicy as part of its operation, the error writer // will be propagated to hostpolicy for the duration of the call. This means that errors from @@ -314,10 +314,10 @@ struct hostfxr_dotnet_environment_info const char_t* hostfxr_commit_hash; size_t sdk_count; - const hostfxr_dotnet_environment_sdk_info* sdks; + const struct hostfxr_dotnet_environment_sdk_info* sdks; size_t framework_count; - const hostfxr_dotnet_environment_framework_info* frameworks; + const struct hostfxr_dotnet_environment_framework_info* frameworks; }; #endif //__HOSTFXR_H__ diff --git a/runtime.csproj b/runtime.csproj index 2adf94bd..0511ea43 100644 --- a/runtime.csproj +++ b/runtime.csproj @@ -2,20 +2,20 @@ - net6.0 + net7.0 - 6.0.6 + 7.0.0 - https://download.visualstudio.microsoft.com/download/pr/188ee779-2b6d-4cf0-b11e-e0514cad80b7/9558e992445f513e3b49ab2ef205c2d3/aspnetcore-runtime-6.0.6-win-x64.zip + https://download.visualstudio.microsoft.com/download/pr/e3c77b40-cb02-4f1a-845f-c8040de58a83/be6bba4cac270a11c2b9dbdeec0a3040/aspnetcore-runtime-7.0.0-win-x64.zip - https://download.visualstudio.microsoft.com/download/pr/afd5344f-a9e9-45f9-85b5-de4551c53736/c30996daa407f9bb540ebc5edfcf16fc/aspnetcore-runtime-6.0.6-linux-x64.tar.gz + https://download.visualstudio.microsoft.com/download/pr/4bbb4d31-70ba-4def-b747-4358be873982/3dbca5b64c2ffb88641c0e42bdeb297a/aspnetcore-runtime-7.0.0-linux-x64.tar.gz - https://download.visualstudio.microsoft.com/download/pr/0f5eb01e-6b46-4ef3-8c1c-7b99657a36df/7d4807a527cd5bc5a6a864f1fcd354e7/aspnetcore-runtime-6.0.6-osx-x64.tar.gz + https://download.visualstudio.microsoft.com/download/pr/5ea36935-090e-4ca4-841f-49371b408d9d/6e0c2c4721dabbb9a237d6b6ed17df75/aspnetcore-runtime-7.0.0-osx-x64.tar.gz