From 898e0f3c122b0184865d7c705dc04b37e2feaf28 Mon Sep 17 00:00:00 2001 From: Gleb Krasilich Date: Sat, 19 Feb 2022 08:39:49 +0300 Subject: [PATCH 1/8] Updated global.json and runtime.csproj to .NET 7 Preview 1 --- global.json | 2 +- runtime.csproj | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/global.json b/global.json index 2a1043b5..d855150c 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.301" + "version": "7.0.100-preview.1.22110.4" } } diff --git a/runtime.csproj b/runtime.csproj index 2adf94bd..3f43d328 100644 --- a/runtime.csproj +++ b/runtime.csproj @@ -3,19 +3,18 @@ net6.0 - - 6.0.6 + 7.0.0-preview.1.22076.8 - 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/0a98b821-d06c-4ef2-ae94-39577e8c85ed/7ff1720d148ed9f2dadd2b1d9d152cbd/aspnetcore-runtime-7.0.0-preview.1.22109.13-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/c49ea5ad-41ee-41fa-9eab-47dfcc7e23ad/39907ed7d3caddc44fbf52f88baf6401/aspnetcore-runtime-7.0.0-preview.1.22109.13-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/44202dd0-d880-4730-9af0-d80da65738b6/61398785478b24f9275e3233c94b4838/aspnetcore-runtime-7.0.0-preview.1.22109.13-osx-x64.tar.gz From e232b061aa0dba7f84be72f58ab76eca846355b2 Mon Sep 17 00:00:00 2001 From: Gleb Krasilich Date: Sat, 19 Feb 2022 08:49:47 +0300 Subject: [PATCH 2/8] Update managed part to .NET 7 --- gm_dotnet_managed/GmodNET.API/GmodNET.API.csproj | 2 +- gm_dotnet_managed/GmodNET/GmodNET.csproj | 2 +- gm_dotnet_managed/Tests/Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 From 88e6d7acda43865b6d3df420a7184f3f5ae884a2 Mon Sep 17 00:00:00 2001 From: Gleb Krasilich Date: Sat, 19 Mar 2022 22:29:09 +0300 Subject: [PATCH 3/8] Updated .NET version to 7 preview 2 --- global.json | 2 +- runtime.csproj | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/global.json b/global.json index d855150c..463c146c 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-preview.1.22110.4" + "version": "7.0.100-preview.2.22153.17" } } diff --git a/runtime.csproj b/runtime.csproj index 3f43d328..933d71b6 100644 --- a/runtime.csproj +++ b/runtime.csproj @@ -2,19 +2,20 @@ - net6.0 - 7.0.0-preview.1.22076.8 + net7.0 + + 7.0.0-preview.2.22152.2 - https://download.visualstudio.microsoft.com/download/pr/0a98b821-d06c-4ef2-ae94-39577e8c85ed/7ff1720d148ed9f2dadd2b1d9d152cbd/aspnetcore-runtime-7.0.0-preview.1.22109.13-win-x64.zip + https://download.visualstudio.microsoft.com/download/pr/48930452-e7b8-453b-a53d-c562d1e28e23/8760008e53bff5b067ad10ef3e0d0003/aspnetcore-runtime-7.0.0-preview.2.22153.2-win-x64.zip - https://download.visualstudio.microsoft.com/download/pr/c49ea5ad-41ee-41fa-9eab-47dfcc7e23ad/39907ed7d3caddc44fbf52f88baf6401/aspnetcore-runtime-7.0.0-preview.1.22109.13-linux-x64.tar.gz + https://download.visualstudio.microsoft.com/download/pr/8d24d018-755a-4326-930f-b6f88e7c8851/330dfff882e637583cfde0c8cd90debf/aspnetcore-runtime-7.0.0-preview.2.22153.2-linux-x64.tar.gz - https://download.visualstudio.microsoft.com/download/pr/44202dd0-d880-4730-9af0-d80da65738b6/61398785478b24f9275e3233c94b4838/aspnetcore-runtime-7.0.0-preview.1.22109.13-osx-x64.tar.gz + https://download.visualstudio.microsoft.com/download/pr/92bec271-6ed5-4c5a-89d3-002873d147c6/735323c91eb4a14d8737c52b5ea58455/aspnetcore-runtime-7.0.0-preview.2.22153.2-osx-x64.tar.gz From 9c5526bd4b489df65ab5dc31fa4f4b3f5219451c Mon Sep 17 00:00:00 2001 From: Gleb Krasilich Date: Sun, 17 Apr 2022 02:47:02 +0300 Subject: [PATCH 4/8] Update .NET to 7.0.0 Preview 3 --- global.json | 2 +- runtime.csproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/global.json b/global.json index 463c146c..1b2612d2 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-preview.2.22153.17" + "version": "7.0.100-preview.3.22179.4" } } diff --git a/runtime.csproj b/runtime.csproj index 933d71b6..2de8c19f 100644 --- a/runtime.csproj +++ b/runtime.csproj @@ -4,18 +4,18 @@ net7.0 - 7.0.0-preview.2.22152.2 + 7.0.0-preview.3.22175.4 - https://download.visualstudio.microsoft.com/download/pr/48930452-e7b8-453b-a53d-c562d1e28e23/8760008e53bff5b067ad10ef3e0d0003/aspnetcore-runtime-7.0.0-preview.2.22153.2-win-x64.zip + https://download.visualstudio.microsoft.com/download/pr/da959574-6f6f-45b4-8453-6114ce711925/1c597a5a6815b73e949e67f81f37bdc7/aspnetcore-runtime-7.0.0-preview.3.22178.4-win-x64.zip - https://download.visualstudio.microsoft.com/download/pr/8d24d018-755a-4326-930f-b6f88e7c8851/330dfff882e637583cfde0c8cd90debf/aspnetcore-runtime-7.0.0-preview.2.22153.2-linux-x64.tar.gz + https://download.visualstudio.microsoft.com/download/pr/b0969eb7-374a-4da7-aa38-7a72097ff999/2d8f7deacf60ed4c1cbc25972e59dc41/aspnetcore-runtime-7.0.0-preview.3.22178.4-linux-x64.tar.gz - https://download.visualstudio.microsoft.com/download/pr/92bec271-6ed5-4c5a-89d3-002873d147c6/735323c91eb4a14d8737c52b5ea58455/aspnetcore-runtime-7.0.0-preview.2.22153.2-osx-x64.tar.gz + https://download.visualstudio.microsoft.com/download/pr/88603c65-e646-47a0-9f7a-ac2b2cc49763/60955db63765e7dce435ddbc620454c4/aspnetcore-runtime-7.0.0-preview.3.22178.4-osx-x64.tar.gz From a3f423333656d0c98f976cff5a46bcb78867537a Mon Sep 17 00:00:00 2001 From: Gleb Krasilich Date: Sun, 29 May 2022 10:29:38 +0300 Subject: [PATCH 5/8] Update to .NET 7 Preview 4 --- global.json | 2 +- runtime.csproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/global.json b/global.json index 1b2612d2..e097be73 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-preview.3.22179.4" + "version": "7.0.100-preview.4.22252.9" } } diff --git a/runtime.csproj b/runtime.csproj index 2de8c19f..c8125fc7 100644 --- a/runtime.csproj +++ b/runtime.csproj @@ -4,18 +4,18 @@ net7.0 - 7.0.0-preview.3.22175.4 + 7.0.0-preview.4.22229.4 - https://download.visualstudio.microsoft.com/download/pr/da959574-6f6f-45b4-8453-6114ce711925/1c597a5a6815b73e949e67f81f37bdc7/aspnetcore-runtime-7.0.0-preview.3.22178.4-win-x64.zip + https://download.visualstudio.microsoft.com/download/pr/040013af-267c-48ef-ae3b-a2e77dde61d5/6aa48aa27bd8ab42ad4ce1df1b2bbf7e/aspnetcore-runtime-7.0.0-preview.4.22251.1-win-x64.zip - https://download.visualstudio.microsoft.com/download/pr/b0969eb7-374a-4da7-aa38-7a72097ff999/2d8f7deacf60ed4c1cbc25972e59dc41/aspnetcore-runtime-7.0.0-preview.3.22178.4-linux-x64.tar.gz + https://download.visualstudio.microsoft.com/download/pr/81fceda1-cffa-4301-8bef-d4fda5c84985/d6ecf648c8046afed6fde902ab452c63/aspnetcore-runtime-7.0.0-preview.4.22251.1-linux-x64.tar.gz - https://download.visualstudio.microsoft.com/download/pr/88603c65-e646-47a0-9f7a-ac2b2cc49763/60955db63765e7dce435ddbc620454c4/aspnetcore-runtime-7.0.0-preview.3.22178.4-osx-x64.tar.gz + https://download.visualstudio.microsoft.com/download/pr/744d3a1e-4ad7-45d9-bdf5-e98d63a3e180/7ecdf7a01ce968206d8278404d35580a/aspnetcore-runtime-7.0.0-preview.4.22251.1-osx-x64.tar.gz From 0d93235ea55deed1268d4ca051090961c804a303 Mon Sep 17 00:00:00 2001 From: Gleb Krasilich Date: Mon, 20 Jun 2022 22:17:43 +0300 Subject: [PATCH 6/8] Update to .NET 7.0.0 Preview 5 --- global.json | 2 +- runtime.csproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/global.json b/global.json index e097be73..ab3a127e 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-preview.4.22252.9" + "version": "7.0.100-preview.5.22307.18" } } diff --git a/runtime.csproj b/runtime.csproj index c8125fc7..37aa4039 100644 --- a/runtime.csproj +++ b/runtime.csproj @@ -4,18 +4,18 @@ net7.0 - 7.0.0-preview.4.22229.4 + 7.0.0-preview.5.22301.12 - https://download.visualstudio.microsoft.com/download/pr/040013af-267c-48ef-ae3b-a2e77dde61d5/6aa48aa27bd8ab42ad4ce1df1b2bbf7e/aspnetcore-runtime-7.0.0-preview.4.22251.1-win-x64.zip + https://download.visualstudio.microsoft.com/download/pr/ca914709-0abb-48c2-aaf0-6ea145791621/d5956bb6278ff8bda5309a25e2f1dfd9/aspnetcore-runtime-7.0.0-preview.5.22303.8-win-x64.zip - https://download.visualstudio.microsoft.com/download/pr/81fceda1-cffa-4301-8bef-d4fda5c84985/d6ecf648c8046afed6fde902ab452c63/aspnetcore-runtime-7.0.0-preview.4.22251.1-linux-x64.tar.gz + https://download.visualstudio.microsoft.com/download/pr/57cfa892-9154-40a2-9643-4b74366115b3/cd04f7b035b3b7b485f422f2584d6da7/aspnetcore-runtime-7.0.0-preview.5.22303.8-linux-x64.tar.gz - https://download.visualstudio.microsoft.com/download/pr/744d3a1e-4ad7-45d9-bdf5-e98d63a3e180/7ecdf7a01ce968206d8278404d35580a/aspnetcore-runtime-7.0.0-preview.4.22251.1-osx-x64.tar.gz + https://download.visualstudio.microsoft.com/download/pr/eb2110ee-7dc1-494f-baa9-e3aabea1a008/d1cbc2de8f0e88882d4faa8759401cf7/aspnetcore-runtime-7.0.0-preview.5.22303.8-osx-x64.tar.gz From 402c6a856f2132f518904137571261cd7e7015a2 Mon Sep 17 00:00:00 2001 From: Gleb Krasilich Date: Sat, 19 Nov 2022 17:26:33 +0300 Subject: [PATCH 7/8] Update to .NET 7 RTM --- global.json | 2 +- runtime.csproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/global.json b/global.json index ab3a127e..70e3dcc5 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-preview.5.22307.18" + "version": "7.0.100" } } diff --git a/runtime.csproj b/runtime.csproj index 37aa4039..0511ea43 100644 --- a/runtime.csproj +++ b/runtime.csproj @@ -4,18 +4,18 @@ net7.0 - 7.0.0-preview.5.22301.12 + 7.0.0 - https://download.visualstudio.microsoft.com/download/pr/ca914709-0abb-48c2-aaf0-6ea145791621/d5956bb6278ff8bda5309a25e2f1dfd9/aspnetcore-runtime-7.0.0-preview.5.22303.8-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/57cfa892-9154-40a2-9643-4b74366115b3/cd04f7b035b3b7b485f422f2584d6da7/aspnetcore-runtime-7.0.0-preview.5.22303.8-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/eb2110ee-7dc1-494f-baa9-e3aabea1a008/d1cbc2de8f0e88882d4faa8759401cf7/aspnetcore-runtime-7.0.0-preview.5.22303.8-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 From 253b8aecfa9e4fd099bd17cdb52e4731d3edaaf3 Mon Sep 17 00:00:00 2001 From: Gleb Krasilich Date: Sat, 19 Nov 2022 17:29:44 +0300 Subject: [PATCH 8/8] Update .NET header files --- gm_dotnet_native/external_includes/netcore/hostfxr.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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__