From 232ee120f1d2e12dcbfdae198237bc2f5cbdd3a1 Mon Sep 17 00:00:00 2001 From: Kapitan Mliko <3914266+kapitanmliko@users.noreply.github.com> Date: Mon, 22 May 2023 18:52:27 +0200 Subject: [PATCH 1/5] Correctly setting MSBuild BaseIntermediateOutputPath project property --- DarkRift.Client/DarkRift.Client.csproj | 7 +------ .../DarkRift.Server.Console.csproj | 5 ----- .../DarkRift.Server.Testing.csproj | 5 ----- DarkRift.Server/DarkRift.Server.csproj | 7 +------ .../DarkRift.SystemTesting.csproj | 5 ----- DarkRift.Testing/DarkRift.Testing.csproj | 5 ----- DarkRift/DarkRift.csproj | 11 +++-------- .../Dispatching/FunctionDispatcherTask.cs | 2 +- DarkRift2.sln | 1 + Directory.Build.props | 19 +++++++++++++++++++ 10 files changed, 26 insertions(+), 41 deletions(-) create mode 100644 Directory.Build.props diff --git a/DarkRift.Client/DarkRift.Client.csproj b/DarkRift.Client/DarkRift.Client.csproj index 9f87da8..2b85688 100644 --- a/DarkRift.Client/DarkRift.Client.csproj +++ b/DarkRift.Client/DarkRift.Client.csproj @@ -1,16 +1,11 @@  - - - net3.5;netstandard2.0 netstandard2.0 $(OutDir)\$(Configuration)\$(TargetFramework)\DarkRift.Client.xml Debug;Release true - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\ - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\ - true + true diff --git a/DarkRift.Server.Console/DarkRift.Server.Console.csproj b/DarkRift.Server.Console/DarkRift.Server.Console.csproj index 8acf2ee..e8ed017 100644 --- a/DarkRift.Server.Console/DarkRift.Server.Console.csproj +++ b/DarkRift.Server.Console/DarkRift.Server.Console.csproj @@ -1,7 +1,4 @@  - - - net4.0;netcoreapp2.0;netcoreapp3.1;net5.0;net6.0 netcoreapp2.0;netcoreapp3.1;net5.0;net6.0 @@ -14,8 +11,6 @@ false - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\ - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\ diff --git a/DarkRift.Server.Testing/DarkRift.Server.Testing.csproj b/DarkRift.Server.Testing/DarkRift.Server.Testing.csproj index c710ec9..20bbda1 100644 --- a/DarkRift.Server.Testing/DarkRift.Server.Testing.csproj +++ b/DarkRift.Server.Testing/DarkRift.Server.Testing.csproj @@ -1,7 +1,4 @@  - - - net4.5;net6.0 net6.0 @@ -9,8 +6,6 @@ true NU1701 - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\ - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\ diff --git a/DarkRift.Server/DarkRift.Server.csproj b/DarkRift.Server/DarkRift.Server.csproj index 0ff62c3..5d7e3ed 100644 --- a/DarkRift.Server/DarkRift.Server.csproj +++ b/DarkRift.Server/DarkRift.Server.csproj @@ -1,16 +1,11 @@  - - - net3.5;netstandard2.0 netstandard2.0 $(OutDir)\$(Configuration)\$(TargetFramework)\DarkRift.Server.xml Debug;Release true - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\ - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\ - true + true diff --git a/DarkRift.SystemTesting/DarkRift.SystemTesting.csproj b/DarkRift.SystemTesting/DarkRift.SystemTesting.csproj index e60fb4e..d3e9078 100644 --- a/DarkRift.SystemTesting/DarkRift.SystemTesting.csproj +++ b/DarkRift.SystemTesting/DarkRift.SystemTesting.csproj @@ -1,15 +1,10 @@  - - - net6.0 Debug;Release true true false - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\ - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\ diff --git a/DarkRift.Testing/DarkRift.Testing.csproj b/DarkRift.Testing/DarkRift.Testing.csproj index a9b6de0..ffee5e7 100644 --- a/DarkRift.Testing/DarkRift.Testing.csproj +++ b/DarkRift.Testing/DarkRift.Testing.csproj @@ -1,7 +1,4 @@  - - - net4.5;net6.0 net6.0 @@ -10,8 +7,6 @@ NU1701 false - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\ - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\ diff --git a/DarkRift/DarkRift.csproj b/DarkRift/DarkRift.csproj index 5e261d9..35f21d2 100644 --- a/DarkRift/DarkRift.csproj +++ b/DarkRift/DarkRift.csproj @@ -1,7 +1,4 @@  - - - net3.5;netstandard2.0 netstandard2.0 @@ -9,9 +6,7 @@ Debug;Release true true - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\bin\ - $(ProjectDir)..\..\unordinal\dr-build\$(MSBuildProjectName)\obj\ - true + true @@ -25,8 +20,8 @@ DEBUG;TRACE - + - + diff --git a/DarkRift/Dispatching/FunctionDispatcherTask.cs b/DarkRift/Dispatching/FunctionDispatcherTask.cs index f7ef604..6ab6970 100644 --- a/DarkRift/Dispatching/FunctionDispatcherTask.cs +++ b/DarkRift/Dispatching/FunctionDispatcherTask.cs @@ -55,7 +55,7 @@ internal override void Execute(bool synchronous) catch (Exception e) { SetTaskFailed(e); - throw new DispatcherException("An exception occurred whilst running a dispatcher task. See inner exception for more details.", e); ; + throw new DispatcherException("An exception occurred whilst running a dispatcher task. See inner exception for more details.", e); } SetTaskComplete(synchronous); diff --git a/DarkRift2.sln b/DarkRift2.sln index 2da240a..d75c52a 100644 --- a/DarkRift2.sln +++ b/DarkRift2.sln @@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .props = .props .targets = .targets bitbucket-pipelines.yml = bitbucket-pipelines.yml + Directory.Build.props = Directory.Build.props ReadMe.md = ReadMe.md DarkRift.Schemas\Server.config.xsd = DarkRift.Schemas\Server.config.xsd EndProjectSection diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..3d74df4 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,19 @@ + + + + + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), DarkRift2.sln))\ + + $(SolutionDir)..\unordinal\dr-build\$(MSBuildProjectName)\obj\ + $(SolutionDir)..\unordinal\dr-build\$(MSBuildProjectName)\obj\$(Configuration) + + + $(IntermediateOutputPath)\ + $(SolutionDir)..\unordinal\dr-build\$(MSBuildProjectName)\bin\ + + $(OutputPath) + + + + From 1771ed177540bff18ad6abd34b30654b08ba94d4 Mon Sep 17 00:00:00 2001 From: Kapitan Mliko <3914266+kapitanmliko@users.noreply.github.com> Date: Mon, 22 May 2023 18:54:37 +0200 Subject: [PATCH 2/5] Directory.Build.props cleanup --- Directory.Build.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3d74df4..52e02bd 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,11 +7,8 @@ $(SolutionDir)..\unordinal\dr-build\$(MSBuildProjectName)\obj\ $(SolutionDir)..\unordinal\dr-build\$(MSBuildProjectName)\obj\$(Configuration) - - $(IntermediateOutputPath)\ $(SolutionDir)..\unordinal\dr-build\$(MSBuildProjectName)\bin\ - $(OutputPath) From 4f9719e10856664526c7a10171b4ab6ad08eb7a7 Mon Sep 17 00:00:00 2001 From: Kapitan Mliko <3914266+kapitanmliko@users.noreply.github.com> Date: Thu, 25 May 2023 13:34:45 +0200 Subject: [PATCH 3/5] Exclude of unity .meta files from all projects. --- .props | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.props b/.props index 222c3c9..9cbb04d 100644 --- a/.props +++ b/.props @@ -10,4 +10,7 @@ Unordinal AB DarkRift Networking - High Performance Networking Library for .NET and Unity Games - \ No newline at end of file + + $(DefaultItemExcludes);*.meta + + From 91fc50f17fc64cd568e1321918f1e6aa74f42405 Mon Sep 17 00:00:00 2001 From: Kapitan Mliko <3914266+kapitanmliko@users.noreply.github.com> Date: Thu, 17 Aug 2023 13:36:54 +0200 Subject: [PATCH 4/5] .props - defaultitemexcludes meta files fix. now also excludes asmdef files. --- .props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.props b/.props index 9cbb04d..13314f6 100644 --- a/.props +++ b/.props @@ -11,6 +11,6 @@ DarkRift Networking - High Performance Networking Library for .NET and Unity Games - $(DefaultItemExcludes);*.meta + $(DefaultItemExcludes);**/*.meta;**/*.asmdef From 1fde95431cc0c5fd6bb71824782f2a79b2b6d7f1 Mon Sep 17 00:00:00 2001 From: Kapitan Mliko <3914266+kapitanmliko@users.noreply.github.com> Date: Thu, 17 Aug 2023 14:07:39 +0200 Subject: [PATCH 5/5] fixed msbuild glob pattern to exclude unity meta files --- .props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.props b/.props index 9cbb04d..10dfcd5 100644 --- a/.props +++ b/.props @@ -11,6 +11,6 @@ DarkRift Networking - High Performance Networking Library for .NET and Unity Games - $(DefaultItemExcludes);*.meta + $(DefaultItemExcludes);**/*.meta