Skip to content

Commit

Permalink
Bump to DotNet Core 8.0 to match upstream. They are still disabling d…
Browse files Browse the repository at this point in the history
…ependency generation and checking which disables a big security element of the framework. More on that in Tranquillity.
  • Loading branch information
mdickson committed Apr 23, 2024
1 parent 1f20ced commit f43ce8f
Show file tree
Hide file tree
Showing 100 changed files with 104 additions and 100 deletions.
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
2 changes: 1 addition & 1 deletion OpenSim/Addons/Groups/OpenSim.Addons.Groups.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Addons.Groups</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim.Addons.Groups</Product>
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Addons/OfflineIM/OpenSim.Addons.OfflineIM.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Addons.OfflineIM</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim.Addons.OfflineIM</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.ApplicationPlugins.LoadRegions</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.ApplicationPlugins.RegionModulesController</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.ApplicationPlugins.RemoteController</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetOpenId">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Capabilities.Handlers</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Capabilities/OpenSim.Capabilities.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Capabilities</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/ConsoleClient/OpenSim.ConsoleClient.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Data/MySQL/OpenSim.Data.MySQL.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Data.MySQL</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim.Data.MySQL</Product>
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Data/Null/OpenSim.Data.Null.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Data.Null</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim.Data.Null</Product>
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Data/OpenSim.Data.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Data</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim.Data</Product>
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Data/PGSQL/OpenSim.Data.PGSQL.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Data.PGSQL</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim.Data.PGSQL</Product>
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Data/SQLite/OpenSim.Data.SQLite.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Data.SQLite</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim.Data.SQLite</Product>
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Data/Tests/OpenSim.Data.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Reference Include="Nini">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Framework.AssetLoader.Filesystem</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Framework.Console</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>ServerConsole</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Framework.Monitoring</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Framework/OpenSim.Framework.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Framework</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim.Framework</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Framework.Serialization</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.15" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Framework.Servers.HttpServer</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Framework.Servers</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.15" />
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Framework/Tests/OpenSim.Framework.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.15" />
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Region/Application/OpenSim.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
<AssemblyTitle>OpenSim</AssemblyTitle>
<Company>http://opensimulator.org</Company>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Reference Include="Nini">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.ClientStack.LindenCaps</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.ClientStack.LindenUDP</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Reference Include="Nini">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Reference Include="Nini">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.CoreModules</AssemblyTitle>
<Product>OpenSim.Region.CoreModules.Properties</Product>
<Description>Core modules for OpenSim</Description>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Reference Include="Nini">
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Region/Framework/OpenSim.Region.Framework.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.Framework</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.OptionalModules</AssemblyTitle>
<Product>OpenSim.Region.OptionalModules.Properties</Product>
<Description>Optional modules for OpenSim</Description>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.PhysicsModule.BasicPhysics</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.PhysicsModule.BulletS</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.15" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet</AssemblyTitle>
<Company>Intel Corporation</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.PhysicsModule.Meshing</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.PhysicsModule.Ode</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.15" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.PhysicsModule.POS</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.PhysicsModules.SharedBase</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.PhysicsModule.ubOde</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>ubOde</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.PhysicsModule.ubODEMeshing</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Reference Include="Nini">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.ScriptEngine.Shared.Api</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
Expand Down
Loading

0 comments on commit f43ce8f

Please sign in to comment.