Update projects

jliebster · Aug 13, 2021 · fbfea73 · fbfea73
1 parent ee78839
commit fbfea73
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 20 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -16,10 +16,6 @@
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <PropertyGroup>
-        <CustomAfterCentralPackageVersionsTargets>$(MSBuildThisFileDirectory)MSBuildTasks.targets</CustomAfterCentralPackageVersionsTargets>
-    </PropertyGroup>
-
     <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.41" />
 
     <ItemGroup>

diff --git a/core/Directory.Build.props b/core/Directory.Build.props
@@ -16,7 +16,9 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <PropertyGroup>
-        <BasePath>$(MSBuildThisFileDirectory)</BasePath>
+        <ModulePath Condition=" '$(ModulePath)' == '' ">$(MSBuildThisFileDirectory)</ModulePath>
     </PropertyGroup>
 
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.Props', $(MSBuildThisFileDirectory)../))" />
+
 </Project>
diff --git a/core/native/Directory.Build.props b/core/native/Directory.Build.props
@@ -16,7 +16,9 @@
 <Project>
 
     <PropertyGroup>
-        <ModulePath>$(MSBuildThisFileDirectory)</ModulePath>
+        <ModulePath Condition=" '$(ModulePath)' == '' ">$(MSBuildThisFileDirectory)</ModulePath>
     </PropertyGroup>
 
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.Props', $(MSBuildThisFileDirectory)../))" />
+
 </Project>
diff --git a/core/src/main/csharp/Directory.Build.props b/core/src/main/csharp/Directory.Build.props
@@ -16,12 +16,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <PropertyGroup>
-        <ParentBuildProps>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</ParentBuildProps>
+        <BasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</BasePath>
     </PropertyGroup>
-    <Import Project="$(ParentBuildProps)Directory.Build.props" />
-
     <Import Project="$(BasePath)native/Directory.Build.props" />
 
-    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(ParentBuildProps)../'))" />
-
 </Project>
diff --git a/core/src/test/csharp/Directory.Build.props b/core/src/test/csharp/Directory.Build.props
@@ -16,13 +16,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <PropertyGroup>
-        <ParentBuildProps>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</ParentBuildProps>
+        <BasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</BasePath>
     </PropertyGroup>
-
-    <Import Project="$(ParentBuildProps)Directory.Build.props" />
-
     <Import Project="$(BasePath)native/Directory.Build.props" />
 
-    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(ParentBuildProps)../'))" />
-
 </Project>
diff --git a/windows/Directory.Build.props b/windows/Directory.Build.props
@@ -20,6 +20,6 @@
         <ModulePath>$(BasePath)</ModulePath>
     </PropertyGroup>
 
-    <Import Project="../Directory.Build.props" />
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.Props', $(MSBuildThisFileDirectory)../))" />
 
 </Project>
diff --git a/windows/src/main/csharp/Cyberduck.csproj b/windows/src/main/csharp/Cyberduck.csproj
@@ -10,6 +10,7 @@
         <OutputType>WinExe</OutputType>
         <TargetFramework>net47</TargetFramework>
         <UseWindowsForms>true</UseWindowsForms>
+        <UseWPF>true</UseWPF>
         <Platforms>x64;x86</Platforms>
 
         <ApplicationIcon>$(CyberduckDir)cyberduck-application.ico</ApplicationIcon>
@@ -58,7 +59,6 @@
         <Reference Include="ObjectListView">
             <HintPath>$(TargetBuildDir)ObjectListView.dll</HintPath>
         </Reference>
-        <Reference Include="PresentationFramework" />
         <Reference Include="System.Design" />
         <Reference Include="System.Security" />
         <Reference Include="System.ServiceModel" />

diff --git a/windows/src/main/csharp/ch/cyberduck/ui/core/DragDropLib.cs b/windows/src/main/csharp/ch/cyberduck/ui/core/DragDropLib.cs
@@ -1006,6 +1006,8 @@ public int Skip(int celt)
 
 namespace System.Windows.Forms
 {
+    using System.Drawing;
+
     using ComIDataObject = Runtime.InteropServices.ComTypes.IDataObject;
 
     public enum DropImageType
@@ -1316,6 +1318,8 @@ public static Win32Point ToWin32Point(this Point pt)
 
 namespace System.Windows.Forms
 {
+    using System.Drawing;
+
     public static class DropTargetHelper
     {
         /// <summary>
@@ -1516,6 +1520,8 @@ public static void Drop(this IDropTargetHelper dropHelper, System.Windows.Forms.
 
 namespace System.Windows.Forms
 {
+    using System.Drawing;
+
     /// <summary>
     /// Provides helper methods for working with the Shell drag image manager.
     /// </summary>
@@ -2136,4 +2142,4 @@ private enum DropDescriptionFlags
     }
 }
 
-#endregion // SwfDragDropLib\SwfDragSourceHelper.cs
+#endregion // SwfDragDropLib\SwfDragSourceHelper.cs