Skip to content

Commit 7ba00f8

Browse files
SignatureBeefSignatureBeef
committed
Update various comments from net6=>9
1 parent 613d783 commit 7ba00f8

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

‎OTAPI.Patcher/NugetPackageBuilder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void Build(ModFwModder modder)
5252
var commitSha = Common.GetGitCommitSha();
5353
nuspec_xml = nuspec_xml.Replace("[INJECT_GIT_HASH]", String.IsNullOrWhiteSpace(commitSha) ? "" : $" git#{commitSha}");
5454

55-
var platforms = new[] { "net9.0" }; // relinker only does net6 currently. until there is a reason to implement it...
55+
var platforms = new[] { "net9.0" }; // relinker only does net9 currently. until there is a reason to implement it...
5656
var steamworks = modder.Module.AssemblyReferences.First(x => x.Name == "Steamworks.NET");
5757
var newtonsoft = modder.Module.AssemblyReferences.First(x => x.Name == "Newtonsoft.Json");
5858
var dependencies = new[]

‎OTAPI.Patcher/Targets/IPatchTarget.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public static void CreateRuntimeHooks(this ModFwModder modder, string output)
124124

125125
GACPaths = new string[] { } // avoid MonoMod looking up the GAC, which causes an exception on .netcore
126126
};
127-
mm.Log($"[OTAPI] Processing corelibs to be net6: {fileName}");
127+
mm.Log($"[OTAPI] Processing corelibs to be net9: {fileName}");
128128

