Skip to content

Commit 723aa60

Browse files
pandinocoderpandinocoder
committed
extra configurations for tests and plugins
1 parent dfab2d6 commit 723aa60

File tree

9 files changed

+291
-24
lines changed

9 files changed

+291
-24
lines changed

‎Common.props‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<Configurations>Debug;Release;DebugTests;DebugFull;DebugPlugins</Configurations>
5+
<Platforms>AnyCPU</Platforms>
6+
</PropertyGroup>
7+
8+
<PropertyGroup Condition="$(Configuration.StartsWith('Debug'))">
9+
<ImplicitConfigurationDefine>DEBUG</ImplicitConfigurationDefine>
10+
<ConfigurationName>Debug</ConfigurationName>
11+
<Configuration>Debug</Configuration>
12+
<DefineConstants Condition="'$(DefineConstants)' != ''">$(DefineConstants);</DefineConstants>
13+
<DefineConstants>$(DefineConstants)DEBUG</DefineConstants>
14+
<DebugSymbols Condition=" '$(DebugSymbols)' == '' ">true</DebugSymbols>
15+
<Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
16+
<OutputPath>bin/Debug/</OutputPath>
17+
<IntermediateOutputPath>obj/Debug/</IntermediateOutputPath>
18+
</PropertyGroup>
19+
20+
<PropertyGroup Label="Language Properties">
21+
<Deterministic>true</Deterministic>
22+
<ImplicitUsings>enable</ImplicitUsings>
23+
<LangVersion>latest</LangVersion>
24+
<Nullable>enable</Nullable>
25+
<RuntimeIdentifiers>linux-arm64;linux-x64;osx-arm64;osx-x64;win-x64</RuntimeIdentifiers>
26+
<TargetFramework>net8.0</TargetFramework>
27+
</PropertyGroup>
28+
29+
</Project>

‎Directory.Build.props‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<IntersectRepoPath Condition="'$(IntersectRepoPath)' == ''">$(MSBuildProjectDirectory)\..</IntersectRepoPath>
55
</PropertyGroup>
66

7+
<Import Project=".\Common.props" />
8+
79
<Import Project=".\Intersect.props" />
810

911
<PropertyGroup>
@@ -17,13 +19,4 @@
1719
<NetworkHandshakePrivateKey>$(NetworkKeyOutputDir)\network.handshake.bkey</NetworkHandshakePrivateKey>
1820
</PropertyGroup>
1921

20-
<PropertyGroup Label="Language Properties">
21-
<Deterministic>true</Deterministic>
22-
<ImplicitUsings>enable</ImplicitUsings>
23-
<LangVersion>latest</LangVersion>
24-
<Nullable>enable</Nullable>
25-
<RuntimeIdentifiers>linux-arm64;linux-x64;osx-arm64;osx-x64;win-x64</RuntimeIdentifiers>
26-
<TargetFramework>net8.0</TargetFramework>
27-
</PropertyGroup>
28-
2922
</Project>

‎Examples/Plugin.Common.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<Import Project="../Common.props" />
4+
25
<PropertyGroup>
36
<ExcludedIntersectDependencies>
47
**/Ceras.*;

‎Framework/Directory.Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project>
22

3+
<Import Project="../Common.props" />
4+
35
<PropertyGroup>
46
<IntersectRepoPath Condition="'$(IntersectRepoPath)' == ''">$(MSBuildProjectDirectory)\..\..</IntersectRepoPath>
57
</PropertyGroup>

‎Intersect.Client/Intersect.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>WinExe</OutputType>
55
</PropertyGroup>
66

7-
<PropertyGroup Condition="$(Configuration) != 'Debug'">
7+
<PropertyGroup Condition="$(Configuration.StartsWith('Debug')) != 'true'">
88
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
99
<PublishSingleFile>true</PublishSingleFile>
1010
<SelfContained>true</SelfContained>

‎Intersect.Server/Intersect.Server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

8-
<PropertyGroup Condition="$(Configuration) != 'Debug'">
8+
<PropertyGroup Condition="$(Configuration.StartsWith('Debug')) != 'true'">
99
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
1010
<PublishSingleFile>true</PublishSingleFile>
1111
<SelfContained>true</SelfContained>

‎Intersect.sln‎

Lines changed: 192 additions & 0 deletions
Large diffs are not rendered by default.

‎Utilities/Intersect.OpenPortChecker/Intersect.OpenPortChecker.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<TrimMode>partial</TrimMode>
77
</PropertyGroup>
88

9-
<PropertyGroup Condition="$(Configuration) != 'Debug'">
9+
<PropertyGroup Condition="$(Configuration.StartsWith('Debug')) != 'true'">
1010
<PublishSingleFile>true</PublishSingleFile>
1111
<SelfContained>true</SelfContained>
1212
</PropertyGroup>

‎disable-windows-only.patch‎

Lines changed: 60 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/Intersect.sln b/Intersect.sln
2-
index 80471f382..0aa36a346 100644
2+
index 584f6aabf..82c59e42f 100644
33
--- a/Intersect.sln
44
+++ b/Intersect.sln
55
@@ -80,14 +80,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intersect.SinglePlayer", "I
@@ -22,45 +22,93 @@ index 80471f382..0aa36a346 100644
2222
+#EndProject
2323
+#Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intersect.Tests.Editor", "Intersect.Tests.Editor\Intersect.Tests.Editor.csproj", "{3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}"
2424
+#EndProject
25-
Global
26-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
27-
Debug|Any CPU = Debug|Any CPU
28-
@@ -148,20 +148,20 @@ Global
29-
{999025E8-C034-4A91-8166-5C2D95E9C9C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
30-
{999025E8-C034-4A91-8166-5C2D95E9C9C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{999025E8-C034-4A91-8166-5C2D95E9C9C3}.Release|Any CPU.Build.0 = Release|Any CPU
25+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{69F06A61-5BD8-4D11-90D0-DE9AEAD2D09A}"
26+
EndProject
27+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Intersect.Examples.Plugin", "Examples\Intersect.Examples.Plugin\Intersect.Examples.Plugin.csproj", "{3F994F9D-ADAE-4F79-8FF6-3D7523EE9315}"
28+
@@ -259,44 +259,44 @@ Global
29+
{999025E8-C034-4A91-8166-5C2D95E9C9C3}.DebugFull|Any CPU.Build.0 = DebugFull|Any CPU
30+
{999025E8-C034-4A91-8166-5C2D95E9C9C3}.DebugPlugins|Any CPU.ActiveCfg = DebugPlugins|Any CPU
31+
{999025E8-C034-4A91-8166-5C2D95E9C9C3}.DebugPlugins|Any CPU.Build.0 = DebugPlugins|Any CPU
3232
- {5AC53DF1-8152-466D-B7D0-238657F013F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3333
- {5AC53DF1-8152-466D-B7D0-238657F013F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
3434
- {5AC53DF1-8152-466D-B7D0-238657F013F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
3535
- {5AC53DF1-8152-466D-B7D0-238657F013F7}.Release|Any CPU.Build.0 = Release|Any CPU
36+
- {5AC53DF1-8152-466D-B7D0-238657F013F7}.DebugTests|Any CPU.ActiveCfg = DebugTests|Any CPU
37+
- {5AC53DF1-8152-466D-B7D0-238657F013F7}.DebugTests|Any CPU.Build.0 = DebugTests|Any CPU
38+
- {5AC53DF1-8152-466D-B7D0-238657F013F7}.DebugFull|Any CPU.ActiveCfg = DebugFull|Any CPU
39+
- {5AC53DF1-8152-466D-B7D0-238657F013F7}.DebugFull|Any CPU.Build.0 = DebugFull|Any CPU
40+
- {5AC53DF1-8152-466D-B7D0-238657F013F7}.DebugPlugins|Any CPU.ActiveCfg = DebugPlugins|Any CPU
41+
- {5AC53DF1-8152-466D-B7D0-238657F013F7}.DebugPlugins|Any CPU.Build.0 = DebugPlugins|Any CPU
3642
- {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3743
- {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
- {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.DebugTests|Any CPU.ActiveCfg = DebugTests|Any CPU
45+
- {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.DebugTests|Any CPU.Build.0 = DebugTests|Any CPU
46+
- {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.DebugFull|Any CPU.ActiveCfg = DebugFull|Any CPU
47+
- {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.DebugFull|Any CPU.Build.0 = DebugFull|Any CPU
48+
- {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.DebugPlugins|Any CPU.ActiveCfg = DebugPlugins|Any CPU
49+
- {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.DebugPlugins|Any CPU.Build.0 = DebugPlugins|Any CPU
3850
- {D831728A-6328-4F96-9692-8FE64E0B0AAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3951
- {D831728A-6328-4F96-9692-8FE64E0B0AAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
4052
- {D831728A-6328-4F96-9692-8FE64E0B0AAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
4153
- {D831728A-6328-4F96-9692-8FE64E0B0AAD}.Release|Any CPU.Build.0 = Release|Any CPU
54+
- {D831728A-6328-4F96-9692-8FE64E0B0AAD}.DebugTests|Any CPU.ActiveCfg = DebugTests|Any CPU
55+
- {D831728A-6328-4F96-9692-8FE64E0B0AAD}.DebugTests|Any CPU.Build.0 = DebugTests|Any CPU
56+
- {D831728A-6328-4F96-9692-8FE64E0B0AAD}.DebugFull|Any CPU.ActiveCfg = DebugFull|Any CPU
57+
- {D831728A-6328-4F96-9692-8FE64E0B0AAD}.DebugFull|Any CPU.Build.0 = DebugFull|Any CPU
58+
- {D831728A-6328-4F96-9692-8FE64E0B0AAD}.DebugPlugins|Any CPU.ActiveCfg = DebugPlugins|Any CPU
59+
- {D831728A-6328-4F96-9692-8FE64E0B0AAD}.DebugPlugins|Any CPU.Build.0 = DebugPlugins|Any CPU
4260
- {B9678B78-A00D-4765-9380-B1DC4EFD642D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4361
- {B9678B78-A00D-4765-9380-B1DC4EFD642D}.Debug|Any CPU.Build.0 = Debug|Any CPU
4462
- {B9678B78-A00D-4765-9380-B1DC4EFD642D}.Release|Any CPU.ActiveCfg = Release|Any CPU
4563
- {B9678B78-A00D-4765-9380-B1DC4EFD642D}.Release|Any CPU.Build.0 = Release|Any CPU
64+
- {B9678B78-A00D-4765-9380-B1DC4EFD642D}.DebugTests|Any CPU.ActiveCfg = DebugTests|Any CPU
65+
- {B9678B78-A00D-4765-9380-B1DC4EFD642D}.DebugTests|Any CPU.Build.0 = DebugTests|Any CPU
66+
- {B9678B78-A00D-4765-9380-B1DC4EFD642D}.DebugFull|Any CPU.ActiveCfg = DebugFull|Any CPU
67+
- {B9678B78-A00D-4765-9380-B1DC4EFD642D}.DebugFull|Any CPU.Build.0 = DebugFull|Any CPU
68+
- {B9678B78-A00D-4765-9380-B1DC4EFD642D}.DebugPlugins|Any CPU.ActiveCfg = DebugPlugins|Any CPU
69+
- {B9678B78-A00D-4765-9380-B1DC4EFD642D}.DebugPlugins|Any CPU.Build.0 = DebugPlugins|Any CPU
4670
+# {5AC53DF1-8152-466D-B7D0-238657F013F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4771
+# {5AC53DF1-8152-466D-B7D0-238657F013F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
4872
+# {5AC53DF1-8152-466D-B7D0-238657F013F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
4973
+# {5AC53DF1-8152-466D-B7D0-238657F013F7}.Release|Any CPU.Build.0 = Release|Any CPU
74+
+# {5AC53DF1-8152-466D-B7D0-238657F013F7}.DebugTests|Any CPU.ActiveCfg = DebugTests|Any CPU
75+
+# {5AC53DF1-8152-466D-B7D0-238657F013F7}.DebugTests|Any CPU.Build.0 = DebugTests|Any CPU
76+
+# {5AC53DF1-8152-466D-B7D0-238657F013F7}.DebugFull|Any CPU.ActiveCfg = DebugFull|Any CPU
77+
+# {5AC53DF1-8152-466D-B7D0-238657F013F7}.DebugFull|Any CPU.Build.0 = DebugFull|Any CPU
78+
+# {5AC53DF1-8152-466D-B7D0-238657F013F7}.DebugPlugins|Any CPU.ActiveCfg = DebugPlugins|Any CPU
79+
+# {5AC53DF1-8152-466D-B7D0-238657F013F7}.DebugPlugins|Any CPU.Build.0 = DebugPlugins|Any CPU
5080
+# {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5181
+# {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
82+
+# {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.DebugTests|Any CPU.ActiveCfg = DebugTests|Any CPU
83+
+# {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.DebugTests|Any CPU.Build.0 = DebugTests|Any CPU
84+
+# {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.DebugFull|Any CPU.ActiveCfg = DebugFull|Any CPU
85+
+# {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.DebugFull|Any CPU.Build.0 = DebugFull|Any CPU
86+
+# {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.DebugPlugins|Any CPU.ActiveCfg = DebugPlugins|Any CPU
87+
+# {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D}.DebugPlugins|Any CPU.Build.0 = DebugPlugins|Any CPU
5288
+# {D831728A-6328-4F96-9692-8FE64E0B0AAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5389
+# {D831728A-6328-4F96-9692-8FE64E0B0AAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
5490
+# {D831728A-6328-4F96-9692-8FE64E0B0AAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
5591
+# {D831728A-6328-4F96-9692-8FE64E0B0AAD}.Release|Any CPU.Build.0 = Release|Any CPU
92+
+# {D831728A-6328-4F96-9692-8FE64E0B0AAD}.DebugTests|Any CPU.ActiveCfg = DebugTests|Any CPU
93+
+# {D831728A-6328-4F96-9692-8FE64E0B0AAD}.DebugTests|Any CPU.Build.0 = DebugTests|Any CPU
94+
+# {D831728A-6328-4F96-9692-8FE64E0B0AAD}.DebugFull|Any CPU.ActiveCfg = DebugFull|Any CPU
95+
+# {D831728A-6328-4F96-9692-8FE64E0B0AAD}.DebugFull|Any CPU.Build.0 = DebugFull|Any CPU
96+
+# {D831728A-6328-4F96-9692-8FE64E0B0AAD}.DebugPlugins|Any CPU.ActiveCfg = DebugPlugins|Any CPU
97+
+# {D831728A-6328-4F96-9692-8FE64E0B0AAD}.DebugPlugins|Any CPU.Build.0 = DebugPlugins|Any CPU
5698
+# {B9678B78-A00D-4765-9380-B1DC4EFD642D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5799
+# {B9678B78-A00D-4765-9380-B1DC4EFD642D}.Debug|Any CPU.Build.0 = Debug|Any CPU
58100
+# {B9678B78-A00D-4765-9380-B1DC4EFD642D}.Release|Any CPU.ActiveCfg = Release|Any CPU
59101
+# {B9678B78-A00D-4765-9380-B1DC4EFD642D}.Release|Any CPU.Build.0 = Release|Any CPU
102+
+# {B9678B78-A00D-4765-9380-B1DC4EFD642D}.DebugTests|Any CPU.ActiveCfg = DebugTests|Any CPU
103+
+# {B9678B78-A00D-4765-9380-B1DC4EFD642D}.DebugTests|Any CPU.Build.0 = DebugTests|Any CPU
104+
+# {B9678B78-A00D-4765-9380-B1DC4EFD642D}.DebugFull|Any CPU.ActiveCfg = DebugFull|Any CPU
105+
+# {B9678B78-A00D-4765-9380-B1DC4EFD642D}.DebugFull|Any CPU.Build.0 = DebugFull|Any CPU
106+
+# {B9678B78-A00D-4765-9380-B1DC4EFD642D}.DebugPlugins|Any CPU.ActiveCfg = DebugPlugins|Any CPU
107+
+# {B9678B78-A00D-4765-9380-B1DC4EFD642D}.DebugPlugins|Any CPU.Build.0 = DebugPlugins|Any CPU
60108
{1E87D2A5-7E36-4583-A533-064C97E330EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
61109
{1E87D2A5-7E36-4583-A533-064C97E330EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
62110
{1E87D2A5-7E36-4583-A533-064C97E330EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
63-
@@ -186,9 +186,9 @@ Global
111+
@@ -373,9 +373,9 @@ Global
64112
{1E87D2A5-7E36-4583-A533-064C97E330EE} = {1ABC3725-EB8C-494E-8BA8-A991CE7BD7A1}
65113
{CD824F78-E469-496D-9DB6-0B0F0A24E5BF} = {1ABC3725-EB8C-494E-8BA8-A991CE7BD7A1}
66114
{999025E8-C034-4A91-8166-5C2D95E9C9C3} = {F990372C-0580-4D69-89DC-A46A86396BBD}
@@ -70,6 +118,6 @@ index 80471f382..0aa36a346 100644
70118
+# {3E8FC79E-D0B3-4554-9ABD-BD6DCBFBEE5D} = {91D46B09-C92B-450B-AEC2-C7A6EE0F8E3B}
71119
+# {D831728A-6328-4F96-9692-8FE64E0B0AAD} = {31380BF9-EC1C-4ABE-8A1A-A715B6DF024A}
72120
+# {B9678B78-A00D-4765-9380-B1DC4EFD642D} = {31380BF9-EC1C-4ABE-8A1A-A715B6DF024A}
73-
EndGlobalSection
74-
GlobalSection(ExtensibilityGlobals) = postSolution
75-
SolutionGuid = {06095334-0BBD-4FDA-A230-272D08AFB221}
121+
{3F994F9D-ADAE-4F79-8FF6-3D7523EE9315} = {69F06A61-5BD8-4D11-90D0-DE9AEAD2D09A}
122+
{792D9894-6092-4412-BCD0-7BA64A6B7A87} = {69F06A61-5BD8-4D11-90D0-DE9AEAD2D09A}
123+
{FC255E92-4E35-4E2C-A7F0-638B06096E67} = {69F06A61-5BD8-4D11-90D0-DE9AEAD2D09A}

0 commit comments

Comments
 (0)