Skip to content

Commit

Permalink
No longer need to explicitly depend on System.Runtime.CompilerService…
Browse files Browse the repository at this point in the history
…s.Unsafe

(at least theoretically)

Also disabled IsAotCompatible for now since we're not there yet.
  • Loading branch information
jstedfast committed Nov 28, 2024
1 parent 51e3b92 commit afbe942
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 20 deletions.
5 changes: 2 additions & 3 deletions MimeKit/MimeKit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
<DefineConstants>$(DefineConstants);SERIALIZABLE</DefineConstants>
</PropertyGroup>

<PropertyGroup>
<!--<PropertyGroup>
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
</PropertyGroup>
</PropertyGroup>-->

<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
<Reference Include="System.Data" />
Expand All @@ -79,7 +79,6 @@
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Buffers" Version="4.6.0" />
<PackageReference Include="System.Memory" Version="4.6.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions MimeKit/MimeKitLite.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
<DefineConstants>$(DefineConstants);SERIALIZABLE</DefineConstants>
</PropertyGroup>

<PropertyGroup>
<!--<PropertyGroup>
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
</PropertyGroup>
</PropertyGroup>-->

<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard2.')) ">
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
Expand All @@ -63,7 +63,6 @@
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Buffers" Version="4.6.0" />
<PackageReference Include="System.Memory" Version="4.6.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 0 additions & 7 deletions nuget/MimeKit.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,16 @@
</frameworkAssemblies>
<dependencies>
<group targetFramework="net462">
<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" />
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
<dependency id="BouncyCastle.Cryptography" version="2.4.0" />
</group>
<group targetFramework="net47">
<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" />
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
<dependency id="BouncyCastle.Cryptography" version="2.4.0" />
</group>
<group targetFramework="net48">
<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" />
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
<dependency id="BouncyCastle.Cryptography" version="2.4.0" />
Expand All @@ -77,7 +74,6 @@
<dependency id="BouncyCastle.Cryptography" version="2.4.0" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" />
<dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
<dependency id="System.Formats.Asn1" version="8.0.1" />
<dependency id="System.Text.Encoding.CodePages" version="8.0.0" />
Expand Down Expand Up @@ -108,15 +104,12 @@
<file src="..\MimeKit\bin\Release\net462\MimeKit.dll" target="lib\net462\MimeKit.dll" />
<file src="..\MimeKit\bin\Release\net462\MimeKit.pdb" target="lib\net462\MimeKit.pdb" />
<file src="..\MimeKit\bin\Release\net462\MimeKit.xml" target="lib\net462\MimeKit.xml" />
<file src="..\MimeKit\bin\Release\net462\MimeKit.dll.config" target="lib\net462\MimeKit.dll.config" />
<file src="..\MimeKit\bin\Release\net47\MimeKit.dll" target="lib\net47\MimeKit.dll" />
<file src="..\MimeKit\bin\Release\net47\MimeKit.pdb" target="lib\net47\MimeKit.pdb" />
<file src="..\MimeKit\bin\Release\net47\MimeKit.xml" target="lib\net47\MimeKit.xml" />
<file src="..\MimeKit\bin\Release\net47\MimeKit.dll.config" target="lib\net47\MimeKit.dll.config" />
<file src="..\MimeKit\bin\Release\net48\MimeKit.dll" target="lib\net48\MimeKit.dll" />
<file src="..\MimeKit\bin\Release\net48\MimeKit.pdb" target="lib\net48\MimeKit.pdb" />
<file src="..\MimeKit\bin\Release\net48\MimeKit.xml" target="lib\net48\MimeKit.xml" />
<file src="..\MimeKit\bin\Release\net48\MimeKit.dll.config" target="lib\net48\MimeKit.dll.config" />
<file src="..\MimeKit\bin\Release\net8.0\MimeKit.dll" target="lib\net8.0\MimeKit.dll" />
<file src="..\MimeKit\bin\Release\net8.0\MimeKit.pdb" target="lib\net8.0\MimeKit.pdb" />
<file src="..\MimeKit\bin\Release\net8.0\MimeKit.xml" target="lib\net8.0\MimeKit.xml" />
Expand Down
7 changes: 0 additions & 7 deletions nuget/MimeKitLite.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,19 @@
</frameworkAssemblies>
<dependencies>
<group targetFramework="net462">
<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" />
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
</group>
<group targetFramework="net47">
<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" />
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
</group>
<group targetFramework="net48">
<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" />
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
</group>
<group targetFramework="net8.0" />
<group targetFramework="netstandard2.0">
<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" />
<dependency id="System.Text.Encoding.CodePages" version="8.0.0" />
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
Expand All @@ -85,15 +81,12 @@
<file src="..\MimeKit\bin\Release\net462\MimeKitLite.dll" target="lib\net462\MimeKitLite.dll" />
<file src="..\MimeKit\bin\Release\net462\MimeKitLite.pdb" target="lib\net462\MimeKitLite.pdb" />
<file src="..\MimeKit\bin\Release\net462\MimeKitLite.xml" target="lib\net462\MimeKitLite.xml" />
<file src="..\MimeKit\bin\Release\net462\MimeKitLite.dll.config" target="lib\net462\MimeKitLite.dll.config" />
<file src="..\MimeKit\bin\Release\net47\MimeKitLite.dll" target="lib\net47\MimeKitLite.dll" />
<file src="..\MimeKit\bin\Release\net47\MimeKitLite.pdb" target="lib\net47\MimeKitLite.pdb" />
<file src="..\MimeKit\bin\Release\net47\MimeKitLite.xml" target="lib\net47\MimeKitLite.xml" />
<file src="..\MimeKit\bin\Release\net47\MimeKitLite.dll.config" target="lib\net47\MimeKitLite.dll.config" />
<file src="..\MimeKit\bin\Release\net48\MimeKitLite.dll" target="lib\net48\MimeKitLite.dll" />
<file src="..\MimeKit\bin\Release\net48\MimeKitLite.pdb" target="lib\net48\MimeKitLite.pdb" />
<file src="..\MimeKit\bin\Release\net48\MimeKitLite.xml" target="lib\net48\MimeKitLite.xml" />
<file src="..\MimeKit\bin\Release\net48\MimeKitLite.dll.config" target="lib\net48\MimeKitLite.dll.config" />
<file src="..\MimeKit\bin\Release\net8.0\MimeKitLite.dll" target="lib\net8.0\MimeKitLite.dll" />
<file src="..\MimeKit\bin\Release\net8.0\MimeKitLite.pdb" target="lib\net8.0\MimeKitLite.pdb" />
<file src="..\MimeKit\bin\Release\net8.0\MimeKitLite.xml" target="lib\net8.0\MimeKitLite.xml" />
Expand Down

0 comments on commit afbe942

Please sign in to comment.