129129
mm.Read();
130130

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The [upcoming branch](https://github.com/SignatureBeef/Open-Terraria-API/tree/up
88
Significant changes this redesign brings are...
99
* Modular script system, allowing single file patches using [csharp](https://www.nuget.org/packages/ModFramework.Modules.CSharp/), [javascript](https://www.nuget.org/packages/ModFramework.Modules.ClearScript/) and [lua](https://www.nuget.org/packages/ModFramework.Modules.Lua/)
1010
* A strong set of libraries with methods and extensions for use in extending or contributing back
11-
* .NET6 projects for all without Terraria's dependency to net4.
11+
* .NET9 projects for all without Terraria's dependency to net4.
1212

1313
The stack consists upon:
1414
* [OTAPI Scripts](https://github.com/SignatureBeef/Open-Terraria-API/tree/upcoming/OTAPI.Scripts), a directory containing all the scripts used to patch the pc, mobile & client assemblies.

‎docs/OTAPI.Mobile.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
OTAPI is primarily a server modification and is available as a cross platform package via NuGet.
1616

17-
Version 3.0 is now a .NET6 library thanks to ModFramework being able to retarget the .NET4 vanilla assembly up to .NET6.
18-
This means that any mod you create can be written as a .NET6 module and later merged into the patched assembly thanks to MonoMod.
17+
Version 3.0 is now a .NET9 library thanks to ModFramework being able to retarget the .NET4 vanilla assembly up to .NET9.
18+
This means that any mod you create can be written as a .NET9 module and later merged into the patched assembly thanks to MonoMod.
1919

2020
Here is what is now possible:
2121
- Native Runtime hooks, just reference OTAPI.Runtime.dll and register to MonoMod events generated from the Terraria assembly.
22-
- Full .NET6 ecosystem and its performance improvements. No need for two targets such as Windows & Mono anymore either.
22+
- Full .9 ecosystem and its performance improvements. No need for two targets such as Windows & Mono anymore either.
2323
- A new optional internal module system via ModFramework to load precompiled dll's, .cs files or even top level classes.
2424
- A strong set of libraries with methods and extensions to help you build more mods.
2525
- Create 1 file MonoMod patches to rewrite or inject new meta data to the assembly.

‎docs/OTAPI.PC.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
OTAPI is primarily a server modification and is available as a cross platform package via NuGet.
1616

17-
Version 3.0 is now a .NET6 library thanks to ModFramework being able to retarget the .NET4 vanilla assembly up to .NET6.
18-
This means that any mod you create can be written as a .NET6 module and later merged into the patched assembly thanks to MonoMod.
17+
Version 3.0 is now a .NET9 library thanks to ModFramework being able to retarget the .NET4 vanilla assembly up to .NET9.
18+
This means that any mod you create can be written as a .NET9 module and later merged into the patched assembly thanks to MonoMod.
1919

2020
Here is what is now possible:
2121
- Native Runtime hooks, just reference OTAPI.Runtime.dll and register to MonoMod events generated from the Terraria assembly.
22-
- Full .NET6 ecosystem and its performance improvements. No need for two targets such as Windows & Mono anymore either.
22+
- Full .NET9 ecosystem and its performance improvements. No need for two targets such as Windows & Mono anymore either.
2323
- A new optional internal module system via ModFramework to load precompiled dll's, .cs files or even top level classes.
2424
- A strong set of libraries with methods and extensions to help you build more mods.
2525
- Create 1 file MonoMod patches to rewrite or inject new meta data to the assembly.

‎docs/OTAPI.TML.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
OTAPI is primarily a server modification and is available as a cross platform package via NuGet.
1616

17-
Version 3.0 is now a .NET6 library thanks to ModFramework being able to retarget the .NET4 vanilla assembly up to .NET6.
18-
This means that any mod you create can be written as a .NET6 module and later merged into the patched assembly thanks to MonoMod.
17+
Version 3.0 is now a .9 library thanks to ModFramework being able to retarget the .NET4 vanilla assembly up to .NET9.
18+
This means that any mod you create can be written as a .NET9 module and later merged into the patched assembly thanks to MonoMod.
1919

2020
Here is what is now possible:
2121
- Native Runtime hooks, just reference OTAPI.Runtime.dll and register to MonoMod events generated from the Terraria assembly.
22-
- Full .NET6 ecosystem and its performance improvements. No need for two targets such as Windows & Mono anymore either.
22+
- Full .NET9 ecosystem and its performance improvements. No need for two targets such as Windows & Mono anymore either.
2323
- A new optional internal module system via ModFramework to load precompiled dll's, .cs files or even top level classes.
2424
- A strong set of libraries with methods and extensions to help you build more mods.
2525
- Create 1 file MonoMod patches to rewrite or inject new meta data to the assembly.

‎examples/RuntimeExample.Client/RuntimeExample.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<HintPath>..\..\OTAPI.Client.Installer\bin\Debug\net472\OTAPI.Runtime.dll</HintPath>
1919
</Reference>
2020
<Reference Include="OTAPI">
21-
<HintPath>..\..\OTAPI.Patcher\bin\Debug\net6.0\OTAPI.exe</HintPath>
21+
<HintPath>..\..\OTAPI.Patcher\bin\Debug\net9.0\OTAPI.exe</HintPath>
2222
</Reference>
2323
<Reference Include="FNA">
24-
<HintPath>..\..\OTAPI.Patcher\bin\Debug\net6.0\FNA.dll</HintPath>
24+
<HintPath>..\..\OTAPI.Patcher\bin\Debug\net9.0\FNA.dll</HintPath>
2525
</Reference>
2626
</ItemGroup>
2727
<ItemGroup>

‎start-server.ps1‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function Write-RuntimeConfig {
77

88
$runtimejson = @{
99
"runtimeOptions"= @{
10-
"tfm"= "net6.0"
10+
"tfm"= "net9.0"
1111
"framework"= @{
1212
"name"= "Microsoft.NETCore.App"
1313
"version"= "6.0.0"
@@ -31,8 +31,8 @@ function PC-Server {
3131
Find-Package -Name Mono.Cecil -ProviderName NuGet | Install-Package -Destination ./server/packages -SkipDependencies
3232
Find-Package -Name Newtonsoft.Json -ProviderName NuGet | Install-Package -Destination ./server/packages -SkipDependencies
3333

34-
Copy-Item "./server/packages/OTAPI.Upcoming.3*/lib/net6.0/OTAPI.dll" -Destination "./server/pc/"
35-
Copy-Item "./server/packages/ModFramework*/lib/net6.0/ModFramework.dll" -Destination "./server/pc/"
34+
Copy-Item "./server/packages/OTAPI.Upcoming.3*/lib/net9.0/OTAPI.dll" -Destination "./server/pc/"
35+
Copy-Item "./server/packages/ModFramework*/lib/net9.0/ModFramework.dll" -Destination "./server/pc/"
3636
Copy-Item "./server/packages/MonoMod*/lib/net5.0/MonoMod.dll" -Destination "./server/pc/"
3737
Copy-Item "./server/packages/MonoMod.Utils*/lib/net5.0/MonoMod.Utils.dll" -Destination "./server/pc/"
3838
Copy-Item "./server/packages/MonoMod.RuntimeDetour*/lib/net5.0/MonoMod.RuntimeDetour.dll" -Destination "./server/pc/"
@@ -60,8 +60,8 @@ function Mobile-Server {
6060
Find-Package -Name Newtonsoft.Json -ProviderName NuGet | Install-Package -Destination ./server/packages -SkipDependencies
6161
Find-Package -Name System.IO.Packaging -ProviderName NuGet | Install-Package -Destination ./server/packages -SkipDependencies
6262

63-
Copy-Item "./server/packages/OTAPI.Upcoming.Mobile*/lib/net6.0/OTAPI.dll" -Destination "./server/mobile/"
64-
Copy-Item "./server/packages/ModFramework*/lib/net6.0/ModFramework.dll" -Destination "./server/mobile/"
63+
Copy-Item "./server/packages/OTAPI.Upcoming.Mobile*/lib/net9.0/OTAPI.dll" -Destination "./server/mobile/"
64+
Copy-Item "./server/packages/ModFramework*/lib/net9.0/ModFramework.dll" -Destination "./server/mobile/"
6565
Copy-Item "./server/packages/MonoMod*/lib/net5.0/MonoMod.dll" -Destination "./server/mobile/"
6666
Copy-Item "./server/packages/MonoMod.Utils*/lib/net5.0/MonoMod.Utils.dll" -Destination "./server/mobile/"
6767
Copy-Item "./server/packages/MonoMod.RuntimeDetour*/lib/net5.0/MonoMod.RuntimeDetour.dll" -Destination "./server/mobile/"
@@ -98,11 +98,11 @@ function TML-Server {
9898

9999
Expand-Archive -Force ./server/tModLoader.zip -DestinationPath ./server/tModLoader
100100

101-
Copy-Item "./server/packages/OTAPI.Upcoming.tModLoader*/lib/net6.0/OTAPI.dll" -Destination "./server/tModLoader/"
102-
Copy-Item "./server/packages/OTAPI.Upcoming.tModLoader*/lib/net6.0/OTAPI.Runtime.dll" -Destination "./server/tModLoader/"
101+
Copy-Item "./server/packages/OTAPI.Upcoming.tModLoader*/lib/net9.0/OTAPI.dll" -Destination "./server/tModLoader/"
102+
Copy-Item "./server/packages/OTAPI.Upcoming.tModLoader*/lib/net9.0/OTAPI.Runtime.dll" -Destination "./server/tModLoader/"
103103

104-
New-Item -ItemType Directory -Force -Path ./server/tModLoader/Libraries/ModFramework/1.0.46-alpha/lib/net6.0
105-
Copy-Item "./server/packages/ModFramework*/lib/net6.0/ModFramework.dll" -Destination "./server/tModLoader/Libraries/ModFramework/1.0.46-alpha/lib/net6.0"
104+
New-Item -ItemType Directory -Force -Path ./server/tModLoader/Libraries/ModFramework/1.0.46-alpha/lib/net9.0
105+
Copy-Item "./server/packages/ModFramework*/lib/net().0/ModFramework.dll" -Destination "./server/tModLoader/Libraries/ModFramework/1.0.46-alpha/lib/net9.0"
106106

107107
New-Item -ItemType Directory -Force -Path ./server/tModLoader/Libraries/monomod/22.5.1.1/lib/net5.0
108108
Copy-Item "./server/packages/MonoMod*/lib/net5.0/MonoMod.dll" -Destination "./server/tModLoader/Libraries/monomod/22.5.1.1/lib/net5.0"
@@ -154,7 +154,7 @@ function TML-Server {
154154
}
155155
}
156156

157-
Add-Deps-Package -AssemblyName "ModFramework" -AssemblyVersion "1.0.46-alpha" -FrameworkVersion "net6.0"
157+
Add-Deps-Package -AssemblyName "ModFramework" -AssemblyVersion "1.0.46-alpha" -FrameworkVersion "net9.0"
158158
Add-Deps-Package -AssemblyName "MonoMod" -AssemblyVersion "22.5.1.1" -FrameworkVersion "net5.0"
159159

160160
$json = $deps | ConvertTo-Json -Depth 100

0 commit comments

Comments
 (0)