fix: Rollback incorrect high DPI calculations; format code; add manifest for .NET tools (#1449)

* chore: Format code and add tools manifest

* fix: Rollback incorrect position for high DPI after #1373

Author: pomianowski

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "csharpier": {
+      "version": "1.0.1",
+      "commands": [
+        "csharpier"
+      ],
+      "rollForward": false
+    }
+  }
+}

.csharpierignore

@@ -0,0 +1 @@
+*.csproj

Directory.Build.props

@@ -1,15 +1,12 @@
 <Project>
-
   <PropertyGroup>
     <RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
     <BuildToolsDirectory>$(RepositoryDirectory)build\</BuildToolsDirectory>
   </PropertyGroup>
-
   <PropertyGroup>
-    <Version>4.0.2</Version>
+    <Version>4.0.3</Version>
     <AssemblyVersion>4.0.0</AssemblyVersion>
   </PropertyGroup>
-
   <PropertyGroup>
     <Company>lepo.co</Company>
     <Authors>lepo.co</Authors>
@@ -25,11 +22,9 @@
     <RepositoryBranch>main</RepositoryBranch>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
-
   <ItemGroup>
-    <SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
+    <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
   </ItemGroup>
-
   <PropertyGroup>
     <NuGetAudit>true</NuGetAudit>
     <NuGetAuditLevel>moderate</NuGetAuditLevel>
@@ -38,48 +33,44 @@
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
     <_SilenceIsAotCompatibleUnsupportedWarning>true</_SilenceIsAotCompatibleUnsupportedWarning>
   </PropertyGroup>
-
   <PropertyGroup>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
-
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>13.0</LangVersion>
     <Nullable>enable</Nullable>
