Skip to content

Commit b3d5ef2

Browse files
jstedfastjstedfast
committedJun 13, 2020
Use a unified MailKit.csproj
1 parent 151ca82 commit b3d5ef2

20 files changed

+154
-604
lines changed
 

‎.nuget/packages.config

-6
This file was deleted.

‎.travis.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
language: csharp
2-
solution: MailKit.Net45.sln
2+
dotnet: 2.1.807
3+
solution: MailKit.sln
34
install:
45
- git submodule update --init --recursive
5-
- nuget restore submodules/MimeKit/MimeKit.Net45.sln
6-
- nuget restore MailKit.Net45.sln
6+
- dotnet restore submodules/MimeKit/MimeKit.sln
7+
- dotnet restore MailKit.sln
78
script:
8-
- msbuild /p:Configuration=Debug MailKit.Net45.sln
9-
- mono ./packages/NUnit.ConsoleRunner.3.11.1/tools/nunit3-console.exe UnitTests/bin/Debug/UnitTests.dll
9+
- msbuild /p:Configuration=Debug /p:MonoRuntime=true MailKit.sln
10+
- mono ~/.nuget/packages/nunit.consolerunner/3.11.1/tools/nunit3-console.exe UnitTests/bin/Debug/net48/UnitTests.dll

‎Documentation/Content/Frequently-Asked-Questions.aml

+39-15
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,49 @@
6060
<table>
6161
<tableHeader>
6262
<row>
63-
<entry>Protocol</entry>
64-
<entry>Standard Port</entry>
65-
<entry>SSL Port</entry>
63+
<entry>
64+
<para>Protocol</para>
65+
</entry>
66+
<entry>
67+
<para>Standard Port</para>
68+
</entry>
69+
<entry>
70+
<para>SSL Port</para>
71+
</entry>
6672
</row>
6773
</tableHeader>
6874
<row>
69-
<entry>SMTP</entry>
70-
<entry>25 or 587</entry>
71-
<entry>465</entry>
75+
<entry>
76+
<para>SMTP</para>
77+
</entry>
78+
<entry>
79+
<para>25 or 587</para>
80+
</entry>
81+
<entry>
82+
<para>465</para>
83+
</entry>
7284
</row>
7385
<row>
74-
<entry>POP3</entry>
75-
<entry>110</entry>
76-
<entry>995</entry>
86+
<entry>
87+
<para>POP3</para>
88+
</entry>
89+
<entry>
90+
<para>110</para>
91+
</entry>
92+
<entry>
93+
<para>995</para>
94+
</entry>
7795
</row>
7896
<row>
79-
<entry>IMAP</entry>
80-
<entry>143</entry>
81-
<entry>993</entry>
97+
<entry>
98+
<para>IMAP</para>
99+
</entry>
100+
<entry>
101+
<para>143</para>
102+
</entry>
103+
<entry>
104+
<para>993</para>
105+
</entry>
82106
</row>
83107
</table>
84108
<para>
@@ -226,7 +250,7 @@
226250
<linkUri>https://docs.microsoft.com/en-us/dotnet/api/system.security.authentication.sslprotocols?view=netframework-4.8</linkUri>
227251
<linkTarget>_blank</linkTarget>
228252
</externalLink>
229-
by setting the value of the <codeReference>P:MailKit.MailService.SslProtocols</codeReference>
253+
by setting the value of the <codeEntityReference>P:MailKit.MailService.SslProtocols</codeEntityReference>
230254
property on your SMTP, POP3 or IMAP client.
231255
</para>
232256
<para>For example:</para>
@@ -286,7 +310,7 @@
286310
<application>GMail Settings</application> page and make the following changes in the
287311
<application>POP3 Download</application> section:
288312
</para>
289-
<list>
313+
<list class="ordered">
290314
<listItem>
291315
<para>
292316
<application>Enable POP for all mail (even if it has already been downloaded)</application>.
@@ -791,7 +815,7 @@ message.WriteTo (options, stream);
791815
<codeEntityReference>T:MimeKit.Cryptography.OpenPgpContext</codeEntityReference>
792816
includes a
793817
<codeEntityReference>
794-
M:MimeKit.Cryptography.OpenPgpContext.DecryptTo(System.IO.Stream,System.IO.Stream,System.Threading.CancellationToken)
818+
M:MimeKit.Cryptography.OpenPgpContextBase.DecryptTo(System.IO.Stream,System.IO.Stream,System.Threading.CancellationToken)
795819
</codeEntityReference>
796820
method which can be used to get the raw decrypted stream.
797821
</para>

‎Documentation/Documentation.shfbproj

