diff --git a/bin/net6.0/MoneyServer b/bin/net6.0/MoneyServer deleted file mode 100755 index 690bd3a..0000000 Binary files a/bin/net6.0/MoneyServer and /dev/null differ diff --git a/bin/net6.0/MoneyServer.dll b/bin/net6.0/MoneyServer.dll deleted file mode 100644 index 4b706b4..0000000 Binary files a/bin/net6.0/MoneyServer.dll and /dev/null differ diff --git a/bin/net6.0/MoneyServer.runtimeconfig.json b/bin/net6.0/MoneyServer.runtimeconfig.json deleted file mode 100644 index 9adb78a..0000000 --- a/bin/net6.0/MoneyServer.runtimeconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "net6.0", - "framework": { - "name": "Microsoft.NETCore.App", - "version": "6.0.0" - }, - "configProperties": { - "System.Reflection.Metadata.MetadataUpdater.IsSupported": false, - "System.Runtime.TieredCompilation.QuickJit": false - } - } -} \ No newline at end of file diff --git a/bin/net6.0/OpenSim.Data.MySQL.MySQLMoneyDataWrapper.dll b/bin/net6.0/OpenSim.Data.MySQL.MySQLMoneyDataWrapper.dll deleted file mode 100644 index 3453be0..0000000 Binary files a/bin/net6.0/OpenSim.Data.MySQL.MySQLMoneyDataWrapper.dll and /dev/null differ diff --git a/bin/net6.0/OpenSim.Modules.Currency.dll b/bin/net6.0/OpenSim.Modules.Currency.dll deleted file mode 100644 index 64e01b2..0000000 Binary files a/bin/net6.0/OpenSim.Modules.Currency.dll and /dev/null differ diff --git a/build.net.sh b/build.net.sh index 0e7ce95..f30d813 100755 --- a/build.net.sh +++ b/build.net.sh @@ -2,22 +2,22 @@ CONFIGPATH=./config OPNSIMPATH=../bin -DOTNETVER=6.0 +DOTNETVER=9 echo "===================" echo "DTL/NSL_CURRENCY" echo "===================" ./clean.sh -./runprebuild.net.sh +./runprebuild.net.sh $DOTNETVER dotnet build -c Release OpenSim.Currency.sln || exit 1 echo -cp -f bin/net${DOTNETVER}/OpenSim.Data.MySQL.MySQLMoneyDataWrapper.dll $OPNSIMPATH -cp -f bin/net${DOTNETVER}/OpenSim.Modules.Currency.dll $OPNSIMPATH -cp -f bin/net${DOTNETVER}/MoneyServer.dll $OPNSIMPATH -cp -f bin/net${DOTNETVER}/MoneyServer $OPNSIMPATH -cp -f bin/net${DOTNETVER}/MoneyServer.runtimeconfig.json $OPNSIMPATH +cp -f bin/net${DOTNETVER}.0/OpenSim.Data.MySQL.MySQLMoneyDataWrapper.dll $OPNSIMPATH +cp -f bin/net${DOTNETVER}.0/OpenSim.Modules.Currency.dll $OPNSIMPATH +cp -f bin/net${DOTNETVER}.0/MoneyServer.dll $OPNSIMPATH +cp -f bin/net${DOTNETVER}.0/MoneyServer $OPNSIMPATH +cp -f bin/net${DOTNETVER}.0/MoneyServer.runtimeconfig.json $OPNSIMPATH # rm -f $OPNSIMPATH/OpenSim.Forge.Currency.dll diff --git a/prebuild.net.xml b/prebuild.net.xml index ab296c7..7610686 100644 --- a/prebuild.net.xml +++ b/prebuild.net.xml @@ -1,6 +1,6 @@ - + TRACE;DEBUG diff --git a/runprebuild.net.sh b/runprebuild.net.sh index d80ef02..c90394a 100755 --- a/runprebuild.net.sh +++ b/runprebuild.net.sh @@ -1,6 +1,12 @@ #!/bin/bash # +DOTNETVER=8 + +if [ "$1" != "" ]; then + DOTNETVER=$1 +fi + echo y | dotnet ../bin/prebuild.dll /file prebuild.net.xml /clean -dotnet ../bin/prebuild.dll /target vs2022 /targetframework net6_0 /excludedir = "obj | bin" /file prebuild.net.xml +dotnet ../bin/prebuild.dll /target vs2022 /targetframework net${DOTNETVER}_0 /excludedir = "obj | bin" /file prebuild.net.xml