Skip to content

Commit 72809d8

Browse files
authored
Removes System.Security.Cryptography.ProtectedData runtime implementation handling
System.Security.Cryptography.ProtectedData has changed from 4.7.0 to 8.0.0: xamarin/Xamarin.Messaging#799 This new version doesn't include a specific Windows runtime implementation, so we don't need to do this extra MSBuild handling to reference the right assemblies anymore
1 parent b080c4c commit 72809d8

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,15 @@
4848

4949
<Import Project="$(MSBuildThisFileDirectory)..\ILMerge.targets" />
5050

51-
<!-- Replaces the ProtectedData assembly by the runtime implementation -->
5251
<Target Name="CopyRuntimeAssemblies" BeforeTargets="ILRepack">
5352
<ItemGroup>
5453
<ReferenceCopyLocalToRemove Include="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'System.Text.Encoding.CodePages'" />
55-
<ReferenceCopyLocalToRemove Include="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'System.Security.Cryptography.ProtectedData'" />
56-
57-
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalToRemove)" />
58-
5954
<ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(FileName)' == 'System.Text.Encoding.CodePages'" />
60-
<ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(FileName)' == 'System.Security.Cryptography.ProtectedData'" />
6155

56+
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalToRemove)" />
6257
<ReferencePath Remove="@(ReferencePathToRemove)" />
6358

6459
<ReferencePathToAdd Include="@(RuntimeTargetsCopyLocalItems)" Condition="'%(RuntimeIdentifier)' == 'win' And '%(FileName)' == 'System.Text.Encoding.CodePages'" />
65-
<ReferencePathToAdd Include="@(RuntimeTargetsCopyLocalItems)" Condition="'%(RuntimeIdentifier)' == 'win' And '%(FileName)' == 'System.Security.Cryptography.ProtectedData'" />
6660

6761
<ReferencePath Include="@(ReferencePathToAdd)">
6862
<DestinationSubDirectory />

0 commit comments

Comments
 (0)