Skip to content

Commit 0a417e8

Browse files
ButchersBoyButchersBoy
committed
update xaml displayer
1 parent 5912e62 commit 0a417e8

File tree

5 files changed

+42
-23
lines changed

5 files changed

+42
-23
lines changed

‎MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\xunit.core\build\xunit.core.props" Condition="Exists('..\packages\xunit.core\build\xunit.core.props')" Label="Paket" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -104,6 +105,12 @@
104105
</ItemGroup>
105106
</When>
106107
</Choose>
108+
<Import Project="..\packages\NETStandard.Library\build\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library\build\NETStandard.Library.targets')" Label="Paket" />
109+
<ItemGroup>
110+
<Analyzer Include="..\packages\xunit.analyzers\analyzers\dotnet\cs\xunit.analyzers.dll">
111+
<Paket>True</Paket>
112+
</Analyzer>
113+
</ItemGroup>
107114
<Choose>
108115
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
109116
<ItemGroup>
@@ -146,5 +153,5 @@
146153
</ItemGroup>
147154
</When>
148155
</Choose>
149-
<Import Project="..\packages\NETStandard.Library\build\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library\build\NETStandard.Library.targets')" Label="Paket" />
156+
<Import Project="..\packages\xunit.core\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core\build\xunit.core.targets')" Label="Paket" />
150157
</Project>

‎MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\xunit.core\build\xunit.core.props" Condition="Exists('..\packages\xunit.core\build\xunit.core.props')" Label="Paket" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -64,6 +65,9 @@
6465
<Choose>
6566
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
6667
<ItemGroup>
68+
<Reference Include="System.Configuration">
69+
<Paket>True</Paket>
70+
</Reference>
6771
<Reference Include="Castle.Core">
6872
<HintPath>..\packages\Castle.Core\lib\net45\Castle.Core.dll</HintPath>
6973
<Private>True</Private>
@@ -147,6 +151,12 @@
147151
</ItemGroup>
148152
</When>
149153
</Choose>
154+
<Import Project="..\packages\NETStandard.Library\build\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library\build\NETStandard.Library.targets')" Label="Paket" />
155+
<ItemGroup>
156+
<Analyzer Include="..\packages\xunit.analyzers\analyzers\dotnet\cs\xunit.analyzers.dll">
157+
<Paket>True</Paket>
158+
</Analyzer>
159+
</ItemGroup>
150160
<Choose>
151161
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
152162
<ItemGroup>
@@ -189,5 +199,5 @@
189199
</ItemGroup>
190200
</When>
191201
</Choose>
192-
<Import Project="..\packages\NETStandard.Library\build\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library\build\NETStandard.Library.targets')" Label="Paket" />
202+
<Import Project="..\packages\xunit.core\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core\build\xunit.core.targets')" Label="Paket" />
193203
</Project>

‎paket-files/ControlzEx/ControlzEx/src/ControlzEx/paket.dependencies

Whitespace-only changes.

‎paket.dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ nuget Moq ~> 4.7
77
nuget NSubstitute ~> 2.0
88
nuget RhinoMocks 3.6.1
99
nuget Shouldly ~> 2.8
10-
nuget XamlDisplayerPackage 1.0.5
10+
nuget XamlDisplayerPackage 1.0.6
1111
nuget xunit ~> 2.2
1212

1313
github ControlzEx/ControlzEx:e687c6ac4279c4e513b7ef9a75622411350db874 src/ControlzEx/PopupEx.cs

‎paket.lock

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,41 @@
11
RESTRICTION: || (== net45) (== net452)
22
NUGET
33
remote: https://www.nuget.org/api/v2
4-
Castle.Core (4.1.1)
4+
Castle.Core (4.2.1)
55
Dragablz (0.0.3.197)
66
MahApps.Metro (1.5)
7-
Microsoft.NETCore.Platforms (2.0) - restriction: || (== net45) (&& (== net45) (== net452))
8-
Moq (4.7.99)
9-
Castle.Core (>= 4.1.1)
10-
NETStandard.Library (2.0) - restriction: == net45
7+
Microsoft.NETCore.Platforms (2.0.1) - restriction: || (== net45) (&& (== net45) (== net452))
8+
Moq (4.7.145)
9+
Castle.Core (>= 4.2.1)
10+
NETStandard.Library (2.0.1) - restriction: == net45
1111
Microsoft.NETCore.Platforms (>= 1.1)
1212
System.Runtime.InteropServices.RuntimeInformation (>= 4.3)
1313
NSubstitute (2.0.3)
1414
RhinoMocks (3.6.1)
1515
Shouldly (2.8.3)
1616
System.Runtime.InteropServices.RuntimeInformation (4.3) - restriction: || (== net45) (&& (== net45) (== net452))
17-
XamlDisplayerPackage (1.0.5)
18-
xunit (2.2)
19-
xunit.assert (2.2)
20-
xunit.core (2.2)
17+
XamlDisplayerPackage (1.0.6)
18+
xunit (2.3.1)
19+
xunit.analyzers (>= 0.7)
20+
xunit.assert (2.3.1)
21+
xunit.core (2.3.1)
2122
xunit.abstractions (2.0.1)
22-
xunit.assert (2.2)
23-
NETStandard.Library (>= 1.6) - restriction: == net45
24-
xunit.core (2.2)
25-
xunit.extensibility.core (2.2)
26-
xunit.extensibility.execution (2.2)
27-
xunit.extensibility.core (2.2)
28-
NETStandard.Library (>= 1.6) - restriction: == net45
23+
xunit.analyzers (0.8)
24+
xunit.assert (2.3.1)
25+
NETStandard.Library (>= 1.6.1) - restriction: == net45
26+
xunit.core (2.3.1)
27+
xunit.extensibility.core (2.3.1)
28+
xunit.extensibility.execution (2.3.1)
29+
xunit.extensibility.core (2.3.1)
30+
NETStandard.Library (>= 1.6.1) - restriction: == net45
2931
xunit.abstractions (>= 2.0.1)
30-
xunit.extensibility.execution (2.2)
31-
NETStandard.Library (>= 1.6) - restriction: == net45
32-
xunit.extensibility.core (2.2)
32+
xunit.extensibility.execution (2.3.1)
33+
NETStandard.Library (>= 1.6.1) - restriction: == net45
34+
xunit.extensibility.core (2.3.1)
3335
GITHUB
3436
remote: ControlzEx/ControlzEx
3537
src/ControlzEx/BadgedEx.cs (e687c6ac4279c4e513b7ef9a75622411350db874)
3638
src/ControlzEx/PackIconBase.cs (e687c6ac4279c4e513b7ef9a75622411350db874)
3739
src/ControlzEx/PopupEx.cs (e687c6ac4279c4e513b7ef9a75622411350db874)
3840
remote: samueldjack/VirtualCollection
39-
VirtualCollection/VirtualCollection/VirtualizingWrapPanel.cs (e63d891c252c2ac1a3ebb26dddb9a3d89effe3f2)
41+
VirtualCollection/VirtualCollection/VirtualizingWrapPanel.cs (e63d891c252c2ac1a3ebb26dddb9a3d89effe3f2)

0 commit comments

Comments
 (0)