Improving build

Author: batzen

Directory.build.props

@@ -3,8 +3,6 @@
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <!-- <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile> -->
-    <!-- <RestoreLockedMode>true</RestoreLockedMode> -->
     <IsBuildingWpfTempProj Condition="$(MSBuildProjectName.Contains('_wpftmp')) != 'true'">false</IsBuildingWpfTempProj>
     <IsBuildingWpfTempProj Condition="$(MSBuildProjectName.Contains('_wpftmp')) == 'true'">true</IsBuildingWpfTempProj>
     <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
@@ -17,13 +15,16 @@
     <TargetFrameworks>net8.0-windows;net6.0-windows;net462</TargetFrameworks>
     <LangVersion>latestmajor</LangVersion>
 
+    <IsBuildingForLegacyFramework>false</IsBuildingForLegacyFramework>
+    <IsBuildingForLegacyFramework Condition="'$(TargetFramework)' == 'net462'">true</IsBuildingForLegacyFramework>
+
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)/Fluent.Ribbon.ruleset</CodeAnalysisRuleSet>
     <OutputPath Condition="$(IsBuildingWpfTempProj) != 'true'">$(MSBuildThisFileDirectory)/bin/$(MSBuildProjectName)/$(Configuration)/</OutputPath>
 
-    <AutoGenerateBindingRedirects Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">true</AutoGenerateBindingRedirects>
+    <AutoGenerateBindingRedirects Condition="'$(IsBuildingForLegacyFramework)' == 'true'">true</AutoGenerateBindingRedirects>
 
     <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>
@@ -45,11 +46,6 @@
     <InformationalVersion Condition="'$(InformationalVersion)' == ''">SRC</InformationalVersion>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-    <RestoreLockedMode Condition="'$(RestoreLockedMode)' == ''">true</RestoreLockedMode> -->
-  </PropertyGroup>
-
   <!-- Sign assembly -->
   <PropertyGroup>
     <SignAssembly>True</SignAssembly>
@@ -71,6 +67,7 @@
 
   <!-- PDB-Options -->
   <PropertyGroup>
+    <DebugSymbols>true</DebugSymbols>
     <DebugType>Embedded</DebugType>
   </PropertyGroup>
 
@@ -85,7 +82,7 @@
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" IncludeAssets="build;compile" />
 
-  	<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" IncludeAssets="build;analyzers" Condition="$(DefineConstants.Contains(NETCOREAPP))" />
+  	<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" IncludeAssets="build;analyzers" />
     <!-- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" version="*" privateAssets="all" includeAssets="build;analyzers" /> -->
     <!-- <PackageReference Include="PropertyChangedAnalyzers" version="2.7.0" privateAssets="all" includeAssets="build;analyzers" />
     <PackageReference Include="ReflectionAnalyzers" version="0.1.19-dev" privateAssets="all" includeAssets="build;analyzers" /> -->

Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.csproj

@@ -35,7 +35,7 @@
     <PackageReference Include="MahApps.Metro" Condition="$(InlcudeMahAppsMetro)" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">
+  <ItemGroup Condition="'$(IsBuildingForLegacyFramework)' == 'true'">
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Data" />

Fluent.Ribbon/Fluent.Ribbon.csproj

@@ -17,15 +17,15 @@
     <None Include="../License.txt" Pack="true" PackagePath="license/License.txt" />
     <None Include="../Images/Logo/Logo_128x128.png" Pack="true" PackagePath="Logo.png" />
   </ItemGroup>
-  <ItemGroup Condition="$(DefineConstants.Contains(NETCOREAPP)) == false">
+  <ItemGroup Condition="'$(IsBuildingForLegacyFramework)' == 'true'">
     <Reference Include="UIAutomationProvider" />
     <Reference Include="UIAutomationTypes" />
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="ControlzEx" />
-    <PackageReference Include="System.Memory" />
+    <PackageReference Include="System.Memory" Condition="'$(IsBuildingForLegacyFramework)' == 'true'" />
 
     <PackageReference Include="XAMLTools.MSBuild" PrivateAssets="all" IncludeAssets="build" />