Skip to content

Commit 47803ab

Browse files
mrdav30mrdav30
committed
Merge branch 'main' into develop
2 parents e3a1ef2 + 51f4fe2 commit 47803ab

5 files changed

Lines changed: 7 additions & 37 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.vs/
22
UnityPackages/
33
FMS_UnityProject/
4+
src/FixedMathSharp/FixedMathSharp.csproj.user

‎FixedMathSharp.sln‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,24 @@ Global
1919
DebugUnity|Any CPU = DebugUnity|Any CPU
2020
Release|Any CPU = Release|Any CPU
2121
ReleaseUnity|Any CPU = ReleaseUnity|Any CPU
22-
DebugNet8|Any CPU = DebugNet8|Any CPU
23-
ReleaseNet8|Any CPU = ReleaseNet8|Any CPU
2422
EndGlobalSection
2523
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2624
{61834921-141D-4BD5-9E75-31188DF32E93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2725
{61834921-141D-4BD5-9E75-31188DF32E93}.Debug|Any CPU.Build.0 = Debug|Any CPU
2826
{61834921-141D-4BD5-9E75-31188DF32E93}.DebugUnity|Any CPU.ActiveCfg = DebugUnity|Any CPU
2927
{61834921-141D-4BD5-9E75-31188DF32E93}.DebugUnity|Any CPU.Build.0 = DebugUnity|Any CPU
30-
{61834921-141D-4BD5-9E75-31188DF32E93}.DebugNet8|Any CPU.ActiveCfg = DebugNet8|Any CPU
31-
{61834921-141D-4BD5-9E75-31188DF32E93}.DebugNet8|Any CPU.Build.0 = DebugNet8|Any CPU
3228
{61834921-141D-4BD5-9E75-31188DF32E93}.Release|Any CPU.ActiveCfg = Release|Any CPU
3329
{61834921-141D-4BD5-9E75-31188DF32E93}.Release|Any CPU.Build.0 = Release|Any CPU
3430
{61834921-141D-4BD5-9E75-31188DF32E93}.ReleaseUnity|Any CPU.ActiveCfg = ReleaseUnity|Any CPU
3531
{61834921-141D-4BD5-9E75-31188DF32E93}.ReleaseUnity|Any CPU.Build.0 = ReleaseUnity|Any CPU
36-
{61834921-141D-4BD5-9E75-31188DF32E93}.ReleaseNet8|Any CPU.ActiveCfg = ReleaseNet8|Any CPU
37-
{61834921-141D-4BD5-9E75-31188DF32E93}.ReleaseNet8|Any CPU.Build.0 = ReleaseNet8|Any CPU
3832
{86CD72E6-2A40-494C-9D9B-A38EF90A12A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3933
{86CD72E6-2A40-494C-9D9B-A38EF90A12A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
4034
{86CD72E6-2A40-494C-9D9B-A38EF90A12A8}.DebugUnity|Any CPU.ActiveCfg = DebugUnity|Any CPU
4135
{86CD72E6-2A40-494C-9D9B-A38EF90A12A8}.DebugUnity|Any CPU.Build.0 = DebugUnity|Any CPU
42-
{86CD72E6-2A40-494C-9D9B-A38EF90A12A8}.DebugNet8|Any CPU.ActiveCfg = DebugNet8|Any CPU
43-
{86CD72E6-2A40-494C-9D9B-A38EF90A12A8}.DebugNet8|Any CPU.Build.0 = DebugNet8|Any CPU
4436
{86CD72E6-2A40-494C-9D9B-A38EF90A12A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
4537
{86CD72E6-2A40-494C-9D9B-A38EF90A12A8}.Release|Any CPU.Build.0 = Release|Any CPU
4638
{86CD72E6-2A40-494C-9D9B-A38EF90A12A8}.ReleaseUnity|Any CPU.ActiveCfg = ReleaseUnity|Any CPU
4739
{86CD72E6-2A40-494C-9D9B-A38EF90A12A8}.ReleaseUnity|Any CPU.Build.0 = ReleaseUnity|Any CPU
48-
{86CD72E6-2A40-494C-9D9B-A38EF90A12A8}.ReleaseNet8|Any CPU.ActiveCfg = ReleaseNet8|Any CPU
49-
{86CD72E6-2A40-494C-9D9B-A38EF90A12A8}.ReleaseNet8|Any CPU.Build.0 = ReleaseNet8|Any CPU
5040
EndGlobalSection
5141
GlobalSection(SolutionProperties) = preSolution
5242
HideSolutionNode = FALSE

‎src/FixedMathSharp/FixedMathSharp.csproj‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<!-- Define the target framework and compatibility -->
55
<LangVersion>9.0</LangVersion>
6-
<TargetFramework>net48</TargetFramework>
6+
<TargetFrameworks>net48;net8</TargetFrameworks>
77
<!-- Versioning and Build Configuration -->
88
<!-- Set SemVer to GitVersion_FullSemVer if available, otherwise fallback to 0.0.0 -->
99
<SemVer Condition="'$(GitVersion_FullSemVer)' != ''">$(GitVersion_FullSemVer)</SemVer>
@@ -28,11 +28,12 @@
2828
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2929
<NoWarn>1591</NoWarn>
3030
<!-- Optional: Suppress warnings about missing XML comments -->
31+
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\FixedMathSharp.xml</DocumentationFile>
3132
<!-- Configuration to ensure deterministic builds -->
3233
<Deterministic>true</Deterministic>
3334
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
3435
<UnityBuild>false</UnityBuild>
35-
<Configurations>Debug;Release;DebugUnity;ReleaseUnity;DebugNet8;ReleaseNet8</Configurations>
36+
<Configurations>Debug;Release;DebugUnity;ReleaseUnity</Configurations>
3637
</PropertyGroup>
3738
<!-- Debug and Release-specific Properties -->
3839
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -48,13 +49,6 @@
4849
<DefineConstants>DEBUG;TRACE;UNITY_EDITOR</DefineConstants>
4950
<UnityBuild>true</UnityBuild>
5051
</PropertyGroup>
51-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugNet8|AnyCPU'">
52-
<TargetFramework>net8</TargetFramework>
53-
<DebugSymbols>true</DebugSymbols>
54-
<DebugType>full</DebugType>
55-
<Optimize>false</Optimize>
56-
<DefineConstants>DEBUG;TRACE</DefineConstants>
57-
</PropertyGroup>
5852
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5953
<Optimize>true</Optimize>
6054
<DefineConstants>TRACE</DefineConstants>
@@ -64,14 +58,6 @@
6458
<DefineConstants>TRACE;UNITY_EDITOR</DefineConstants>
6559
<UnityBuild>true</UnityBuild>
6660
</PropertyGroup>
67-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNet8|AnyCPU'">
68-
<TargetFramework>net8</TargetFramework>
69-
<Optimize>true</Optimize>
70-
<DefineConstants>TRACE</DefineConstants>
71-
</PropertyGroup>
72-
<PropertyGroup>
73-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\FixedMathSharp.xml</DocumentationFile>
74-
</PropertyGroup>
7561
<!-- NuGet Packaging Metadata -->
7662
<PropertyGroup>
7763
<PackageId>FixedMathSharp</PackageId>
@@ -137,7 +123,7 @@
137123
<Private>false</Private>
138124
<PrivateAssets>all</PrivateAssets>
139125
</Reference>
140-
<PackageReference Condition="'$(TargetFramework)' == 'net48'" Include="Microsoft.NETFramework.ReferenceAssemblies.net48" Version="1.0.3">
126+
<PackageReference Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" Include="Microsoft.NETFramework.ReferenceAssemblies.net48" Version="1.0.3">
141127
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
142128
<PrivateAssets>all</PrivateAssets>
143129
</PackageReference>

‎tests/FixedMathSharp.Tests/Fixed3x3.Tests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#if NET8_0_OR_GREATER
77
using System.Text.Json;
88
using System.Text.Json.Serialization;
9-
109
#endif
1110

1211
using Xunit;

‎tests/FixedMathSharp.Tests/FixedMathSharp.Tests.csproj‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<LangVersion>9.0</LangVersion>
4-
<TargetFramework>net48</TargetFramework>
4+
<TargetFrameworks>net48;net8</TargetFrameworks>
55
<ImplicitUsings>disable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
88
<IsTestProject>true</IsTestProject>
9-
<Configurations>Debug;Release;DebugUnity;ReleaseUnity;DebugNet8;ReleaseNet8</Configurations>
10-
</PropertyGroup>
11-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugNet8|AnyCPU'">
12-
<TargetFramework>net8</TargetFramework>
13-
</PropertyGroup>
14-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNet8|AnyCPU'">
15-
<TargetFramework>net8</TargetFramework>
9+
<Configurations>Debug;Release;DebugUnity;ReleaseUnity</Configurations>
1610
</PropertyGroup>
1711
<ItemGroup>
1812
<ProjectReference Include="..\..\src\FixedMathSharp\FixedMathSharp.csproj">

0 commit comments

Comments
 (0)