+12-12
Original file line numberDiff line numberDiff line change
@@ -139,18 +139,6 @@
139139
<None Include="Examples\InlinePGPExample.txt" />
140140
<Content Include="icons\Help.png" />
141141
</ItemGroup>
142-
<ItemGroup>
143-
<ProjectReference Include="..\submodules\MimeKit\MimeKit\MimeKit.Net45.csproj">
144-
<Name>MimeKit.Net45</Name>
145-
<Project>{d5f54a4f-d84b-430f-9271-f7861e285b3e}</Project>
146-
<Private>True</Private>
147-
</ProjectReference>
148-
<ProjectReference Include="..\MailKit\MailKit.Net45.csproj">
149-
<Name>MailKit.Net45</Name>
150-
<Project>{7264d469-a390-4c10-9c87-daa37edd3c1d}</Project>
151-
<Private>True</Private>
152-
</ProjectReference>
153-
</ItemGroup>
154142
<ItemGroup>
155143
<Image Include="media\clone.png">
156144
<ImageId>clone</ImageId>
@@ -161,6 +149,18 @@
161149
<AlternateText>Update MailKit source code via TortoiseGit using the Pull and Submodule Update buttons.</AlternateText>
162150
</Image>
163151
</ItemGroup>
152+
<ItemGroup>
153+
<ProjectReference Include="..\MailKit\MailKit.csproj">
154+
<Name>MailKit</Name>
155+
<Project>{e543a427-93de-4e65-adf2-44412e440fb1}</Project>
156+
<Private>True</Private>
157+
</ProjectReference>
158+
<ProjectReference Include="..\submodules\MimeKit\MimeKit\MimeKit.csproj">
159+
<Name>MimeKit</Name>
160+
<Project>{faec8a91-6983-4ed9-a414-09c6b65b13bb}</Project>
161+
<Private>True</Private>
162+
</ProjectReference>
163+
</ItemGroup>
164164
<!-- Import the SHFB build targets -->
165165
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
166166
</Project>

‎MailKit.Documentation.sln

+11-16
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,29 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.29926.136
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MailKit.Net45", "MailKit\MailKit.Net45.csproj", "{7264D469-A390-4C10-9C87-DAA37EDD3C1D}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MimeKit.Net45", "submodules\MimeKit\MimeKit\MimeKit.Net45.csproj", "{D5F54A4F-D84B-430F-9271-F7861E285B3E}"
9-
EndProject
106
Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "Documentation", "Documentation\Documentation.shfbproj", "{59115814-A1E3-46AE-AE30-4065AE8F4CAF}"
117
EndProject
12-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{2299B3E8-95E4-4766-9AA2-5553EAD7F375}"
13-
ProjectSection(SolutionItems) = preProject
14-
.nuget\packages.config = .nuget\packages.config
15-
EndProjectSection
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MimeKit", "submodules\MimeKit\MimeKit\MimeKit.csproj", "{FAEC8A91-6983-4ED9-A414-09C6B65B13BB}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MailKit", "MailKit\MailKit.csproj", "{E543A427-93DE-4E65-ADF2-44412E440FB1}"
1611
EndProject
1712
Global
1813
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1914
Debug|Any CPU = Debug|Any CPU
2015
Release|Any CPU = Release|Any CPU
2116
EndGlobalSection
2217
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23-
{7264D469-A390-4C10-9C87-DAA37EDD3C1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24-
{7264D469-A390-4C10-9C87-DAA37EDD3C1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
25-
{7264D469-A390-4C10-9C87-DAA37EDD3C1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
26-
{7264D469-A390-4C10-9C87-DAA37EDD3C1D}.Release|Any CPU.Build.0 = Release|Any CPU
27-
{D5F54A4F-D84B-430F-9271-F7861E285B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28-
{D5F54A4F-D84B-430F-9271-F7861E285B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
29-
{D5F54A4F-D84B-430F-9271-F7861E285B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
30-
{D5F54A4F-D84B-430F-9271-F7861E285B3E}.Release|Any CPU.Build.0 = Release|Any CPU
3118
{59115814-A1E3-46AE-AE30-4065AE8F4CAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3219
{59115814-A1E3-46AE-AE30-4065AE8F4CAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
3320
{59115814-A1E3-46AE-AE30-4065AE8F4CAF}.Release|Any CPU.Build.0 = Release|Any CPU
21+
{FAEC8A91-6983-4ED9-A414-09C6B65B13BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
22+
{FAEC8A91-6983-4ED9-A414-09C6B65B13BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
23+
{FAEC8A91-6983-4ED9-A414-09C6B65B13BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
24+
{FAEC8A91-6983-4ED9-A414-09C6B65B13BB}.Release|Any CPU.Build.0 = Release|Any CPU
25+
{E543A427-93DE-4E65-ADF2-44412E440FB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26+
{E543A427-93DE-4E65-ADF2-44412E440FB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
27+
{E543A427-93DE-4E65-ADF2-44412E440FB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
28+
{E543A427-93DE-4E65-ADF2-44412E440FB1}.Release|Any CPU.Build.0 = Release|Any CPU
3429
EndGlobalSection
3530
GlobalSection(SolutionProperties) = preSolution
3631
HideSolutionNode = FALSE

‎MailKit.Net45.sln

-86
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.