Skip to content

Commit 29afa27

Browse files
committed
update packages
1 parent 71c9db7 commit 29afa27

File tree

8 files changed

+12
-17
lines changed

8 files changed

+12
-17
lines changed

MahAppsMetroDataGridSample/MahAppsMetroDataGridSample/MahAppsMetroDataGridSample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
</Reference>
120120
</ItemGroup>
121121
</When>
122-
<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')">
122+
<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')">
123123
<ItemGroup>
124124
<Reference Include="MahApps.Metro">
125125
<HintPath>..\..\packages\MahApps.Metro\lib\net45\MahApps.Metro.dll</HintPath>

MahAppsMetroFullScreen/MahAppsMetroFullScreen/MahAppsMetroFullScreen.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
</Reference>
119119
</ItemGroup>
120120
</When>
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')">
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')">
122122
<ItemGroup>
123123
<Reference Include="MahApps.Metro">
124124
<HintPath>..\..\packages\MahApps.Metro\lib\net45\MahApps.Metro.dll</HintPath>

MahAppsMetroSample/MahAppsMetroSample/MahAppsMetroSample.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
</Reference>
119119
</ItemGroup>
120120
</When>
121-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' 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')">
121+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' 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')">
122122
<ItemGroup>
123123
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero">
124124
<HintPath>..\..\packages\Extended.Wpf.Toolkit\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
@@ -163,7 +163,7 @@
163163
</Reference>
164164
</ItemGroup>
165165
</When>
166-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' 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')">
166+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' 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')">
167167
<ItemGroup>
168168
<Reference Include="GongSolutions.Wpf.DragDrop">
169169
<HintPath>..\..\packages\gong-wpf-dragdrop\lib\net40\GongSolutions.Wpf.DragDrop.dll</HintPath>
@@ -188,7 +188,7 @@
188188
</Reference>
189189
</ItemGroup>
190190
</When>
191-
<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')">
191+
<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')">
192192
<ItemGroup>
193193
<Reference Include="MahApps.Metro">
194194
<HintPath>..\..\packages\MahApps.Metro\lib\net45\MahApps.Metro.dll</HintPath>

MahAppsMetroStyleOnlyWindowSample/MahAppsMetroSample/MahAppsMetroSample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</Reference>
126126
</ItemGroup>
127127
</When>
128-
<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')">
128+
<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')">
129129
<ItemGroup>
130130
<Reference Include="MahApps.Metro">
131131
<HintPath>..\..\packages\MahApps.Metro\lib\net45\MahApps.Metro.dll</HintPath>

MahAppsMetroThemesSample/MahAppsMetroThemesSample/MahAppsMetroThemesSample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
</Reference>
143143
</ItemGroup>
144144
</When>
145-
<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')">
145+
<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')">
146146
<ItemGroup>
147147
<Reference Include="MahApps.Metro">
148148
<HintPath>..\..\packages\MahApps.Metro\lib\net45\MahApps.Metro.dll</HintPath>

MahAppsMetroThemesSample/MahAppsMetroThemesSample/MainWindow.xaml

+2-7
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,8 @@
2828
<Controls:WindowCommands>
2929
<Button Click="ChangeAppStyleButtonClick">
3030
<StackPanel Orientation="Horizontal">
31-
<metro:PackIconModern Width="24"
32-
Height="24"
33-
Padding="-6"
34-
Kind="Cupcake" />
35-
<TextBlock Margin="4 0 0 0"
36-
VerticalAlignment="Center"
37-
Text="Change App Style..." />
31+
<Controls:PackIconModern Width="24" Height="24" Kind="Cupcake" />
32+
<TextBlock Margin="4 0 0 0" VerticalAlignment="Center" Text="Change App Style..." />
3833
</StackPanel>
3934
</Button>
4035
</Controls:WindowCommands>

MahAppsMetroVBSample/MahAppsMetroVBSample/MahAppsMetroVBSample.vbproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
</Reference>
149149
</ItemGroup>
150150
</When>
151-
<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')">
151+
<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')">
152152
<ItemGroup>
153153
<Reference Include="MahApps.Metro">
154154
<HintPath>..\..\packages\MahApps.Metro\lib\net45\MahApps.Metro.dll</HintPath>

paket.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
NUGET
22
remote: https://www.nuget.org/api/v2
33
specs:
4-
Extended.Wpf.Toolkit (2.6)
4+
Extended.Wpf.Toolkit (2.7)
55
gong-wpf-dragdrop (1.0.0-ALPHA013)
66
WPFToolkit (>= 3.5.50211.1) - framework: net35
7-
MahApps.Metro (1.3.0-ALPHA069)
7+
MahApps.Metro (1.3.0-ALPHA134)
88
WPFToolkit (3.5.50211.1) - framework: net35

0 commit comments

Comments
 (0)