Merge pull request #4190 from MahApps/hotfix/NUD_WatermarkAlignment

Fix wrong WatermarkAlignment for NUD
MahApps · Oct 10, 2021 · d73d2d0 · d73d2d0
2 parents ee63390 + 189796f
commit d73d2d0
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 13 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -6,6 +6,7 @@ branches:
  - main
 
 environment:
+ IGNORE_NORMALISATION_GIT_HEAD_MOVE: 1
  azure-key-vault-url:
  secure: 1mKS/HfCVq+iYNRVSrrN8NEowOkKt3knrpMzw+SOy3g=
  azure-key-vault-client-id:

diff --git a/build.cake b/build.cake
@@ -2,11 +2,11 @@
 // TOOLS / ADDINS
 ///////////////////////////////////////////////////////////////////////////////
 
-#module nuget:?package=Cake.DotNetTool.Module&version=0.5.0
+#module nuget:?package=Cake.DotNetTool.Module&version=1.0.1
 #tool dotnet:?package=NuGetKeyVaultSignTool&version=1.2.28
 #tool dotnet:?package=AzureSignTool&version=2.0.17
-#tool dotnet:?package=GitReleaseManager.Tool&version=0.11.0
-#tool dotnet:?package=GitVersion.Tool&version=5.6.6
+#tool dotnet:?package=GitReleaseManager.Tool&version=0.12.0
+#tool dotnet:?package=GitVersion.Tool&version=5.7.0
 
 #tool xunit.runner.console&version=2.4.1
 #tool vswhere&version=2.8.4

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/FodyWeavers.xsd b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/FodyWeavers.xsd
@@ -17,6 +17,16 @@
  <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
  </xs:annotation>
  </xs:element>
+ <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
  <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
  <xs:annotation>
  <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
@@ -43,6 +53,16 @@
  <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
  </xs:annotation>
  </xs:attribute>
+ <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
  <xs:attribute name="DisableCompression" type="xs:boolean">
  <xs:annotation>
  <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
@@ -73,6 +93,16 @@
  <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
  </xs:annotation>
  </xs:attribute>
+ <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
  <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
  <xs:annotation>
  <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.csproj b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.csproj
@@ -22,13 +22,13 @@
  <Reference Include="System.ComponentModel.Composition" />
  </ItemGroup>
  <ItemGroup>
- <PackageReference Include="MahApps.Metro.IconPacks" Version="4.*" />
+ <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
  <PackageReference Include="Caliburn.Micro" Version="3.*" />
- <PackageReference Include="Fody" Version="6.*">
+ <PackageReference Include="Fody" Version="6.5.*">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>
- <PackageReference Include="Costura.Fody" Version="4.*" PrivateAssets="All" />
+ <PackageReference Include="Costura.Fody" Version="5.6.*" PrivateAssets="All" />
  </ItemGroup>
  <ItemGroup>
  <None Include="app.manifest" />

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/FodyWeavers.xsd b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/FodyWeavers.xsd
@@ -17,6 +17,16 @@
  <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
  </xs:annotation>
  </xs:element>
+ <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
  <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
  <xs:annotation>
  <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
@@ -43,6 +53,16 @@
  <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
  </xs:annotation>
  </xs:attribute>
+ <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
  <xs:attribute name="DisableCompression" type="xs:boolean">
  <xs:annotation>
  <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
@@ -73,6 +93,16 @@
  <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
  </xs:annotation>
  </xs:attribute>
+ <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
  <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
  <xs:annotation>
  <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.csproj b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.csproj
@@ -23,17 +23,17 @@
  <Reference Include="System.ComponentModel.DataAnnotations" />
  </ItemGroup>
  <ItemGroup>
- <PackageReference Include="MahApps.Metro.IconPacks" Version="4.*" />
+ <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
  <PackageReference Include="MaterialDesignThemes" Version="3.0.*" Condition=" '$(TargetFramework)' == 'netcoreapp3.0' " />
  <PackageReference Include="MaterialDesignThemes" Version="3.*" Condition=" '$(TargetFramework)' != 'netcoreapp3.0' " />
  <PackageReference Include="MaterialDesignColors" Version="1.2.2" Condition=" '$(TargetFramework)' == 'netcoreapp3.0' " />
  <PackageReference Include="MaterialDesignColors" Version="1.*" Condition=" '$(TargetFramework)' != 'netcoreapp3.0' " />
  <PackageReference Include="NHotkey.Wpf" Version="2.*" />
- <PackageReference Include="Fody" Version="6.*">
+ <PackageReference Include="Fody" Version="6.5.*">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>
- <PackageReference Include="Costura.Fody" Version="4.*" PrivateAssets="All" />
+ <PackageReference Include="Costura.Fody" Version="5.6.*" PrivateAssets="All" />
  </ItemGroup>
  <ItemGroup>
  <None Include="app.manifest" />

diff --git a/src/MahApps.Metro/MahApps.Metro.csproj b/src/MahApps.Metro/MahApps.Metro.csproj
@@ -15,9 +15,9 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="ControlzEx" version="4.*" />
- <PackageReference Include="XamlColorSchemeGenerator" version="4-*" PrivateAssets="All" IIncludeAssets="build" />
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*">
+ <PackageReference Include="ControlzEx" version="[4.*, 5)" />
+ <PackageReference Include="XamlColorSchemeGenerator" version="4.0.0-rc0155" PrivateAssets="All" IncludeAssets="build" />
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
  </PackageReference>

diff --git a/src/MahApps.Metro/Themes/NumericUpDown.xaml b/src/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -15,7 +15,7 @@
  <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Control}" />
  <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
  <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
- <Setter Property="HorizontalContentAlignment" Value="Right" />
+ <Setter Property="HorizontalContentAlignment" Value="Stretch" />
  <Setter Property="MinHeight" Value="26" />
  <Setter Property="MinWidth" Value="62" />
  <Setter Property="Padding" Value="4" />
@@ -238,5 +238,6 @@
  <Setter Property="mah:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
  <Setter Property="mah:TextBoxHelper.ButtonWidth" Value="22" />
  <Setter Property="mah:TextBoxHelper.IsMonitoring" Value="True" />
+ <Setter Property="mah:TextBoxHelper.WatermarkAlignment" Value="Right" />
  </Style>
 </ResourceDictionary>