Skip to content

Commit d47e2f0

Browse files
punker76punker76
committed
update paket dependencies
 use Costura.Fody 1.4.1 instead newer one add ControlzEx reference to Caliburn demo
1 parent 2431b50 commit d47e2f0

File tree

12 files changed

+134
-24
lines changed

12 files changed

+134
-24
lines changed

‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET40/MahApps.Metro.Caliburn.Demo.NET40.csproj‎

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,12 @@
8888
<Import Project="..\..\MahApps.Metro.Core.Demo.Shared\MahApps.Metro.Core.Demo.Shared.projitems" Label="Shared" />
8989
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9090
<Choose>
91-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
91+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
92+
<PropertyGroup>
93+
<__paket__Fody_targets>netstandard1.0\Fody</__paket__Fody_targets>
94+
</PropertyGroup>
95+
</When>
96+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3')">
9297
<PropertyGroup>
9398
<__paket__Fody_targets>portable-net+sl+win+wpa+wp\Fody</__paket__Fody_targets>
9499
</PropertyGroup>
@@ -157,11 +162,55 @@
157162
</ItemGroup>
158163
</When>
159164
</Choose>
165+
<Choose>
166+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3')">
167+
<ItemGroup>
168+
<Reference Include="ControlzEx">
169+
<HintPath>..\..\..\packages\ControlzEx\lib\net40\ControlzEx.dll</HintPath>
170+
<Private>True</Private>
171+
<Paket>True</Paket>
172+
</Reference>
173+
<Reference Include="System.Windows.Interactivity">
174+
<HintPath>..\..\..\packages\ControlzEx\lib\net40\System.Windows.Interactivity.dll</HintPath>
175+
<Private>True</Private>
176+
<Paket>True</Paket>
177+
</Reference>
178+
</ItemGroup>
179+
</When>
180+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1')">
181+
<ItemGroup>
182+
<Reference Include="ControlzEx">
183+
<HintPath>..\..\..\packages\ControlzEx\lib\net45\ControlzEx.dll</HintPath>
184+
<Private>True</Private>
185+
<Paket>True</Paket>
186+
</Reference>
187+
<Reference Include="System.Windows.Interactivity">
188+
<HintPath>..\..\..\packages\ControlzEx\lib\net45\System.Windows.Interactivity.dll</HintPath>
189+
<Private>True</Private>
190+
<Paket>True</Paket>
191+
</Reference>
192+
</ItemGroup>
193+
</When>
194+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
195+
<ItemGroup>
196+
<Reference Include="ControlzEx">
197+
<HintPath>..\..\..\packages\ControlzEx\lib\net462\ControlzEx.dll</HintPath>
198+
<Private>True</Private>
199+
<Paket>True</Paket>
200+
</Reference>
201+
<Reference Include="System.Windows.Interactivity">
202+
<HintPath>..\..\..\packages\ControlzEx\lib\net462\System.Windows.Interactivity.dll</HintPath>
203+
<Private>True</Private>
204+
<Paket>True</Paket>
205+
</Reference>
206+
</ItemGroup>
207+
</When>
208+
</Choose>
160209
<Choose>
161210
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
162211
<ItemGroup>
163212
<Reference Include="JetBrains.Annotations">
164-
<HintPath>..\..\..\packages\JetBrains.Annotations\lib\net\JetBrains.Annotations.dll</HintPath>
213+
<HintPath>..\..\..\packages\JetBrains.Annotations\lib\net20\JetBrains.Annotations.dll</HintPath>
165214
<Private>True</Private>
166215
<Paket>True</Paket>
167216
</Reference>

‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET40/paket.references‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ Microsoft.Bcl redirects: on
55
Microsoft.Bcl.Async
66
Microsoft.Bcl.Build import_targets: true
77
Caliburn.Micro
8-
Caliburn.Micro.Core
8+
Caliburn.Micro.Core
9+
ControlzEx

‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET45/MahApps.Metro.Caliburn.Demo.NET45.csproj‎

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,12 @@
9393
<Import Project="..\..\MahApps.Metro.Core.Demo.Shared\MahApps.Metro.Core.Demo.Shared.projitems" Label="Shared" />
9494
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9595
<Choose>
96-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
96+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
97+
<PropertyGroup>
98+
<__paket__Fody_targets>netstandard1.0\Fody</__paket__Fody_targets>
99+
</PropertyGroup>
100+
</When>
101+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3')">
97102
<PropertyGroup>
98103
<__paket__Fody_targets>portable-net+sl+win+wpa+wp\Fody</__paket__Fody_targets>
99104
</PropertyGroup>
@@ -162,11 +167,55 @@
162167
</ItemGroup>
163168
</When>
164169
</Choose>
170+
<Choose>
171+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3')">
172+
<ItemGroup>
173+
<Reference Include="ControlzEx">
174+
<HintPath>..\..\..\packages\ControlzEx\lib\net40\ControlzEx.dll</HintPath>
175+
<Private>True</Private>
176+
<Paket>True</Paket>
177+
</Reference>
178+
<Reference Include="System.Windows.Interactivity">
179+
<HintPath>..\..\..\packages\ControlzEx\lib\net40\System.Windows.Interactivity.dll</HintPath>
180+
<Private>True</Private>
181+
<Paket>True</Paket>
182+
</Reference>
183+
</ItemGroup>
184+
</When>
185+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1')">
186+
<ItemGroup>
187+
<Reference Include="ControlzEx">
188+
<HintPath>..\..\..\packages\ControlzEx\lib\net45\ControlzEx.dll</HintPath>
189+
<Private>True</Private>
190+
<Paket>True</Paket>
191+
</Reference>
192+
<Reference Include="System.Windows.Interactivity">
193+
<HintPath>..\..\..\packages\ControlzEx\lib\net45\System.Windows.Interactivity.dll</HintPath>
194+
<Private>True</Private>
195+
<Paket>True</Paket>
196+
</Reference>
197+
</ItemGroup>
198+
</When>
199+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
200+
<ItemGroup>
201+
<Reference Include="ControlzEx">
202+
<HintPath>..\..\..\packages\ControlzEx\lib\net462\ControlzEx.dll</HintPath>
203+
<Private>True</Private>
204+
<Paket>True</Paket>
205+
</Reference>
206+
<Reference Include="System.Windows.Interactivity">
207+
<HintPath>..\..\..\packages\ControlzEx\lib\net462\System.Windows.Interactivity.dll</HintPath>
208+
<Private>True</Private>
209+
<Paket>True</Paket>
210+
</Reference>
211+
</ItemGroup>
212+
</When>
213+
</Choose>
165214
<Choose>
166215
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
167216
<ItemGroup>
168217
<Reference Include="JetBrains.Annotations">
169-
<HintPath>..\..\..\packages\JetBrains.Annotations\lib\net\JetBrains.Annotations.dll</HintPath>
218+
<HintPath>..\..\..\packages\JetBrains.Annotations\lib\net20\JetBrains.Annotations.dll</HintPath>
170219
<Private>True</Private>
171220
<Paket>True</Paket>
172221
</Reference>

‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET45/paket.references‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ Costura.Fody content: once
22
JetBrains.Annotations
33
MahApps.Metro.IconPacks
44
Caliburn.Micro
5-
Caliburn.Micro.Core
5+
Caliburn.Micro.Core
6+
ControlzEx

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET40/MahApps.Metro.Demo.NET40.csproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,12 @@
118118
<Import Project="..\..\MahApps.Metro.Core.Demo.Shared\MahApps.Metro.Core.Demo.Shared.projitems" Label="Shared" />
119119
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
120120
<Choose>
121-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
121+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
122+
<PropertyGroup>
123+
<__paket__Fody_targets>netstandard1.0\Fody</__paket__Fody_targets>
124+
</PropertyGroup>
125+
</When>
126+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3')">
122127
<PropertyGroup>
123128
<__paket__Fody_targets>portable-net+sl+win+wpa+wp\Fody</__paket__Fody_targets>
124129
</PropertyGroup>
@@ -183,7 +188,7 @@
183188
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
184189
<ItemGroup>
185190
<Reference Include="JetBrains.Annotations">
186-
<HintPath>..\..\..\packages\JetBrains.Annotations\lib\net\JetBrains.Annotations.dll</HintPath>
191+
<HintPath>..\..\..\packages\JetBrains.Annotations\lib\net20\JetBrains.Annotations.dll</HintPath>
187192
<Private>True</Private>
188193
<Paket>True</Paket>
189194
</Reference>

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.NET45/MahApps.Metro.Demo.NET45.csproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,12 @@
124124
<Import Project="..\..\MahApps.Metro.Core.Demo.Shared\MahApps.Metro.Core.Demo.Shared.projitems" Label="Shared" />
125125
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
126126
<Choose>
127-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
127+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
128+
<PropertyGroup>
129+
<__paket__Fody_targets>netstandard1.0\Fody</__paket__Fody_targets>
130+
</PropertyGroup>
131+
</When>
132+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3')">
128133
<PropertyGroup>
129134
<__paket__Fody_targets>portable-net+sl+win+wpa+wp\Fody</__paket__Fody_targets>
130135
</PropertyGroup>
@@ -189,7 +194,7 @@
189194
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
190195
<ItemGroup>
191196
<Reference Include="JetBrains.Annotations">
192-
<HintPath>..\..\..\packages\JetBrains.Annotations\lib\net\JetBrains.Annotations.dll</HintPath>
197+
<HintPath>..\..\..\packages\JetBrains.Annotations\lib\net20\JetBrains.Annotations.dll</HintPath>
193198
<Private>True</Private>
194199
<Paket>True</Paket>
195200
</Reference>

‎src/MahApps.Metro/MahApps.Metro/MahApps.Metro.NET40.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@
592592
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
593593
<ItemGroup>
594594
<Reference Include="JetBrains.Annotations">
595-
<HintPath>..\..\packages\JetBrains.Annotations\lib\net\JetBrains.Annotations.dll</HintPath>
595+
<HintPath>..\..\packages\JetBrains.Annotations\lib\net20\JetBrains.Annotations.dll</HintPath>
596596
<Private>True</Private>
597597
<Paket>True</Paket>
598598
</Reference>

‎src/MahApps.Metro/MahApps.Metro/MahApps.Metro.NET45.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@
592592
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
593593
<ItemGroup>
594594
<Reference Include="JetBrains.Annotations">
595-
<HintPath>..\..\packages\JetBrains.Annotations\lib\net\JetBrains.Annotations.dll</HintPath>
595+
<HintPath>..\..\packages\JetBrains.Annotations\lib\net20\JetBrains.Annotations.dll</HintPath>
596596
<Private>True</Private>
597597
<Paket>True</Paket>
598598
</Reference>

‎src/Mahapps.Metro.Tests/Mahapps.Metro.Tests.NET40/Mahapps.Metro.Tests.NET40.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
156156
<ItemGroup>
157157
<Reference Include="JetBrains.Annotations">
158-
<HintPath>..\..\packages\JetBrains.Annotations\lib\net\JetBrains.Annotations.dll</HintPath>
158+
<HintPath>..\..\packages\JetBrains.Annotations\lib\net20\JetBrains.Annotations.dll</HintPath>
159159
<Private>True</Private>
160160
<Paket>True</Paket>
161161
</Reference>

‎src/Mahapps.Metro.Tests/Mahapps.Metro.Tests.NET45/Mahapps.Metro.Tests.NET45.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
158158
<ItemGroup>
159159
<Reference Include="JetBrains.Annotations">
160-
<HintPath>..\..\packages\JetBrains.Annotations\lib\net\JetBrains.Annotations.dll</HintPath>
160+
<HintPath>..\..\packages\JetBrains.Annotations\lib\net20\JetBrains.Annotations.dll</HintPath>
161161
<Private>True</Private>
162162
<Paket>True</Paket>
163163
</Reference>

0 commit comments

Comments
 (0)