Skip to content

Commit

Permalink
Merge pull request #17939 from Youssef1313/remove-build-workarounds
Browse files Browse the repository at this point in the history
  • Loading branch information
@MartinZikmund
MartinZikmund authored Aug 15, 2024
2 parents 5e43a74 + 2d5bdde commit a909a3e
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 95 deletions.
15 changes: 0 additions & 15 deletions src/Uno.UI/Uno.UI.Reference.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,21 +139,6 @@
</None>
</ItemGroup>

<Target Name="VS16Mac_RemoveSystemMemory" BeforeTargets="ResolveAssemblyReferences" Condition="$([MSBuild]::IsOsPlatform('OSX'))">
<!--
VS4Mac seems to process System.Memory differently, and removes
the System.Memory local reference if the package is transitively referenced.
We remove the Reference added by the nuget targets so that ResolveAssemblyReferences
is properly adding the local System.Memory to the Reference item group.
-->
<ItemGroup>
<_ReferenceToRemove Include="@(Reference)" Condition="'%(Reference.Identity)'=='System.Memory'" />
<_ReferenceToRemove Include="@(Reference)" Condition="'%(Reference.Identity)'=='System.Buffers'" />

<Reference Remove="@(_ReferenceToRemove)" />
</ItemGroup>
</Target>

<Import Project="MixinGeneration.targets" />
<Import Project="XamlMerge.targets" />

Expand Down
23 changes: 0 additions & 23 deletions src/Uno.UI/Uno.UI.Skia.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,27 +97,4 @@
</ProjectReference>
</ItemGroup>

<Target Name="VS16Mac_RemoveSystemMemory" BeforeTargets="ResolveAssemblyReferences" Condition="$([MSBuild]::IsOsPlatform('OSX'))">
<!--
VS4Mac seems to process System.Memory differently, and removes
the System.Memory local reference if the package is transitively referenced.
We remove the Reference added by the nuget targets so that ResolveAssemblyReferences
is properly adding the local System.Memory to the Reference item group.
-->
<ItemGroup>
<_ReferenceToRemove Include="@(Reference)" Condition="'%(Reference.Identity)'=='System.Memory'" />
<_ReferenceToRemove Include="@(Reference)" Condition="'%(Reference.Identity)'=='System.Buffers'" />

<Reference Remove="@(_ReferenceToRemove)" />
</ItemGroup>
</Target>

<Target Name="VS16_RemoveSystemMemory" BeforeTargets="FindReferenceAssembliesForReferences" Condition="$(IsAndroid) or $(IsIOS) or $(IsMacOS)">
<ItemGroup>
<_ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='System.Memory'" />
<_ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='System.Buffers'" />

<ReferencePath Remove="@(_ReferencePathToRemove)" />
</ItemGroup>
</Target>
</Project>
15 changes: 0 additions & 15 deletions src/Uno.UI/Uno.UI.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,6 @@
</None>
</ItemGroup>

<Target Name="VS16Mac_RemoveSystemMemory" BeforeTargets="ResolveAssemblyReferences" Condition="$([MSBuild]::IsOsPlatform('OSX'))">
<!--
VS4Mac seems to process System.Memory differently, and removes
the System.Memory local reference if the package is transitively referenced.
We remove the Reference added by the nuget targets so that ResolveAssemblyReferences
is properly adding the local System.Memory to the Reference item group.
-->
<ItemGroup>
<_ReferenceToRemove Include="@(Reference)" Condition="'%(Reference.Identity)'=='System.Memory'" />
<_ReferenceToRemove Include="@(Reference)" Condition="'%(Reference.Identity)'=='System.Buffers'" />

<Reference Remove="@(_ReferenceToRemove)" />
</ItemGroup>
</Target>

<Import Project="MixinGeneration.targets" />
<Import Project="XamlMerge.targets" />

Expand Down
22 changes: 0 additions & 22 deletions src/Uno.UI/Uno.UI.netcoremobile.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,28 +141,6 @@
</None>
</ItemGroup>

<Target Name="VS16Mac_RemoveSystemMemory" BeforeTargets="ResolveAssemblyReferences" Condition="$([MSBuild]::IsOsPlatform('OSX'))">
<!--
VS4Mac seems to process System.Memory differently, and removes
the System.Memory local reference if the package is transitively referenced.
We remove the Reference added by the nuget targets so that ResolveAssemblyReferences
is properly adding the local System.Memory to the Reference item group.
-->
<ItemGroup>
<_ReferenceToRemove Include="@(Reference)" Condition="'%(Reference.Identity)'=='System.Memory'" />
<_ReferenceToRemove Include="@(Reference)" Condition="'%(Reference.Identity)'=='System.Buffers'" />

<Reference Remove="@(_ReferenceToRemove)" />
</ItemGroup>
</Target>

<Target Name="VS16_RemoveSystemMemory" BeforeTargets="FindReferenceAssembliesForReferences" Condition="$(IsAndroid) or $(IsIOS) or $(IsMacOS)">
<ItemGroup>
<_ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='System.Memory'" />
<_ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='System.Buffers'" />
<ReferencePath Remove="@(_ReferencePathToRemove)" />
</ItemGroup>
</Target>
<Import Project="MixinGeneration.targets" />
<Import Project="XamlMerge.targets" />

Expand Down
20 changes: 0 additions & 20 deletions src/Uno.UWP/Uno.netcoremobile.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,4 @@
<ProjectReference Include="..\Uno.UI.Dispatching\Uno.UI.Dispatching.netcoremobile.csproj" />
</ItemGroup>

<Target Name="VS16Mac_RemoveSystemMemory" BeforeTargets="ResolveAssemblyReferences" Condition="$([MSBuild]::IsOsPlatform('OSX'))">
<!--
VS4Mac seems to process System.Memory differently, and removes
the System.Memory local reference if the package is transitively referenced.
We remove the Reference added by the nuget targets so that ResolveAssemblyReferences
is properly adding the local System.Memory to the Reference item group.
-->
<ItemGroup>
<_ReferenceToRemove Include="@(Reference)" Condition="'%(Reference.Identity)'=='System.Memory'" />
<Reference Remove="@(_ReferenceToRemove)" />
</ItemGroup>
</Target>

<Target Name="VS16_RemoveSystemMemory" BeforeTargets="FindReferenceAssembliesForReferences" Condition="$(IsAndroid) or $(IsIOS) or $(IsMacOS)">
<ItemGroup>
<_ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='System.Memory'" />
<ReferencePath Remove="@(_ReferencePathToRemove)" />
</ItemGroup>
</Target>

</Project>

0 comments on commit a909a3e

Please sign in to comment.