Skip to content

Commit 4ab5d14

Browse files
committed
fix plugin compiler errors
1 parent a10f89e commit 4ab5d14

File tree

248 files changed

+806
-702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+806
-702
lines changed

Common.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
<PropertyGroup>
44
<Configurations>Debug;Release;DebugTests;DebugFull;DebugPlugins</Configurations>
55
<Platforms>AnyCPU</Platforms>
6+
<IntersectConfiguration>$(Configuration)</IntersectConfiguration>
7+
<IntersectConfiguration Condition="$(IntersectConfiguration.StartsWith('Debug'))">Debug</IntersectConfiguration>
68
</PropertyGroup>
79

8-
<PropertyGroup Condition="$(Configuration.StartsWith('Debug'))">
10+
<PropertyGroup Condition="'$(IntersectConfiguration)' == 'Debug'">
911
<ImplicitConfigurationDefine>DEBUG</ImplicitConfigurationDefine>
1012
<ConfigurationName>Debug</ConfigurationName>
1113
<Configuration>Debug</Configuration>

Directory.Build.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
16-
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
17-
<NetworkKeyOutputDir>$(IntersectRepoPath)\Intersect.Network\bin\$(Configuration)\keys</NetworkKeyOutputDir>
16+
<NetworkKeyOutputDir>$(IntersectRepoPath)\Intersect.Network\bin\$(IntersectConfiguration)\keys</NetworkKeyOutputDir>
1817
<NetworkHandshakePublicKey>$(NetworkKeyOutputDir)\network.handshake.bkey.pub</NetworkHandshakePublicKey>
1918
<NetworkHandshakePrivateKey>$(NetworkKeyOutputDir)\network.handshake.bkey</NetworkHandshakePrivateKey>
2019
</PropertyGroup>

Examples/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22

3-
<Import Project=".\Plugin.Common.props" />
3+
<Import Project=".\Plugin.Common.props"/>
44

55
<PropertyGroup Condition="'$(IntersectDeveloperTargetsImported)' == ''">
66
<IntersectRepoPath>$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\..\..'))</IntersectRepoPath>

Examples/Intersect.Examples.Plugin.Client.Tests/Intersect.Examples.Plugin.Client.Tests.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="..\Intersect.Examples.Plugin.Client\Intersect.Examples.Plugin.Client.csproj" />
11+
<ProjectReference Include="..\..\Intersect (Core)\Intersect.Core.csproj"/>
12+
<ProjectReference Include="..\Intersect.Examples.Plugin.Client\Intersect.Examples.Plugin.Client.csproj"/>
1213
</ItemGroup>
1314

1415
<ItemGroup>
15-
<PackageReference Include="NUnit" Version="3.12.0" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
16+
<PackageReference Include="NUnit" Version="3.12.0"/>
17+
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0"/>
1718
</ItemGroup>
1819

1920
</Project>
Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
// NUnit 3 tests
2-
// See documentation : https://github.com/nunit/docs/wiki/NUnit-Documentation
3-
using Intersect.Plugins.Loaders;
1+
using Intersect.Plugins.Loaders;
42
using NUnit.Framework;
53

6-
namespace Intersect.Examples.Plugin.Client
4+
namespace Intersect.Examples.Plugin.Client.Tests;
5+
6+
[TestFixture]
7+
public class ManifestTest
78
{
8-
[TestFixture]
9-
public class ManifestTest
9+
[Test]
10+
public void TestManifestDetection()
1011
{
11-
[Test]
12-
public void TestManifestDetection()
13-
{
14-
var manifestType = typeof(Manifest);
15-
var pluginAssembly = manifestType.Assembly;
16-
var manifest = ManifestLoader.FindManifest(pluginAssembly);
17-
Assert.NotNull(manifestType);
18-
Assert.IsInstanceOf(manifestType, manifest);
19-
}
12+
var manifestType = typeof(Manifest);
13+
var pluginAssembly = manifestType.Assembly;
14+
var manifest = ManifestLoader.FindManifest(pluginAssembly);
15+
Assert.NotNull(manifestType);
16+
Assert.IsInstanceOf(manifestType, manifest);
2017
}
21-
}
18+
}

0 commit comments

Comments
 (0)