Remove design time buld from sub targets. Lets see if this clears up …

…some issues.
ikvmnet · Feb 18, 2024 · f0aac9c · f0aac9c
1 parent 0f21751
commit f0aac9c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/IKVM.Core.MSBuild.Tasks.Test/MatchCompatibleRuntimeIdentifierItemsTests.cs b/src/IKVM.Core.MSBuild.Tasks.Test/MatchCompatibleRuntimeIdentifierItemsTests.cs
@@ -113,7 +113,7 @@ public void ShouldMatchManyItemsWithCompatibleParent()
         public void ShouldMatchSingleItemWithCompatibleChild()
         {
             var t = new MatchCompatibleRuntimeIdentifierItems();
-            t.TargetRuntimeIdentifiers = "win-x86";
+            t.TargetRuntimeIdentifiers = "win-x86;win-x64";
             t.Items = new[]
             {
                 new TaskItem("itemA", new Dictionary<string,string>()

diff --git a/src/IKVM.Core.MSBuild/targets/IncludeProjectReference.targets b/src/IKVM.Core.MSBuild/targets/IncludeProjectReference.targets
@@ -45,8 +45,8 @@
                 <Properties>%(_IncludeProjectReference.SetConfiguration);%(_IncludeProjectReference.SetPlatform);%(_IncludeProjectReference.SetTargetFramework)</Properties>
             </_IncludeProjectReferencesToTarget>
         </ItemGroup>
-        <MSBuild Projects="@(_IncludeProjectReferencesToTarget)" Targets="Build" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);RuntimeIdentifier" />
-        <MSBuild Projects="@(_IncludeProjectReferencesToTarget)" Targets="BuiltProjectOutputGroup" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);RuntimeIdentifier" RebaseOutputs="true">
+        <MSBuild Projects="@(_IncludeProjectReferencesToTarget)" Targets="Build" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);RuntimeIdentifier;DesignTimeBuild" />
+        <MSBuild Projects="@(_IncludeProjectReferencesToTarget)" Targets="BuiltProjectOutputGroup" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);RuntimeIdentifier;DesignTimeBuild" RebaseOutputs="true">
             <Output TaskParameter="TargetOutputs" ItemName="_ResolvedIncludeProjectReferenceItems" />
         </MSBuild>
         <ItemGroup>

diff --git a/src/IKVM.Core.MSBuild/targets/PackageProjectReference.targets b/src/IKVM.Core.MSBuild/targets/PackageProjectReference.targets
@@ -46,8 +46,8 @@
                 <Properties>%(_PackageProjectReference.SetConfiguration);%(_PackageProjectReference.SetPlatform)</Properties>
             </_PackageProjectReferencesToTarget>
         </ItemGroup>
-        <MSBuild Projects="@(_PackageProjectReferencesToTarget)" Targets="Build" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);TargetFramework;RuntimeIdentifier" />
-        <MSBuild Projects="@(_PackageProjectReferencesToTarget)" Targets="_CleanPackageFiles;Pack;GetPackageOutputPath" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);TargetFramework;RuntimeIdentifier" RebaseOutputs="true">
+        <MSBuild Projects="@(_PackageProjectReferencesToTarget)" Targets="Build" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);TargetFramework;RuntimeIdentifier;DesignTimeBuild" />
+        <MSBuild Projects="@(_PackageProjectReferencesToTarget)" Targets="_CleanPackageFiles;Pack;GetPackageOutputPath" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);TargetFramework;RuntimeIdentifier;DesignTimeBuild" RebaseOutputs="true">
             <Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageOutputPath" />
         </MSBuild>
         <ItemGroup>

diff --git a/src/IKVM.Core.MSBuild/targets/PublishProjectReference.targets b/src/IKVM.Core.MSBuild/targets/PublishProjectReference.targets
@@ -90,7 +90,7 @@
                 <Properties>%(_PublishProjectReference.SetConfiguration);%(_PublishProjectReference.SetPlatform);%(_PublishProjectReference.SetTargetFramework);%(_PublishProjectReference.SetRuntimeIdentifier)</Properties>
             </_PublishProjectReferencesToPublishTarget>
         </ItemGroup>
-        <MSBuild Projects="@(_PublishProjectReferencesToPublishTarget)" Targets="Publish;GetPublishProjectPath" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences)" RebaseOutputs="true">
+        <MSBuild Projects="@(_PublishProjectReferencesToPublishTarget)" Targets="Publish;GetPublishProjectPath" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);DesignTimeBuild" RebaseOutputs="true">
             <Output TaskParameter="TargetOutputs" ItemName="__ResolvedPublishProjectReferencePublishProjectPath" />
         </MSBuild>
         <ItemGroup>