-
     <!--
         Suppress ref safety warnings in unsafe contexts (see https://github.com/dotnet/csharplang/issues/6476).
         This is used eg. to replace Unsafe.SizeOf<T>() calls with just sizeof(T). The warning is not necessary
         since in order to use these APIs the caller already has to be in an unsafe context.
       -->
     <NoWarn>$(NoWarn);CS8500</NoWarn>
   </PropertyGroup>
-
   <PropertyGroup>
     <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
     <IsCoreProject Condition="$(IsTestProject)">False</IsCoreProject>
     <IsCoreProject Condition="'$(IsCoreProject)' == ''">True</IsCoreProject>
-    <IsBelowNet8 Condition="'$(TargetFramework)' == 'netstandard2.0'
+    <IsBelowNet8
+      Condition="'$(TargetFramework)' == 'netstandard2.0'
                  Or '$(TargetFramework)' == 'netstandard2.1'
                  Or '$(TargetFramework)' == 'net462'
                  Or '$(TargetFramework)' == 'net472'
                  Or '$(TargetFramework)' == 'net481'
                  Or '$(TargetFramework)' == 'net5.0'
                  Or '$(TargetFramework)' == 'net6.0'
-                 Or '$(TargetFramework)' == 'net7.0'">True</IsBelowNet8>
+                 Or '$(TargetFramework)' == 'net7.0'"
+      >True</IsBelowNet8
+    >
   </PropertyGroup>
-
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <IsPublishable>true</IsPublishable>
     <ContinuousIntegrationBuild>$(TF_BUILD)</ContinuousIntegrationBuild>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(IsBelowNet8)' == 'false'">
     <DefineConstants>$(DefineConstants);NET8_0_OR_GREATER</DefineConstants>
   </PropertyGroup>
-
   <Choose>
     <When Condition="$(IsCoreProject)">
       <PropertyGroup>
@@ -95,7 +86,6 @@
       </PropertyGroup>
     </Otherwise>
   </Choose>
-
   <Choose>
     <When Condition="'$(SourceLinkEnabled)' != 'false' and '$(VisualStudioTemplateProject)' != 'true'">
       <PropertyGroup>
@@ -111,5 +101,4 @@
       </ItemGroup>
     </When>
   </Choose>
-
-</Project>
+</Project>

Directory.Build.targets

@@ -1,15 +1,12 @@
 <Project>
-
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
-
   <PropertyGroup>
     <CommonTags Condition="$(IsCoreProject)">$(CommonTags);.NET</CommonTags>
     <PackageTags Condition="'$(PackageTags)' != ''">$(CommonTags);$(PackageTags)</PackageTags>
     <PackageTags Condition="'$(PackageTags)' == ''">$(CommonTags)</PackageTags>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(GeneratePackageOnBuild)' == 'true'">
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -19,37 +16,39 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
-
   <ItemGroup Condition="'$(GeneratePackageOnBuild)' == 'true'">
     <None Include="$(BuildToolsDirectory)nuget.png" Pack="true" PackagePath="\Icon.png" Visible="False" />
     <None Include="$(RepositoryDirectory)ThirdPartyNotices.txt" Pack="true" PackagePath="\" Visible="False" />
     <None Include="$(RepositoryDirectory)LICENSE.md" Pack="true" PackagePath="\LICENSE.md" Visible="False" />
     <None Include="$(RepositoryDirectory)README.md" Pack="true" PackagePath="\README.md" Visible="False" />
   </ItemGroup>
-
   <Target Name="AddCommitHashToAssemblyAttributes" BeforeTargets="GetAssemblyAttributes">
     <ItemGroup>
-      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(SourceRevisionId)' != ''">
+      <AssemblyAttribute
+        Include="System.Reflection.AssemblyMetadataAttribute"
+        Condition="'$(SourceRevisionId)' != ''"
+      >
         <_Parameter1>CommitHash</_Parameter1>
         <_Parameter2>$(SourceRevisionId)</_Parameter2>
       </AssemblyAttribute>
     </ItemGroup>
   </Target>
-
   <!-- Configure trimming for projects on .NET 6 and above -->
   <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0'">
     <IsTrimmable>true</IsTrimmable>
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     <EnableAotAnalyzer>true</EnableAotAnalyzer>
     <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(SourceLinkEnabled)' == 'true' AND '$(GeneratePackageOnBuild)' == 'true'">
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(RepositoryDirectory)\src\lepo.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-
-  <Target Name="WpfSourceLinkWorkaround" BeforeTargets="InitializeSourceRootMappedPaths" Condition="'$(UseWPF)' == 'true'">
+  <Target
+    Name="WpfSourceLinkWorkaround"
+    BeforeTargets="InitializeSourceRootMappedPaths"
+    Condition="'$(UseWPF)' == 'true'"
+  >
     <!-- WPF causes an error with SourceLink because its build targets create a temporary project without a PackageReference to SourceLink, see https://github.com/dotnet/sourcelink/issues/91,
          causing the @SourceRoot property to be unexpectedly empty for the MapSourceRoot task
         
@@ -63,4 +62,4 @@
       <SourceRoot Include="\" />
     </ItemGroup>
   </Target>
-</Project>
+</Project>

Directory.Packages.props

@@ -27,4 +27,4 @@
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
     <PackageVersion Include="xunit" Version="2.9.3" />
   </ItemGroup>
-</Project>
+</Project>

nuget.config

@@ -3,12 +3,10 @@
     <add key="enabled" value="True" />
     <add key="automatic" value="True" />
   </packageRestore>
-
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
-
   <packageSourceMapping>
     <packageSource key="nuget.org">
       <package pattern="*" />

samples/Wpf.Ui.Demo.SetResources.Simple/App.xaml.cs

@@ -27,4 +27,4 @@ public static void ApplyTheme(FrameworkElement element)
         element.Resources.MergedDictionaries.Add(ThemesDictionary);
         element.Resources.MergedDictionaries.Add(ControlsDictionary);
     }
-}
+}

samples/Wpf.Ui.Demo.SetResources.Simple/MainWindow.xaml.cs

@@ -18,9 +18,9 @@ public partial class MainWindow
     public MainWindow()
     {
         DataContext = this;
-        
+
         App.ApplyTheme(this);
-        
+
         InitializeComponent();
 
         Loaded += (_, _) => RootNavigation.Navigate(typeof(DashboardPage));

samples/Wpf.Ui.Demo.SetResources.Simple/Models/DataGroup.cs

@@ -17,4 +17,4 @@ public DataGroup(bool selected, string name, string groupName)
     public bool Selected { get; set; }
     public string Name { get; set; }
     public string GroupName { get; set; }
-}
+}

samples/Wpf.Ui.Demo.SetResources.Simple/Views/Pages/DashboardPage.xaml.cs

@@ -17,7 +17,7 @@ public partial class DashboardPage
     public DashboardPage()
     {
         App.ApplyTheme(this);
-        
+
         DataContext = this;
         InitializeComponent();