Преглед изворни кода

Make Avalonia.Win32.Interoperability build again on CI

Max Katz пре 2 година
родитељ
комит
691ff9f33a
2 измењених фајлова са 9 додато и 3 уклоњено
  1. 3 3
      dirs.proj
  2. 6 0
      nukebuild/_build.csproj

+ 3 - 3
dirs.proj

@@ -14,11 +14,11 @@
     <ProjectReference Remove="samples/*.Android/*.csproj" />
     <ProjectReference Remove="samples/*.Browser/*.csproj" />
     <ProjectReference Remove="samples/*.Blazor/*.csproj" />
+    <ProjectReference Remove="samples/ControlCatalog.Desktop/*.*proj" />
   </ItemGroup>
-  <ItemGroup Condition="!$([MSBuild]::IsOsPlatform('Windows')) OR '$(MSBuildRuntimeType)' != 'Full'">
-    <ProjectReference Remove="src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj" />
+  <ItemGroup Condition="!$([MSBuild]::IsOsPlatform('Windows'))">
+    <ProjectReference Remove="src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj" />
     <ProjectReference Remove="samples/interop/**/*.*proj" />
-    <ProjectReference Remove="samples/ControlCatalog.Desktop/*.*proj" />
   </ItemGroup>
 
   <!-- Build android and iOS projects only on Windows, where we have installed android workload -->

+ 6 - 0
nukebuild/_build.csproj

@@ -35,6 +35,12 @@
 	<EmbeddedResource Include="../build/avalonia.snk"></EmbeddedResource>
     <Compile Remove="il-repack\ILRepack\Application.cs" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="..\dirs.proj">
+      <Link>dirs.proj</Link>
+    </Content>
+  </ItemGroup>