diff --git a/BUILDING.md b/BUILDING.md index 0fc691f7d3..69d533baab 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -1,16 +1,16 @@ # Building on Windows ## Requirements - For building under Windows, the following is required: + To building under Windows, the following is required: - * [Visual Studio .NET](https://visualstudio.microsoft.com/vs/features/net-development/), version 2015 or later + * [Visual Studio .NET](https://visualstudio.microsoft.com/vs/features/net-development/), version 2019 or later ### Building To create the project files, run ```runprebuild.bat``` -Load the generated OpenSim.sln into Visual Studio .NET and build the solution. +Load the generated OpenSim.sln into Visual Studio and build the solution. Configure, see below @@ -20,27 +20,19 @@ Now just run `OpenSim.exe` from the `bin` folder, and set up the region. ## Requirements - * [Mono > 5.0](https://www.mono-project.com/download/stable/#download-lin) - * On some Linux distributions you may need to install additional packages. - * msbuild or xbuild(deprecated) if still supported by the mono version - * See [the wiki](http://opensimulator.org/wiki/Dependencies) for more information. + * [dotnet 6.0 ADK and DeskTop runtime](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) ### Building To create the project files, run: ```./runprebuild.sh``` - then run ```msbuild``` or ```xbuild``` if xbuild was installed. + then run dotnet build --configuration Release OpenSim.sln Configure. See below run `./opensim.sh` from the `bin` folder, and set up the region -For rebuilding and debugging use the msbuild option switches - * clean: `msbuild /target:clean` - * debug: (default) `msbuild /property:Configuration=Debug` - * release: `msbuild /property:Configuration=Release` - # Configure # ## Standalone mode ## diff --git a/bin/OpenSim32.exe b/bin/OpenSim32.exe deleted file mode 100644 index 74477c0b68..0000000000 Binary files a/bin/OpenSim32.exe and /dev/null differ diff --git a/bin/OpenSim32.exe.config b/bin/OpenSim32.exe.config deleted file mode 100644 index a3b2026962..0000000000 --- a/bin/OpenSim32.exe.config +++ /dev/null @@ -1,76 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/bin/opensim.sh b/bin/opensim.sh index aaa9649b65..e81355d076 100755 --- a/bin/opensim.sh +++ b/bin/opensim.sh @@ -1,5 +1,3 @@ #!/bin/sh ulimit -s 1048576 -# next option may improve SGen gc (for opensim only) you may also need to increase nursery size on large regions -#export MONO_GC_PARAMS="minor=split,promotion-age=14" -mono --desktop -O=all OpenSim.exe +dotnet OpenSim.dll diff --git a/cleanaot.sh b/cleanaot.sh deleted file mode 100755 index 907b11de52..0000000000 --- a/cleanaot.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -cd bin -rm Nini.dll.so -rm DotNetOpen*.dll.so -rm Ionic.Zip.dll.so -rm Newtonsoft.Json.dll.so -rm C5.dll.so -rm CSJ2K.dll.so -rm Npgsql.dll.so -rm RestSharp.dll.so -rm Mono*.dll.so -rm MySql*.dll.so -rm OpenMetaverse*.dll.so -rm OpenSim*.dll.so -rm OpenSim*.exe.so -rm Robust*.exe.so -cd .. \ No newline at end of file diff --git a/makeaot.sh b/makeaot.sh deleted file mode 100755 index 91d40fde16..0000000000 --- a/makeaot.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -cd bin -mono --aot=mcpu=native,bind-to-runtime-version -O=all Nini.dll -mono --aot=mcpu=native,bind-to-runtime-version -O=all DotNetOpen*.dll -mono --aot=mcpu=native,bind-to-runtime-version -O=all Ionic.Zip.dll -mono --aot=mcpu=native,bind-to-runtime-version -O=all Newtonsoft.Json.dll -mono --aot=mcpu=native,bind-to-runtime-version -O=all C5.dll -mono --aot=mcpu=native,bind-to-runtime-version -O=all CSJ2K.dll -mono --aot=mcpu=native,bind-to-runtime-version -O=all Npgsql.dll -mono --aot=mcpu=native,bind-to-runtime-version -O=all RestSharp.dll -mono --aot=mcpu=native,bind-to-runtime-version -O=all Mono*.dll -mono --aot=mcpu=native,bind-to-runtime-version -O=all MySql*.dll -mono --aot=mcpu=native,bind-to-runtime-version -O=all OpenMetaverse*.dll -mono --aot=mcpu=native,bind-to-runtime-version -O=all OpenSim*.dll -mono --aot=mcpu=native,bind-to-runtime-version -O=all OpenSim*.exe -mono --aot=mcpu=native,bind-to-runtime-version -O=all Robust*.exe -cd .. \ No newline at end of file diff --git a/prebuild.xml b/prebuild.xml index 9b997e0dcf..2d54d5831b 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -1,7 +1,7 @@ - + TRACE;DEBUG @@ -10,54 +10,38 @@ true 4 false - + CA1416,SYSLIB0011,SYSLIB0014 bin true true false false + true + false + false + false - true false true 4 false - + CA1416,SYSLIB0011,SYSLIB0014 bin false true false false + true + false + false + false - - - @@ -71,10 +55,6 @@ ../../bin/ - - - - @@ -95,26 +75,17 @@ ../../bin/ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -139,16 +110,14 @@ ../../../bin/ - - - - - - - - - - + + + + + + + + @@ -171,14 +140,12 @@ ../../../bin/ - - - - - - - - + + + + + + @@ -200,17 +167,13 @@ ../../../../bin/ - - - - - - + + - + @@ -232,15 +195,11 @@ ../../../bin/ - - - - - - - - - + + + + + @@ -261,12 +220,9 @@ ../../../bin/ - - - - - - + + + @@ -291,17 +247,13 @@ ../../bin/ - - - - - - - - + + + + - - + + @@ -322,8 +274,6 @@ ../../../../bin/ - - @@ -349,19 +299,16 @@ ../../../bin/ - - - - - - - - + + + + + @@ -382,18 +329,15 @@ ../../bin/ - - - - - - - + + + + @@ -418,13 +362,11 @@ ../../../../bin/ - - - + @@ -445,14 +387,9 @@ ../../../bin/ - - - - - - - - + + + @@ -463,13 +400,11 @@ - - - - - - - + + + + + @@ -494,22 +429,18 @@ ../../../bin/ - - - - - - - - - + + + + + - - + + @@ -531,14 +462,13 @@ ../../../bin/ - - - + + - - + + @@ -560,18 +490,16 @@ ../../../bin/ - - - - + + - - + + @@ -593,18 +521,16 @@ ../../../bin/ - - - - + + - - + + @@ -626,15 +552,11 @@ ../../../bin/ - - - - - - - - - + + + + + @@ -645,9 +567,9 @@ - - - + + + @@ -669,21 +591,17 @@ ../../../bin/ - - - - - - - + + + - - - + + + @@ -705,9 +623,8 @@ ../../../bin/ - - - + + @@ -716,8 +633,8 @@ - - + + @@ -739,10 +656,8 @@ ../../../bin/ - - - - + + @@ -752,8 +667,8 @@ - - + + @@ -775,9 +690,8 @@ ../../../bin/ - - - + + @@ -785,8 +699,8 @@ - - + + @@ -808,10 +722,9 @@ ../../../bin/ - - - - + + + @@ -819,8 +732,8 @@ - - + + @@ -842,9 +755,8 @@ ../../../bin/ - - - + + @@ -854,8 +766,8 @@ - - + + @@ -877,11 +789,8 @@ ../../../bin/ - - - - - + + @@ -890,8 +799,8 @@ - - + + @@ -913,16 +822,14 @@ ../../../bin/ - - - - + + - - + + @@ -944,9 +851,8 @@ ../../../bin/ - - - + + @@ -954,8 +860,8 @@ - - + + @@ -977,9 +883,8 @@ ../../../bin/ - - - + + @@ -987,8 +892,8 @@ - - + + @@ -1010,10 +915,8 @@ ../../../bin/ - - - - + + @@ -1021,8 +924,8 @@ - - + + @@ -1046,8 +949,6 @@ ../../../bin/ - - @@ -1055,11 +956,11 @@ - - - - - + + + + + @@ -1081,11 +982,8 @@ ../../../bin/ - - - - - + + @@ -1099,8 +997,8 @@ - - + + @@ -1122,17 +1020,16 @@ ../../../bin/ - - - - + + - - + + + @@ -1154,15 +1051,14 @@ ../../../bin/ - - - - - + + + + @@ -1184,8 +1080,6 @@ ../../../bin/ - - @@ -1195,11 +1089,11 @@ - - - - - + + + + + @@ -1221,12 +1115,9 @@ ../../../bin/ - - - - - - + + + @@ -1234,11 +1125,11 @@ - - - - - + + + + + @@ -1262,14 +1153,10 @@ ../../../bin/ - - - - - - - - + + + + @@ -1278,9 +1165,9 @@ - - - + + + @@ -1304,21 +1191,19 @@ ../../bin/ - - - - - + + + - - - - + + + + @@ -1341,18 +1226,16 @@ ../../bin/ - - - - - + + + - - + + @@ -1376,11 +1259,7 @@ ../../../../../bin/ - - - - - + @@ -1420,11 +1299,7 @@ ../../../../../bin/ - - - - - + @@ -1466,21 +1341,17 @@ ../../../bin/ - - - - - + - - - - + + + + - - + + @@ -1506,21 +1377,17 @@ ../../../bin/ - - - - - + - - - - - - + + + + + + @@ -1544,21 +1411,17 @@ ../../../bin/ - - - - - + - - - + + + - - + + @@ -1587,20 +1450,13 @@ ../../../bin/ - - - - - - - - - - - - - - + + + + + + + @@ -1618,18 +1474,18 @@ - - + + - - - + + + - + @@ -1655,19 +1511,14 @@ ../../../bin/ - - - - - - - - - - - - - + + + + + + + + @@ -1684,12 +1535,12 @@ - + - - - + + + @@ -1714,15 +1565,12 @@ ../../../bin/ - - - - + - + @@ -1744,10 +1592,6 @@ ../../../../bin/ - - - - @@ -1772,8 +1616,7 @@ ../../../../bin/ - - + @@ -1807,7 +1650,6 @@ ../../../../bin/ - @@ -1834,7 +1676,6 @@ ../../../../bin/ - @@ -1861,8 +1702,6 @@ ../../../../bin/ - - @@ -1893,8 +1732,6 @@ ../../../../bin/ - - @@ -1927,8 +1764,7 @@ ../../../../bin/ - - + @@ -1964,11 +1800,8 @@ ../../../../bin/ - - - - + @@ -1993,23 +1826,22 @@ ../../../bin/ + Exe ../../../bin/ + Exe ../../../bin/ - - - - - - - - + + + + + @@ -2023,9 +1855,9 @@ - - - + + + @@ -2047,11 +1879,9 @@ ../../../bin/ - - - - - + + + @@ -2059,7 +1889,7 @@ - + @@ -2082,15 +1912,13 @@ ../../../bin/ - - + + - - - + @@ -2113,15 +1941,12 @@ ../../../bin/ - - - - - - - - - + + + + + + @@ -2130,7 +1955,7 @@ - + @@ -2155,10 +1980,6 @@ ../../../../bin/ - - - - @@ -2190,10 +2011,6 @@ ../../../../../../bin/ - - - - @@ -2224,12 +2041,7 @@ ../../../../../../bin/ - - - - - - + @@ -2255,156 +2067,6 @@ - - - - ../../../../../bin/ - - - - - ../../../../../bin/ - - - - ../../../../../bin/ - - - - - - - - - - - - - - - - - - - - - - ../../../../../bin/ - - - - - ../../../../../bin/ - - - - ../../../../../bin/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ../../../../../../bin/ - - - - - ../../../../../../bin/ - - - - ../../../../../../bin/ - - - - - - - - - - - - - - - - - - - - - - - - - - ../../../../bin/ - - - - - ../../../../bin/ - - - - ../../../../bin/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2436,9 +2098,7 @@ - - - + @@ -2466,18 +2126,13 @@ ../../../bin/ - - - - - - - - - - - + + + + + + @@ -2511,18 +2166,13 @@ ../../../bin/ - - - - - - - - - - - + + + + + + @@ -2552,24 +2202,24 @@ ../../../bin/ + Exe ../../../bin/ + Exe ../../../bin/ - - - - + + - - + + @@ -2591,14 +2241,13 @@ ../../../bin/ - - - + + - - + + @@ -2620,11 +2269,9 @@ ../../../bin/ - - - - + + @@ -2634,6 +2281,7 @@ + +--> + + @@ -2887,28 +2520,24 @@ ../../../bin/ - - - - - - - + + + - - - - + + + + - - + + @@ -2930,19 +2559,16 @@ ../../../bin/ - - - - - - - + + + + - - + + @@ -2961,7 +2587,6 @@ ../../../../bin/ - @@ -2993,7 +2618,6 @@ ../../../../bin/ - @@ -3023,13 +2647,10 @@ ../../../bin/ - - - - - - - + + + + @@ -3046,25 +2667,16 @@ - - - + + - - - + + - - + - @@ -3140,14 +2752,10 @@ ../../../bin/ - - - - - - - - + + + + @@ -3165,24 +2773,14 @@ - - - - + + - - - + + - - @@ -3200,8 +2798,6 @@ ../../../../../bin/ - - @@ -3240,8 +2836,6 @@ ../../../../../../bin/ - - @@ -3274,9 +2868,6 @@ ../../../bin/ - - - @@ -3290,24 +2881,17 @@ - - - - - - + + + + + + - + - - @@ -3323,10 +2907,6 @@ - @@ -3340,8 +2920,6 @@ ../../../../../bin/ - - @@ -3373,9 +2951,6 @@ ../../../../../bin/ - - - @@ -3407,16 +2982,13 @@ ../../../bin/ - - - - - - - - - - + + + + + + + @@ -3428,14 +3000,7 @@ - - @@ -3455,17 +3020,13 @@ ../../../bin/ - - - - - - - - - - - + + + + + + + @@ -3495,16 +3056,13 @@ ../../../bin/ - - - - - - - - - - + + + + + + + @@ -3534,12 +3092,9 @@ ../../../bin/ - - - - - - + + + @@ -3547,19 +3102,17 @@ - - - - + + - + - +--> diff --git a/runprebuild.bat b/runprebuild.bat index bdd77a1502..f27a14fc8c 100755 --- a/runprebuild.bat +++ b/runprebuild.bat @@ -1,61 +1,10 @@ @echo OFF -bin\Prebuild.exe /target vs2015 /excludedir = "obj | bin" +bin\Prebuild.exe /target vs2022 /targetframework net6_0 /excludedir = "obj | bin" /file prebuild.xml -setlocal ENABLEEXTENSIONS -set VALUE_NAME=MSBuildToolsPath - -if "%PROCESSOR_ARCHITECTURE%"=="x86" set PROGRAMS=%ProgramFiles% -if defined ProgramFiles(x86) set PROGRAMS=%ProgramFiles(x86)% - -rem Try to find VS2019 -for %%e in (Enterprise Professional Community) do ( - if exist "%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\MSBuild.exe" ( - - set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\MSBuild" - goto :found - ) -) - -rem try find vs2017 -for %%e in (Enterprise Professional Community) do ( - if exist "%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\MSBuild.exe" ( - - set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\MSBuild" - goto :found - ) -) - -rem We have to use grep or find to locate the correct line, because reg query spits -rem out 4 lines before Windows 7 but 2 lines after Windows 7. -rem We use grep if it's on the path; otherwise we use the built-in find command -rem from Windows. (We must use grep on Cygwin because it overrides the "find" command.) - -for %%X in (grep.exe) do (set FOUNDGREP=%%~$PATH:X) -if defined FOUNDGREP ( - set FINDCMD=grep -) else ( - set FINDCMD=find -) - -rem try vs2015 -FOR /F "usebackq tokens=1-3" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v %VALUE_NAME% 2^>nul ^| %FINDCMD% "%VALUE_NAME%"`) DO ( - set ValueValue=%%C\msbuild - goto :found -) - -@echo msbuild for at least VS2015 not found, please install a (Community) edition of VS2017 or VS2015 -@echo Not creating compile.bat -if exist "compile.bat" ( - del compile.bat - ) -goto :done - -:found - @echo Found msbuild at %ValueValue% @echo Creating compile.bat rem To compile in debug mode - @echo %ValueValue% opensim.sln > compile.bat + @echo dotnet build --configuration Release OpenSim.sln > compile.bat rem To compile in release mode comment line (add rem to start) above and uncomment next (remove rem) rem @echo %ValueValue% /p:Configuration=Release opensim.sln > compile.bat :done diff --git a/runprebuild.sh b/runprebuild.sh index 3f81df390c..7a4e81dd5e 100755 --- a/runprebuild.sh +++ b/runprebuild.sh @@ -2,26 +2,24 @@ case "$1" in - 'clean') + 'clean') + mono bin/Prebuild.exe /file prebuild.xml /clean - mono bin/Prebuild.exe /clean ;; 'autoclean') - echo y|mono bin/Prebuild.exe /clean + echo y|mono bin/Prebuild.exe /file prebuild.xml /clean ;; + *) - mono bin/Prebuild.exe /target nant - mono bin/Prebuild.exe /target vs2015 /excludedir = "obj | bin" + mono bin/Prebuild.exe /target vs2022 /targetframework net6_0 /excludedir = "obj | bin" /file prebuild.xml ;; esac - rm -fr bin/addin-db-002 - diff --git a/runprebuild48.bat b/runprebuild48.bat deleted file mode 100644 index 151dd90f80..0000000000 --- a/runprebuild48.bat +++ /dev/null @@ -1,48 +0,0 @@ -@echo OFF - -bin\Prebuild.exe /target vs2019 /targetframework v4_8 /excludedir = "obj | bin" - -setlocal ENABLEEXTENSIONS -set VALUE_NAME=MSBuildToolsPath - -if "%PROCESSOR_ARCHITECTURE%"=="x86" set PROGRAMS=%ProgramFiles% -if defined ProgramFiles(x86) set PROGRAMS=%ProgramFiles(x86)% - -set PROGRAMS64 = %PROGRAMS% -if defined ProgramFiles set PROGRAMS64=%ProgramFiles% - - -rem Try to find VS2019/22 -for %%e in (Community Enterprise Professional) do ( - if exist "%PROGRAMS64%\Microsoft Visual Studio\2022\%%e\MSBuild\Current\Bin\MSBuild.exe" ( - - set ValueValue="%PROGRAMS64%\Microsoft Visual Studio\2022\%%e\MSBuild\Current\Bin\MSBuild" - goto :found - ) - if exist "%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\MSBuild.exe" ( - - set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\MSBuild" - goto :found - ) -) - - -@echo msbuild for at least VS2019 not found, please install a (Community) edition of VS2019 -@echo Not creating compile.bat -if exist "compile.bat" ( - del compile.bat - ) -goto :done - -:found - @echo Found msbuild at %ValueValue% - @echo Creating compile.bat -rem To compile in debug mode - @echo %ValueValue% opensim.sln > compile.bat -rem To compile in release mode comment line (add rem to start) above and uncomment next (remove rem) -rem @echo %ValueValue% /p:Configuration=Release opensim.sln > compile.bat -:done -if exist "bin\addin-db-002" ( - del /F/Q/S bin\addin-db-002 > NUL - rmdir /Q/S bin\addin-db-002 - ) \ No newline at end of file diff --git a/runprebuild48.sh b/runprebuild48.sh deleted file mode 100755 index bb87334d8c..0000000000 --- a/runprebuild48.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -case "$1" in - - 'clean') - - mono bin/Prebuild.exe /clean - - ;; - - - 'autoclean') - - echo y|mono bin/Prebuild.exe /clean - - ;; - - - - *) - - mono bin/Prebuild.exe /target vs2019 /targetframework v4_8 /excludedir = "obj | bin" - - ;; - -esac