Fix build (#77)

.github/workflows/dotnet.yml

@@ -20,6 +20,8 @@ jobs:
             6.0.423
             7.0.120
             8.0.302
+    - name: Restore dependencies
+      run: dir "C:\Program Files\dotnet\\shared\Microsoft.WindowsDesktop.App\"
     - name: Restore dependencies
       run: dotnet restore WinFormsComInterop.Build.sln
     - name: Build

Directory.Build.targets

@@ -1,16 +1,20 @@
 <Project>
   <PropertyGroup>
-    <DotnetInstallLocation>C:\Program Files\dotnet</DotnetInstallLocation>
+    <DotnetInstallLocation Condition="$(NetCoreRoot) == ''">C:\Program Files\dotnet\</DotnetInstallLocation>
+    <DotnetInstallLocation Condition="$(NetCoreRoot) != ''">$(NetCoreRoot)</DotnetInstallLocation>
+    <AccessibilityLocation Condition="$(TargetFramework) == 'net8.0'">$(DotnetInstallLocation)shared\Microsoft.WindowsDesktop.App\8.0.6\Accessibility.dll</AccessibilityLocation>
+    <AccessibilityLocation Condition="$(TargetFramework) == 'net7.0'">$(DotnetInstallLocation)shared\Microsoft.WindowsDesktop.App\7.0.20\Accessibility.dll</AccessibilityLocation>
+    <AccessibilityLocation Condition="$(TargetFramework) == 'net6.0'">$(DotnetInstallLocation)shared\Microsoft.WindowsDesktop.App\6.0.31\Accessibility.dll</AccessibilityLocation>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Update="Accessibility" Condition="$(TargetFramework) == 'net8.0'">
-      <HintPath>$(DotnetInstallLocation)\shared\Microsoft.WindowsDesktop.App\8.0.6\Accessibility.dll</HintPath>
-    </Reference>
-    <Reference Update="Accessibility" Condition="$(TargetFramework) == 'net7.0'">
-      <HintPath>$(DotnetInstallLocation)\shared\Microsoft.WindowsDesktop.App\7.0.20\Accessibility.dll</HintPath>
-    </Reference>
-    <Reference Update="Accessibility" Condition="$(TargetFramework) == 'net6.0'">
-      <HintPath>$(DotnetInstallLocation)\shared\Microsoft.WindowsDesktop.App\6.0.27\Accessibility.dll</HintPath>
+    <Reference Update="Accessibility" Condition="($(TargetFramework) == 'net8.0') or ($(TargetFramework) == 'net7.0') or ($(TargetFramework) == 'net6.0')">
+      <HintPath>$(AccessibilityLocation)</HintPath>
     </Reference>
   </ItemGroup>
+  <Target Name="CustomClean" BeforeTargets="CoreBuild">
+    <Error Text="Accessibility does not exists in location $(AccessibilityLocation)'" Condition="($(TargetFramework) == 'net8.0') and (!Exists('$(AccessibilityLocation)'))" />
+    <Error Text="Accessibility does not exists in location $(AccessibilityLocation)'" Condition="($(TargetFramework) == 'net7.0') and (!Exists('$(AccessibilityLocation)'))" />
+    <Error Text="Accessibility does not exists in location $(AccessibilityLocation)'" Condition="($(TargetFramework) == 'net6.0') and (!Exists('$(AccessibilityLocation)'))" />
+  </Target>
+
 </Project>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.302",
+    "version": "8.0.200",
     "allowPrerelease": true,
     "rollForward": "major"
   }