Skip to content

Commit 88d02af

Browse files
authored
[Experimental] Update to .NET 7 (#125)
* Updated global.json and runtime.csproj to .NET 7 Preview 1 * Update managed part to .NET 7 * Updated .NET version to 7 preview 2 * Update .NET to 7.0.0 Preview 3 * Update to .NET 7 Preview 4 * Update to .NET 7.0.0 Preview 5 * Update to .NET 7 RTM * Update .NET header files
1 parent a078881 commit 88d02af

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "6.0.301"
3+
"version": "7.0.100"
44
}
55
}

gm_dotnet_managed/GmodNET.API/GmodNET.API.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<PackageLicenseExpression>MIT</PackageLicenseExpression>
66
<Product>GmodNET API</Product>
77
<Description>GmodNET API library contains all necessary interfaces to write a GmodNET module.</Description>

gm_dotnet_managed/GmodNET/GmodNET.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<StartupObject>GmodNET.BuidReq</StartupObject>
77
<Description>GmodNET managed module loader.</Description>
88
<PackageLicenseExpression>MIT</PackageLicenseExpression>

gm_dotnet_managed/Tests/Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

gm_dotnet_native/external_includes/netcore/hostfxr.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ typedef void(HOSTFXR_CALLTYPE *hostfxr_error_writer_fn)(const char_t *message);
6464
// By default no callback is registered in which case the errors are written to stderr.
6565
//
6666
// Each call to the error writer is sort of like writing a single line (the EOL character is omitted).
67-
// Multiple calls to the error writer may occure for one failure.
67+
// Multiple calls to the error writer may occur for one failure.
6868
//
6969
// If the hostfxr invokes functions in hostpolicy as part of its operation, the error writer
7070
// 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
314314
const char_t* hostfxr_commit_hash;
315315

316316
size_t sdk_count;
317-
const hostfxr_dotnet_environment_sdk_info* sdks;
317+
const struct hostfxr_dotnet_environment_sdk_info* sdks;
318318

319319
size_t framework_count;
320-
const hostfxr_dotnet_environment_framework_info* frameworks;
320+
const struct hostfxr_dotnet_environment_framework_info* frameworks;
321321
};
322322

323323
#endif //__HOSTFXR_H__

runtime.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
<!-- Public properties to configure runtime build. -->
44
<PropertyGroup>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66

7-
<BundledNETCoreVersion>6.0.6</BundledNETCoreVersion>
7+
<BundledNETCoreVersion>7.0.0</BundledNETCoreVersion>
88

99
<NETCoreDownloadUrl Condition="$(NETCoreSdkRuntimeIdentifier) == 'win-x64'">
10-
https://download.visualstudio.microsoft.com/download/pr/188ee779-2b6d-4cf0-b11e-e0514cad80b7/9558e992445f513e3b49ab2ef205c2d3/aspnetcore-runtime-6.0.6-win-x64.zip
10+
https://download.visualstudio.microsoft.com/download/pr/e3c77b40-cb02-4f1a-845f-c8040de58a83/be6bba4cac270a11c2b9dbdeec0a3040/aspnetcore-runtime-7.0.0-win-x64.zip
1111
</NETCoreDownloadUrl>
1212

1313
<NETCoreDownloadUrl Condition="$(NETCoreSdkRuntimeIdentifier) == 'linux-x64'">
14-
https://download.visualstudio.microsoft.com/download/pr/afd5344f-a9e9-45f9-85b5-de4551c53736/c30996daa407f9bb540ebc5edfcf16fc/aspnetcore-runtime-6.0.6-linux-x64.tar.gz
14+
https://download.visualstudio.microsoft.com/download/pr/4bbb4d31-70ba-4def-b747-4358be873982/3dbca5b64c2ffb88641c0e42bdeb297a/aspnetcore-runtime-7.0.0-linux-x64.tar.gz
1515
</NETCoreDownloadUrl>
1616

1717
<NETCoreDownloadUrl Condition="$(NETCoreSdkRuntimeIdentifier) == 'osx-x64'">
18-
https://download.visualstudio.microsoft.com/download/pr/0f5eb01e-6b46-4ef3-8c1c-7b99657a36df/7d4807a527cd5bc5a6a864f1fcd354e7/aspnetcore-runtime-6.0.6-osx-x64.tar.gz
18+
https://download.visualstudio.microsoft.com/download/pr/5ea36935-090e-4ca4-841f-49371b408d9d/6e0c2c4721dabbb9a237d6b6ed17df75/aspnetcore-runtime-7.0.0-osx-x64.tar.gz
1919
</NETCoreDownloadUrl>
2020
</PropertyGroup>
2121

0 commit comments

Comments
 (0)