build: prepare first v3.0 alpha

MahApps · May 9, 2023 · 3fce022 · 3fce022
1 parent b4f4274
commit 3fce022
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 169 deletions.
diff --git a/src/Directory.packages.props b/src/Directory.packages.props
@@ -3,16 +3,19 @@
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
         <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     </PropertyGroup>
+
     <ItemGroup>
-        <PackageVersion Include="ControlzEx" Version="6.0.0-alpha0280" />
+        <PackageVersion Include="ControlzEx" Version="6.0.0" />
         <PackageVersion Include="XAMLTools.MSBuild" Version="1.0.0-alpha0143" />
         <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     </ItemGroup>
+
     <ItemGroup Label="Test">
         <PackageVersion Include="xunit" Version="2.4.2" />
         <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     </ItemGroup>
+
     <ItemGroup Label="Build">
         <PackageVersion Include="JetBrains.Annotations" Version="2022.3.1" />
         <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.188-beta" />
@@ -28,8 +31,6 @@
         <PackageVersion Include="System.ComponentModel.Composition" Version="5.0.0" />
         <PackageVersion Include="Caliburn.Micro" Version="4.0.212" />
 
-        <PackageVersion Include="Fody" Version="6.6.4" />
-        <PackageVersion Include="Costura.Fody" Version="5.7.0" />
         <PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
     </ItemGroup>
     <ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/FodyWeavers.xml b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/FodyWeavers.xml
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/FodyWeavers.xsd b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/FodyWeavers.xsd
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
@@ -4,7 +4,6 @@
     <PropertyGroup>
         <AssemblyName>MahApps.Metro.Caliburn.Demo</AssemblyName>
         <RootNamespace>Caliburn.Metro.Demo</RootNamespace>
-        <DisableFody Condition=" '$(Configuration)' == 'Debug' ">true</DisableFody>
         <!-- Workaround for https://github.com/dotnet/sourcelink/issues/91 -->
         <DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
         <OutputType>WinExe</OutputType>
@@ -25,17 +24,6 @@
         <Reference Include="System.ComponentModel.DataAnnotations" />
     </ItemGroup>
 
-    <ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">
-        <PackageReference Include="Fody">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Costura.Fody">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; compile; native; contentfiles; analyzers</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="MahApps.Metro.IconPacks.Modern" />
         <PackageReference Include="Caliburn.Micro" />

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
@@ -4,7 +4,6 @@
     <PropertyGroup>
         <AssemblyName>MahApps.Metro.Demo</AssemblyName>
         <RootNamespace>MetroDemo</RootNamespace>
-        <DisableFody Condition=" '$(Configuration)' == 'Debug' ">true</DisableFody>
         <!-- Workaround for https://github.com/dotnet/sourcelink/issues/91 -->
         <DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
         <OutputType>WinExe</OutputType>

diff --git a/src/MahApps.Metro/Directory.Build.Targets b/src/MahApps.Metro/Directory.Build.Targets
@@ -9,7 +9,7 @@
 
     <!-- NuGet -->
     <PropertyGroup>
-        <Authors>Jan Karger, Dennis Daume, Brendan Forster, Paul Jenkins, Jake Ginnivan, Alex Mitchell</Authors>
+        <Authors>Jan Karger, Bastian Schmidt, Dennis Daume, Brendan Forster, Alex Mitchell, Paul Jenkins, Jake Ginnivan</Authors>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/MahApps/MahApps.Metro</PackageProjectUrl>
         <PackageIcon>mahapps.metro.logo.png</PackageIcon>

diff --git a/src/MahApps.Metro/Themes/MetroWindow.xaml b/src/MahApps.Metro/Themes/MetroWindow.xaml
@@ -15,12 +15,12 @@
 
     <ControlTemplate x:Key="MahApps.Templates.MetroWindow" TargetType="{x:Type mah:MetroWindow}">
         <mah:ClipBorder x:Name="PART_Border"
+                        Margin="{TemplateBinding Padding}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{Binding Path=GlowColor, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static mahConverters:ColorToSolidColorBrushConverter.DefaultInstance}}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
-                        UseLayoutRounding="True"
-                        Margin="{TemplateBinding Padding}">
+                        UseLayoutRounding="True">
             <AdornerDecorator UseLayoutRounding="False">
                 <Grid Background="{x:Null}"
                       LayoutTransform="{Binding LayoutTransform, RelativeSource={RelativeSource TemplatedParent}}"
@@ -261,12 +261,12 @@
 
     <ControlTemplate x:Key="MahApps.Templates.MetroWindow.Center" TargetType="{x:Type mah:MetroWindow}">
         <mah:ClipBorder x:Name="PART_Border"
+                        Margin="{TemplateBinding Padding}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{Binding Path=GlowColor, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static mahConverters:ColorToSolidColorBrushConverter.DefaultInstance}}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
-                        UseLayoutRounding="True"
-                        Margin="{TemplateBinding Padding}">
+                        UseLayoutRounding="True">
             <AdornerDecorator UseLayoutRounding="False">
                 <Grid Background="{x:Null}"
                       LayoutTransform="{Binding LayoutTransform, RelativeSource={RelativeSource TemplatedParent}}"

diff --git a/src/global.json b/src/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.300",
+    "version": "6.0.400",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }