Skip to content

Commit 0b87e9e

Browse files
committed
Changed how projects are referenced
1 parent d844d40 commit 0b87e9e

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

src/Unity.Interception.csproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,18 @@
6363
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
6464
<TargetFramework>net47</TargetFramework>
6565
</PropertyGroup>
66+
6667

67-
<ItemGroup Condition="'$(Configuration)'!='Release'">
68-
<ProjectReference Include="..\..\Abstractions\src\Unity.Abstractions.csproj" />
68+
<PropertyGroup>
69+
<UnityAbstractions>$(SolutionDir)\Abstractions\src\Unity.Abstractions.csproj</UnityAbstractions>
70+
</PropertyGroup>
71+
72+
<ItemGroup Condition="Exists('$(UnityAbstractions)')">
73+
<ProjectReference Include="$(UnityAbstractions)" />
6974
</ItemGroup>
7075

71-
<ItemGroup Condition=" '$(Configuration)' == 'Release' ">
76+
<ItemGroup Condition="!Exists('$(UnityAbstractions)')">
7277
<PackageReference Include="Unity.Abstractions" Version="2.0.1" />
7378
</ItemGroup>
7479

75-
7680
</Project>

tests/Interception.Tests.csproj

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,26 @@
1515
<ItemGroup>
1616
<ProjectReference Include="..\src\Unity.Interception.csproj" />
1717
</ItemGroup>
18+
19+
20+
<PropertyGroup>
21+
<UnityAbstractions>$(SolutionDir)\Abstractions\src\Unity.Abstractions.csproj</UnityAbstractions>
22+
<UnityContainer>$(SolutionDir)\Container\src\Unity.Container.csproj</UnityContainer>
23+
</PropertyGroup>
1824

25+
<ItemGroup Condition="Exists('$(UnityAbstractions)')">
26+
<ProjectReference Include="$(UnityAbstractions)" />
27+
</ItemGroup>
1928

20-
<ItemGroup Condition=" '$(Configuration)' != 'Release' ">
21-
<ProjectReference Include="..\..\Abstractions\src\Unity.Abstractions.csproj" />
22-
<ProjectReference Include="..\..\Container\src\Unity.Container.csproj" />
23-
</ItemGroup>
29+
<ItemGroup Condition="Exists('$(UnityContainer)')">
30+
<ProjectReference Include="$(UnityContainer)" />
31+
</ItemGroup>
2432

25-
<ItemGroup Condition=" '$(Configuration)' == 'Release' ">
33+
<ItemGroup Condition="!Exists('$(UnityAbstractions)')">
2634
<PackageReference Include="Unity.Abstractions" Version="2.0.1" />
35+
</ItemGroup>
36+
37+
<ItemGroup Condition="!Exists('$(UnityContainer)')">
2738
<PackageReference Include="Unity.Container" Version="5.0.0" />
2839
</ItemGroup>
2940

0 commit comments

Comments
 (0)