Skip to content

Commit

Permalink
Revert back to System.Memory 4.5.5 to see if that fixes the build
Browse files Browse the repository at this point in the history
  • Loading branch information
jstedfast committed Nov 28, 2024
1 parent afbe942 commit adf6731
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion MimeKit/MimeKit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

<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.Memory" Version="4.5.5" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion MimeKit/MimeKitLite.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

<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.Memory" Version="4.5.5" />
</ItemGroup>

<ItemGroup>
Expand Down
11 changes: 7 additions & 4 deletions nuget/MimeKit.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@
<dependencies>
<group targetFramework="net462">
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
<dependency id="System.Memory" version="4.5.5" />
<dependency id="BouncyCastle.Cryptography" version="2.4.0" />
</group>
<group targetFramework="net47">
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
<dependency id="System.Memory" version="4.5.5" />
<dependency id="BouncyCastle.Cryptography" version="2.4.0" />
</group>
<group targetFramework="net48">
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
<dependency id="System.Memory" version="4.5.5" />
<dependency id="BouncyCastle.Cryptography" version="2.4.0" />
</group>
<group targetFramework="net8.0">
Expand All @@ -79,7 +79,7 @@
<dependency id="System.Text.Encoding.CodePages" version="8.0.0" />
<dependency id="System.Data.DataSetExtensions" version="4.5.0" />
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
<dependency id="System.Memory" version="4.5.5" />
<dependency id="BouncyCastle.Cryptography" version="2.4.0" />
</group>
<group targetFramework="netstandard2.1">
Expand All @@ -104,12 +104,15 @@
<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
11 changes: 7 additions & 4 deletions nuget/MimeKitLite.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@
<dependencies>
<group targetFramework="net462">
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
<dependency id="System.Memory" version="4.5.5" />
</group>
<group targetFramework="net47">
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
<dependency id="System.Memory" version="4.5.5" />
</group>
<group targetFramework="net48">
<dependency id="System.Buffers" version="4.6.0" />
<dependency id="System.Memory" version="4.6.0" />
<dependency id="System.Memory" version="4.5.5" />
</group>
<group targetFramework="net8.0" />
<group targetFramework="netstandard2.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" />
<dependency id="System.Memory" version="4.5.5" />
</group>
<group targetFramework="netstandard2.1">
<dependency id="System.Text.Encoding.CodePages" version="8.0.0" />
Expand All @@ -81,12 +81,15 @@
<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 adf6731

Please sign in to comment.