Skip to content

Commit

Permalink
Merge upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
zontreck committed May 13, 2024
2 parents ccbabb5 + 0e42fc7 commit 8fc97f3
Show file tree
Hide file tree
Showing 794 changed files with 27,133 additions and 123,162 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dotnetci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.*
dotnet-version: 8.0.*
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
289 changes: 0 additions & 289 deletions .nant/local.include

This file was deleted.

35 changes: 29 additions & 6 deletions BUILDING.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
# git clone

get or update source from git

`git clone git://opensimulator.org/git/opensim`



# Building on Windows

## Requirements
For building under Windows, the following is required:
* [Microsoft DotNet 6.0](https://dotnet.microsoft.com/en-us/download), version 6.0 or later.

dotnet 6.0 is the LTS version and is recommended.
dotnet 8.0 is the LTS version and is recommended.
To building under Windows, the following is required:

* [dotnet 8.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)

optionally also

* [Visual Studio .NET](https://visualstudio.microsoft.com/vs/features/net-development/), version 2022 or later


### Building
Prebuild is no longer used. There is a top level Solution (sln) and csproj files for each
Expand All @@ -18,7 +34,10 @@ Either command will do a NuGet restore (dotnet restore) to restore any required
kicking off a build using a current version of msbuild. The Csproj and SLN files are all designed to use the new
format for Msbuild which is simplified and really directly replaces what prebuild provided.

Load the generated OpenSim.sln into Visual Studio .NET and build the solution.
run
`compile.bat`

Or load the generated OpenSim.sln into Visual Studio or Visual Studio Code and build the solution.

Configure, see below

Expand All @@ -28,10 +47,14 @@ The resulting build will be generated to ./build/{Debug|Release}/

## Requirements

* [Mono > 5.0](https://www.mono-project.com/download/stable/#download-lin)
* On some Linux distributions you may need to install additional packages.
* [Microsoft DotNet 6.0](https://dotnet.microsoft.com/en-us/download), version 6.0 or later.
dotnet 6.0 is the LTS version and is recommended.
* [dotnet 8.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
* libgdiplus

if you have mono 6.x complete, you already have libgdiplus, otherwise you need to install it
using a package manager for your operating system, like apt, brew, macports, etc
for example on debian:

`apt-get update && apt-get install -y apt-utils libgdiplus libc6-dev`

### Building
Prebuild is no longer used. There is a top level Solution (sln) and csproj files for each
Expand Down
4 changes: 4 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<Project>
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>disable</Nullable>
<GenerateDependencyFile>false</GenerateDependencyFile>
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
<MSBuildProjectExtensionsPath>$(SolutionDir)\obj\$(Configuration)\$(MSBuildProjectName)\</MSBuildProjectExtensionsPath>
<IntermediateOutputPath>$(SolutionDir)\obj\$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
<OutputPath>$(SolutionDir)\build\$(Configuration)\$(AssemblyName)\</OutputPath>
Expand Down
Loading

0 comments on commit 8fc97f3

Please sign in to comment.