Fix for .NET 9 Sdk

Author: AliveDevil

Directory.Build.targets

@@ -28,10 +28,10 @@
     <AssemblySearchPaths Condition=" '$(LibDirFramework)' != '' ">$(LibDir)$(LibDirFramework)\;$(AssemblySearchPaths)</AssemblySearchPaths>
   </PropertyGroup>
 
-  <PropertyGroup Condition= " '$(TargetFramework)' != 'net472' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' != 'net472' ">
     <DefaultItemExcludes>$(DefaultItemExcludes);**/*net472*</DefaultItemExcludes>
   </PropertyGroup>
-  <PropertyGroup Condition= " !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) ">
+  <PropertyGroup Condition=" !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) ">
     <DefaultItemExcludes>$(DefaultItemExcludes);**/*net8.0*</DefaultItemExcludes>
   </PropertyGroup>
 
@@ -74,6 +74,12 @@
     </Reference>
   </ItemGroup>
 
+  <PropertyGroup>
+    <!-- Fix .NET 8 Sdk RuntimeIdentifiers to align with .NET 9 Sdk -->
+    <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='win7-x86'">win-x86</RuntimeIdentifier>
+    <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='win7-x64'">win-x64</RuntimeIdentifier>
+  </PropertyGroup>
+
   <PropertyGroup Condition=" '$(NETCoreSdkVersion)'!='' ">
     <!-- Treat SDK 6.0.301 as last known to work. -->
     <NETSDKBeforeFeature>$([MSBuild]::VersionLessThanOrEquals('$(NETCoreSdkVersion)', '6.0.301'))</NETSDKBeforeFeature>

Packages.props

@@ -21,6 +21,7 @@
     <PackageReference Update="ExceptionReporter " Version="2.4.2" />
     <PackageReference Update="IKVM" Version="8.11.0-dev.50" />
     <PackageReference Update="Microsoft.Build.Utilities.Core" Version="17.1.0" />
+    <PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Update="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageReference Update="Microsoft.Windows.CsWin32" Version="0.3.106" />

cli/src/main/csharp/duck.csproj

@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net472</TargetFramework>
     <Platforms>x64</Platforms>
-    <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>

windows/src/main/csharp/Cyberduck.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net472</TargetFramework>
-    <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <Platforms>x64</Platforms>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>