Skip to content

[Experimental] Update to .NET 7 #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GlebChili merged 8 commits into from
Nov 19, 2022
Merged

[Experimental] Update to .NET 7 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
898e0f3
Updated global.json and runtime.csproj to .NET 7 Preview 1
GlebChili Feb 19, 2022
e232b06
Update managed part to .NET 7
GlebChili Feb 19, 2022
88e6d7a
Updated .NET version to 7 preview 2
GlebChili Mar 19, 2022
9c5526b
Update .NET to 7.0.0 Preview 3
GlebChili Apr 16, 2022
a3f4233
Update to .NET 7 Preview 4
GlebChili May 29, 2022
0d93235
Update to .NET 7.0.0 Preview 5
GlebChili Jun 20, 2022
402c6a8
Update to .NET 7 RTM
GlebChili Nov 19, 2022
253b8ae
Update .NET header files
GlebChili Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.301"
"version": "7.0.100"
}
}
2 changes: 1 addition & 1 deletion gm_dotnet_managed/GmodNET.API/GmodNET.API.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Product>GmodNET API</Product>
<Description>GmodNET API library contains all necessary interfaces to write a GmodNET module.</Description>
Expand Down
2 changes: 1 addition & 1 deletion gm_dotnet_managed/GmodNET/GmodNET.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<StartupObject>GmodNET.BuidReq</StartupObject>
<Description>GmodNET managed module loader.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
2 changes: 1 addition & 1 deletion gm_dotnet_managed/Tests/Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
Expand Down
6 changes: 3 additions & 3 deletions gm_dotnet_native/external_includes/netcore/hostfxr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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__
10 changes: 5 additions & 5 deletions runtime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

<!-- Public properties to configure runtime build. -->
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>

<BundledNETCoreVersion>6.0.6</BundledNETCoreVersion>
<BundledNETCoreVersion>7.0.0</BundledNETCoreVersion>

<NETCoreDownloadUrl Condition="$(NETCoreSdkRuntimeIdentifier) == 'win-x64'">
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
</NETCoreDownloadUrl>

<NETCoreDownloadUrl Condition="$(NETCoreSdkRuntimeIdentifier) == 'linux-x64'">
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
</NETCoreDownloadUrl>

<NETCoreDownloadUrl Condition="$(NETCoreSdkRuntimeIdentifier) == 'osx-x64'">
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
</NETCoreDownloadUrl>
</PropertyGroup>

Expand Down