diff --git a/Core/Requests/HangingServiceRequestBase.cs b/Core/Requests/HangingServiceRequestBase.cs
index b53881cf..0574f5d0 100644
--- a/Core/Requests/HangingServiceRequestBase.cs
+++ b/Core/Requests/HangingServiceRequestBase.cs
@@ -27,13 +27,15 @@ namespace Microsoft.Exchange.WebServices.Data
 {
     using System;
     using System.IO;
-    using System.IO.Compression;
     using System.Net;
-    using System.Text;
     using System.Threading;
     using System.Web;
     using System.Xml;
 
+#if NETSTANDARD2_0
+    using System.Net.Http;
+#endif
+
     /// <summary>
     /// Enumeration of reasons that a hanging request may disconnect.
     /// </summary>
@@ -242,12 +244,21 @@ private void ParseResponses(object state)
                     this.Disconnect(HangingRequestDisconnectReason.Exception, ex);
                     return;
                 }
+#if NETSTANDARD2_0
+                catch (HttpRequestException ex)
+                {
+                    // Stream is closed, so disconnect.
+                    this.Disconnect(HangingRequestDisconnectReason.Exception, ex);
+                    return;
+                }
+#else
                 catch (HttpException ex)
                 {
                     // Stream is closed, so disconnect.
                     this.Disconnect(HangingRequestDisconnectReason.Exception, ex);
                     return;
                 }
+#endif
                 catch (WebException ex)
                 {
                     // Stream is closed, so disconnect.
diff --git a/Microsoft.Exchange.WebServices.Data.csproj b/Microsoft.Exchange.WebServices.Data.csproj
index 39f1a732..43769a67 100644
--- a/Microsoft.Exchange.WebServices.Data.csproj
+++ b/Microsoft.Exchange.WebServices.Data.csproj
@@ -1,21 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F059972F-0561-4203-ABB8-3ABB41CCBE22}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Exchange.WebServices.Data</RootNamespace>
     <AssemblyName>Microsoft.Exchange.WebServices</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileUpgradeFlags />
+    <UpgradeBackupLocation />
+    <TargetFrameworks>net3.5;netstandard2.0</TargetFrameworks>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -31,36 +21,28 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <BuildDependsOn>$(BuildDependsOn);AfterBuildMigrated</BuildDependsOn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Microsoft.Exchange.WebServices.xml</DocumentationFile>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <DocumentationFile>bin\$(Configuration)\Microsoft.Exchange.WebServices.xml</DocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <Target Name="AfterBuildMigrated" Condition="'$(Configuration)' == 'Release'">
+    <!-- Download nuget.exe if we need it -->
+    <DownloadFile Condition="!Exists('$(OutputPath)\nuget.exe')" FileName="$(OutputPath)\nuget.exe" Url="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" />
+    <!-- Pack up a nuget package -->
+    <Exec Command="$(OutputPath)\nuget pack $(ProjectFileName) -Properties Configuration=Release -Symbols -OutputDirectory $(OutputPath) -IncludeReferencedProjects" />
+  </Target>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Compile Remove="fxcopexclusions.cs" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net3.5'">
     <Reference Include="System.Data" />
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Drawing" />
@@ -69,851 +51,10 @@
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ComplexProperties\PeopleInsights\CompanyInsightValue.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\CompanyInsightValueCollection.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\ComputedInsightValue.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\ComputedInsightValueProperty.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\ComputedInsightValuePropertyCollection.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\DelveDocument.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\EducationInsightValue.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\EmailInsightValue.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\InsightValue.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\InsightValueCollection.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\JobInsightValue.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\JobInsightValueCollection.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\MeetingInsightValue.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\MultiValueInsightContent.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\OutOfOfficeInsightValue.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\Person.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\PersonInsight.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\PersonInsightCollection.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\ProfileInsightValue.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\ProfileInsightValueCollection.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\SingleValueInsightContent.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\SkillInsightValue.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\SkillInsightValueCollection.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\StringInsightValue.cs" />
-    <Compile Include="ComplexProperties\PeopleInsights\UserProfilePicture.cs" />
-    <Compile Include="ComplexProperties\ReferenceAttachment.cs" />
-    <Compile Include="Core\Requests\GetOMEConfigurationRequest.cs" />
-    <Compile Include="Core\Requests\GetPeopleInsightsRequest.cs" />
-    <Compile Include="Core\Requests\SetUserPhotoRequest.cs" />
-    <Compile Include="Core\Requests\GetUserPhotoRequest.cs" />
-    <Compile Include="Core\Requests\SetOMEConfigurationRequest.cs" />
-    <Compile Include="Core\Responses\SetUserPhotoResults.cs" />
-    <Compile Include="Core\Responses\GetOMEConfigurationResponse.cs" />
-    <Compile Include="Core\Responses\GetPeopleInsightsResponse.cs" />
-    <Compile Include="Core\Responses\SetUserPhotoResponse.cs" />
-    <Compile Include="Core\Responses\GetUserPhotoResponse.cs" />
-    <Compile Include="Core\Responses\SetOMEConfigurationResponse.cs" />
-    <Compile Include="Core\Responses\RegisterConsentResponse.cs" />
-    <Compile Include="Credentials\DualAuthCredentials.cs" />
-    <Compile Include="Enumerations\ConsentState.cs" />
-    <Compile Include="Enumerations\GetUserPhotoStatus.cs" />
-    <Compile Include="Enumerations\PeopleQueryContextKeys.cs" />
-    <Compile Include="Enumerations\PeopleQuerySource.cs" />
-    <Compile Include="Enumerations\UserPhotoSize.cs" />
-    <Compile Include="Enumerations\UnifiedGroupEnumTypes.cs" />
-    <Compile Include="Groups\Requests\SetUnifiedGroupLastVisitedTimeRequest.cs" />
-    <Compile Include="Groups\Requests\GetUnifiedGroupUnseenCountRequest.cs" />
-    <Compile Include="Groups\Requests\GetUserUnifiedGroupsRequest.cs" />
-    <Compile Include="Groups\ComplexProperties\RequestedUnifiedGroupsSet.cs" />
-    <Compile Include="Groups\ComplexProperties\UnifiedGroupIdentity.cs" />
-    <Compile Include="Groups\Responses\GetUnifiedGroupUnseenCountResponse.cs" />
-    <Compile Include="Groups\Responses\GetUserUnifiedGroupsResponse.cs" />
-    <Compile Include="Groups\ComplexProperties\UnifiedGroup.cs" />
-    <Compile Include="Groups\ComplexProperties\UnifiedGroupsSet.cs" />
-    <Compile Include="Interfaces\IPeopleQueryResults.cs" />
-    <Compile Include="Properties\AssemblyInfoMicrosoft.cs" />
-    <Compile Include="Properties\AssemblyInfoOpenSource.cs" />
-    <Compile Include="Attributes\AttachableAttribute.cs" />
-    <Compile Include="Attributes\EwsEnumAttribute.cs" />
-    <Compile Include="Attributes\RequiredServerVersionAttribute.cs" />
-    <Compile Include="Attributes\ServiceObjectDefinitionAttribute.cs" />
-    <Compile Include="Attributes\SchemaAttribute.cs" />
-    <Compile Include="Autodiscover\AlternateMailboxCollection.cs" />
-    <Compile Include="Autodiscover\AutodiscoverDnsClient.cs" />
-    <Compile Include="Autodiscover\AutodiscoverError.cs" />
-    <Compile Include="Autodiscover\ComparisonHelpers.cs" />
-    <Compile Include="Autodiscover\DirectoryHelper.cs" />
-    <Compile Include="Autodiscover\DocumentSharingLocation.cs" />
-    <Compile Include="Autodiscover\DocumentSharingLocationCollection.cs" />
-    <Compile Include="Autodiscover\DomainSettingError.cs" />
-    <Compile Include="Autodiscover\ProtocolConnection.cs" />
-    <Compile Include="Autodiscover\ProtocolConnectionCollection.cs" />
-    <Compile Include="Autodiscover\Requests\AutodiscoverRequest.cs" />
-    <Compile Include="Autodiscover\AutodiscoverResponseCollection.cs" />
-    <Compile Include="Autodiscover\AutodiscoverService.cs" />
-    <Compile Include="Autodiscover\Requests\GetDomainSettingsRequest.cs" />
-    <Compile Include="Autodiscover\Requests\GetUserSettingsRequest.cs" />
-    <Compile Include="Autodiscover\AlternateMailbox.cs" />
-    <Compile Include="Autodiscover\Responses\AutodiscoverResponse.cs" />
-    <Compile Include="Autodiscover\Responses\GetDomainSettingsResponse.cs" />
-    <Compile Include="Autodiscover\Responses\GetDomainSettingsResponseCollection.cs" />
-    <Compile Include="Autodiscover\Responses\GetUserSettingsResponse.cs" />
-    <Compile Include="Autodiscover\Responses\GetUserSettingsResponseCollection.cs" />
-    <Compile Include="Autodiscover\UserSettingError.cs" />
-    <Compile Include="Autodiscover\WebClientUrl.cs" />
-    <Compile Include="Autodiscover\WebClientUrlCollection.cs" />
-    <Compile Include="ComplexProperties\ApprovalRequestData.cs" />
-    <Compile Include="ComplexProperties\ArchiveTag.cs" />
-    <Compile Include="ComplexProperties\AttributedString.cs" />
-    <Compile Include="ComplexProperties\AttributedStringCollection.cs" />
-    <Compile Include="ComplexProperties\Attribution.cs" />
-    <Compile Include="ComplexProperties\AttributionCollection.cs" />
-    <Compile Include="ComplexProperties\Availability\CalendarEventDetails.cs" />
-    <Compile Include="ComplexProperties\Availability\Suggestion.cs" />
-    <Compile Include="ComplexProperties\ByteArrayArray.cs" />
-    <Compile Include="ComplexProperties\ChangeHighlights.cs" />
-    <Compile Include="ComplexProperties\ClientExtension.cs" />
-    <Compile Include="ComplexProperties\ClientAccessTokenRequest.cs" />
-    <Compile Include="ComplexProperties\ContactEntity.cs" />
-    <Compile Include="ComplexProperties\ContactEntityCollection.cs" />
-    <Compile Include="ComplexProperties\ConversationId.cs" />
-    <Compile Include="ComplexProperties\ConversationNodeCollection.cs" />
-    <Compile Include="ComplexProperties\ContactPhoneEntityCollection.cs" />
-    <Compile Include="ComplexProperties\ContactPhoneEntity.cs" />
-    <Compile Include="ComplexProperties\AddressEntity.cs" />
-    <Compile Include="ComplexProperties\ClientApp.cs" />
-    <Compile Include="ComplexProperties\ClientAppMetadata.cs" />
-    <Compile Include="ComplexProperties\MimeContentBase.cs" />
-    <Compile Include="ComplexProperties\MimeContentUTF8.cs" />
-    <Compile Include="ComplexProperties\UrlEntityCollection.cs" />
-    <Compile Include="ComplexProperties\EmailAddressEntityCollection.cs" />
-    <Compile Include="ComplexProperties\AddressEntityCollection.cs" />
-    <Compile Include="ComplexProperties\UrlEntity.cs" />
-    <Compile Include="ComplexProperties\EmailAddressEntity.cs" />
-    <Compile Include="ComplexProperties\ExtractedEntity.cs" />
-    <Compile Include="ComplexProperties\CreateRuleOperation.cs" />
-    <Compile Include="ComplexProperties\DeletedOccurrenceInfo.cs" />
-    <Compile Include="ComplexProperties\DeletedOccurrenceInfoCollection.cs" />
-    <Compile Include="ComplexProperties\DeleteRuleOperation.cs" />
-    <Compile Include="ComplexProperties\EmailUserEntity.cs" />
-    <Compile Include="ComplexProperties\EmailUserEntityCollection.cs" />
-    <Compile Include="ComplexProperties\EntityExtractionResult.cs" />
-    <Compile Include="ComplexProperties\Flag.cs" />
-    <Compile Include="ComplexProperties\GroupMember.cs" />
-    <Compile Include="ComplexProperties\GroupMemberCollection.cs" />
-    <Compile Include="ComplexProperties\HighlightTerm.cs" />
-    <Compile Include="ComplexProperties\ItemIdCollection.cs" />
-    <Compile Include="ComplexProperties\OnlineMeetingSettings.cs" />
-    <Compile Include="ComplexProperties\Mailbox.cs" />
-    <Compile Include="ComplexProperties\MeetingSuggestion.cs" />
-    <Compile Include="ComplexProperties\MeetingSuggestionCollection.cs" />
-    <Compile Include="ComplexProperties\NormalizedBody.cs" />
-    <Compile Include="ComplexProperties\TextBody.cs" />
-    <Compile Include="ComplexProperties\PersonaId.cs" />
-    <Compile Include="ComplexProperties\PersonaPostalAddress.cs" />
-    <Compile Include="ComplexProperties\PhoneEntity.cs" />
-    <Compile Include="ComplexProperties\PhoneEntityCollection.cs" />
-    <Compile Include="ComplexProperties\PolicyTag.cs" />
-    <Compile Include="ComplexProperties\Recurrence\DayOfTheWeekCollection.cs" />
-    <Compile Include="ComplexProperties\RecurringAppointmentMasterId.cs" />
-    <Compile Include="ComplexProperties\RetentionTagBase.cs" />
-    <Compile Include="ComplexProperties\Rule.cs" />
-    <Compile Include="ComplexProperties\RuleActions.cs" />
-    <Compile Include="ComplexProperties\RuleCollection.cs" />
-    <Compile Include="ComplexProperties\RuleError.cs" />
-    <Compile Include="ComplexProperties\RuleErrorCollection.cs" />
-    <Compile Include="ComplexProperties\RuleOperation.cs" />
-    <Compile Include="ComplexProperties\RuleOperationError.cs" />
-    <Compile Include="ComplexProperties\RuleOperationErrorCollection.cs" />
-    <Compile Include="ComplexProperties\RulePredicateDateRange.cs" />
-    <Compile Include="ComplexProperties\RulePredicates.cs" />
-    <Compile Include="ComplexProperties\RulePredicateSizeRange.cs" />
-    <Compile Include="ComplexProperties\SetClientExtensionAction.cs" />
-    <Compile Include="ComplexProperties\SetRuleOperation.cs" />
-    <Compile Include="ComplexProperties\TaskSuggestion.cs" />
-    <Compile Include="ComplexProperties\TaskSuggestionCollection.cs" />
-    <Compile Include="ComplexProperties\TimeZones\AbsoluteDateTransition.cs" />
-    <Compile Include="ComplexProperties\TimeZones\AbsoluteDayOfMonthTransition.cs" />
-    <Compile Include="ComplexProperties\TimeZones\AbsoluteMonthTransition.cs" />
-    <Compile Include="ComplexProperties\TimeZones\RelativeDayOfMonthTransition.cs" />
-    <Compile Include="ComplexProperties\TimeZones\TimeZoneDefinition.cs" />
-    <Compile Include="ComplexProperties\TimeZones\TimeZonePeriod.cs" />
-    <Compile Include="ComplexProperties\TimeZones\TimeZoneTransition.cs" />
-    <Compile Include="ComplexProperties\TimeZones\TimeZoneTransitionGroup.cs" />
-    <Compile Include="ComplexProperties\UniqueBody.cs" />
-    <Compile Include="ComplexProperties\VotingInformation.cs" />
-    <Compile Include="ComplexProperties\VotingOptionData.cs" />
-    <Compile Include="Core\EwsHttpWebRequest.cs" />
-    <Compile Include="Core\EwsHttpWebRequestFactory.cs" />
-    <Compile Include="Core\EwsHttpWebResponse.cs" />
-    <Compile Include="Core\EwsServiceMultiResponseXmlReader.cs" />
-    <Compile Include="Core\Requests\ApplyConversationActionRequest.cs" />
-    <Compile Include="Core\Requests\ArchiveItemRequest.cs" />
-    <Compile Include="Core\Requests\AsyncRequestResult.cs" />
-    <Compile Include="ComplexProperties\ConversationRequest.cs" />
-    <Compile Include="ComplexProperties\ConversationResponse.cs" />
-    <Compile Include="Core\Requests\DisableAppRequest.cs" />
-    <Compile Include="Core\Requests\GetClientAccessTokenRequest.cs" />
-    <Compile Include="Core\Requests\GetAppMarketplaceUrlRequest.cs" />
-    <Compile Include="Core\Requests\GetClientExtensionRequest.cs" />
-    <Compile Include="Core\Requests\GetConversationItemsRequest.cs" />
-    <Compile Include="Core\Requests\EmptyFolderRequest.cs" />
-    <Compile Include="Core\Requests\ExecuteDiagnosticMethodRequest.cs" />
-    <Compile Include="Core\Requests\ExpandGroupRequest.cs" />
-    <Compile Include="Core\Requests\FindConversationRequest.cs" />
-    <Compile Include="Core\Requests\GetAppManifestsRequest.cs" />
-    <Compile Include="Core\Requests\GetDiscoverySearchConfigurationRequest.cs" />
-    <Compile Include="Core\Requests\GetHoldOnMailboxesRequest.cs" />
-    <Compile Include="Core\Requests\GetInboxRulesRequest.cs" />
-    <Compile Include="Core\Requests\GetNonIndexableItemDetailsRequest.cs" />
-    <Compile Include="Core\Requests\GetNonIndexableItemStatisticsRequest.cs" />
-    <Compile Include="Core\Requests\GetPasswordExpirationDateRequest.cs" />
-    <Compile Include="Core\Requests\GetRoomsRequest.cs" />
-    <Compile Include="Core\Requests\GetRoomListsRequest.cs" />
-    <Compile Include="Core\Requests\GetSearchableMailboxesRequest.cs" />
-    <Compile Include="Core\Requests\GetServerTimeZonesRequest.cs" />
-    <Compile Include="Core\Requests\InstallAppRequest.cs" />
-    <Compile Include="Core\Requests\MarkAsJunkRequest.cs" />
-    <Compile Include="Core\Requests\RegisterConsentRequest.cs" />
-    <Compile Include="Core\Requests\SearchMailboxesRequest.cs" />
-    <Compile Include="Core\Requests\SetClientExtensionRequest.cs" />
-    <Compile Include="Core\Requests\SetHoldOnMailboxesRequest.cs" />
-    <Compile Include="Core\Requests\GetUserRetentionPolicyTagsRequest.cs" />
-    <Compile Include="Core\Requests\MarkAllItemsAsReadRequest.cs" />
-    <Compile Include="Core\Requests\SetTeamMailboxRequest.cs" />
-    <Compile Include="Core\Requests\UninstallAppRequest.cs" />
-    <Compile Include="Core\Requests\UnpinTeamMailboxRequest.cs" />
-    <Compile Include="Core\Requests\UpdateInboxRulesRequest.cs" />
-    <Compile Include="Core\Requests\GetStreamingEventsRequest.cs" />
-    <Compile Include="Core\Requests\HangingServiceRequestBase.cs" />
-    <Compile Include="Core\Requests\SimpleServiceRequestBase.cs" />
-    <Compile Include="Core\Requests\SubscribeToStreamingNotificationsRequest.cs" />
-    <Compile Include="ComplexProperties\ConversationNode.cs" />
-    <Compile Include="Core\Responses\DisableAppResponse.cs" />
-    <Compile Include="Core\Responses\ArchiveItemResponse.cs" />
-    <Compile Include="Core\Responses\GetClientAccessTokenResponse.cs" />
-    <Compile Include="Core\Responses\GetAppMarketplaceUrlResponse.cs" />
-    <Compile Include="Core\Responses\GetClientExtensionResponse.cs" />
-    <Compile Include="Core\Responses\GetConversationItemsResponse.cs" />
-    <Compile Include="Core\Responses\ExecuteDiagnosticMethodResponse.cs" />
-    <Compile Include="Core\Responses\ExpandGroupResponse.cs" />
-    <Compile Include="Core\Responses\AttendeeAvailability.cs" />
-    <Compile Include="Core\Responses\FindConversationResponse.cs" />
-    <Compile Include="Core\Responses\GetAppManifestsResponse.cs" />
-    <Compile Include="Core\Responses\GetDiscoverySearchConfigurationResponse.cs" />
-    <Compile Include="Core\Responses\GetHoldOnMailboxesResponse.cs" />
-    <Compile Include="Core\Responses\GetInboxRulesResponse.cs" />
-    <Compile Include="Core\Responses\GetNonIndexableItemDetailsResponse.cs" />
-    <Compile Include="Core\Responses\GetNonIndexableItemStatisticsResponse.cs" />
-    <Compile Include="Core\Responses\GetPasswordExpirationDateResponse.cs" />
-    <Compile Include="Core\Responses\GetRoomsResponse.cs" />
-    <Compile Include="Core\Responses\GetRoomListsResponse.cs" />
-    <Compile Include="Core\Responses\GetSearchableMailboxesResponse.cs" />
-    <Compile Include="Core\Responses\GetServerTimeZonesResponse.cs" />
-    <Compile Include="Core\Responses\InstallAppResponse.cs" />
-    <Compile Include="Core\Responses\MarkAsJunkResponse.cs" />
-    <Compile Include="Core\Responses\SearchMailboxesResponse.cs" />
-    <Compile Include="Core\Responses\SetHoldOnMailboxesResponse.cs" />
-    <Compile Include="Core\Responses\GetUserRetentionPolicyTagsResponse.cs" />
-    <Compile Include="Core\Responses\UninstallAppResponse.cs" />
-    <Compile Include="Core\Responses\UpdateInboxRulesResponse.cs" />
-    <Compile Include="Core\Responses\GetStreamingEventsResponse.cs" />
-    <Compile Include="Core\ServiceObjects\Items\ContactGroup.cs" />
-    <Compile Include="Core\ServiceObjects\Items\Conversation.cs" />
-    <Compile Include="Core\ServiceObjects\Items\Persona.cs" />
-    <Compile Include="Core\ServiceObjects\ResponseObjects\CalendarResponseMessageBase.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\ContactGroupSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\ConversationSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\MeetingResponseSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\MeetingCancellationSchema.cs" />
-    <Compile Include="Credentials\BasicAuthModuleForUTF8.cs" />
-    <Compile Include="Credentials\ClientCertificateCredentials.cs" />
-    <Compile Include="Credentials\OAuthCredentials.cs" />
-    <Compile Include="Credentials\PartnerTokenCredentials.cs" />
-    <Compile Include="Credentials\TokenCredentials.cs" />
-    <Compile Include="Credentials\WSSecurityBasedCredentials.cs" />
-    <Compile Include="Credentials\WSSecurityUtilityIdSignedXml.cs" />
-    <Compile Include="Credentials\X509CertificateCredentials.cs" />
-    <Compile Include="Dns\DnsClient.cs" />
-    <Compile Include="Dns\DnsNativeMethods.cs" />
-    <Compile Include="Dns\DnsRecord.cs" />
-    <Compile Include="Dns\DnsRecordHeader.cs" />
-    <Compile Include="Dns\DnsSrvRecord.cs" />
-    <Compile Include="Elc\RetentionPolicyTag.cs" />
-    <Compile Include="ComplexProperties\EnhancedLocation.cs" />
-    <Compile Include="Enumerations\ClientExtensionProvidedTo.cs" />
-    <Compile Include="Enumerations\ConversationAction.cs" />
-    <Compile Include="Enumerations\ConversationFlagStatus.cs" />
-    <Compile Include="Enumerations\ConversationQueryTraversal.cs" />
-    <Compile Include="Enumerations\ConversationSortOrder.cs" />
-    <Compile Include="Enumerations\ClientAccessTokenType.cs" />
-    <Compile Include="Enumerations\IconIndex.cs" />
-    <Compile Include="Enumerations\EmailPosition.cs" />
-    <Compile Include="Enumerations\MailboxSearchScopeType.cs" />
-    <Compile Include="Enumerations\PreviewItemBaseShape.cs" />
-    <Compile Include="Enumerations\PrivilegedLogonType.cs" />
-    <Compile Include="Enumerations\HoldAction.cs" />
-    <Compile Include="Enumerations\HoldStatus.cs" />
-    <Compile Include="Enumerations\ElcFolderType.cs" />
-    <Compile Include="Enumerations\ExtensionInstallScope.cs" />
-    <Compile Include="Enumerations\ExtensionType.cs" />
-    <Compile Include="Enumerations\DateTimePrecision.cs" />
-    <Compile Include="Enumerations\DayOfTheWeek.cs" />
-    <Compile Include="Enumerations\DayOfTheWeekIndex.cs" />
-    <Compile Include="Enumerations\DnsRecordType.cs" />
-    <Compile Include="Enumerations\AvailabilityData.cs" />
-    <Compile Include="Enumerations\ConflictType.cs" />
-    <Compile Include="Enumerations\DomainSettingName.cs" />
-    <Compile Include="Enumerations\FlaggedForAction.cs" />
-    <Compile Include="Enumerations\ItemFlagStatus.cs" />
-    <Compile Include="Enumerations\LocationSource.cs" />
-    <Compile Include="Enumerations\MailboxSearchLocation.cs" />
-    <Compile Include="Enumerations\ResolveNameSearchLocation.cs" />
-    <Compile Include="Enumerations\RetentionActionType.cs" />
-    <Compile Include="Enumerations\RetentionType.cs" />
-    <Compile Include="Enumerations\RuleErrorCode.cs" />
-    <Compile Include="Enumerations\RuleProperty.cs" />
-    <Compile Include="Enumerations\SearchPageDirection.cs" />
-    <Compile Include="Enumerations\SearchResultType.cs" />
-    <Compile Include="Enumerations\SendPrompt.cs" />
-    <Compile Include="Enumerations\ServiceErrorHandling.cs" />
-    <Compile Include="Enumerations\SetClientExtensionActionId.cs" />
-    <Compile Include="Enumerations\TeamMailboxLifecycleState.cs" />
-    <Compile Include="Enumerations\TraceFlags.cs" />
-    <Compile Include="Enumerations\ViewFilter.cs" />
-    <Compile Include="Exceptions\AccountIsLockedException.cs" />
-    <Compile Include="Exceptions\ServerBusyException.cs" />
-    <Compile Include="Exceptions\DnsException.cs" />
-    <Compile Include="Exceptions\TimeZoneConversionException.cs" />
-    <Compile Include="Exceptions\UpdateInboxRulesException.cs" />
-    <Compile Include="Interfaces\ICalendarActionProvider.cs" />
-    <Compile Include="Interfaces\IEwsHttpWebRequest.cs" />
-    <Compile Include="Interfaces\IEwsHttpWebRequestFactory.cs" />
-    <Compile Include="Interfaces\IEwsHttpWebResponse.cs" />
-    <Compile Include="Interfaces\ISearchStringProvider.cs" />
-    <Compile Include="MailboxSearch\DiscoverySearchConfiguration.cs" />
-    <Compile Include="MailboxSearch\ExtendedAttributes.cs" />
-    <Compile Include="MailboxSearch\FailedSearchMailbox.cs" />
-    <Compile Include="MailboxSearch\Versioning.cs" />
-    <Compile Include="MailboxSearch\NonIndexableItemParameters.cs" />
-    <Compile Include="MailboxSearch\KeywordStatisticsSearchResult.cs" />
-    <Compile Include="MailboxSearch\MailboxHoldResult.cs" />
-    <Compile Include="MailboxSearch\MailboxQuery.cs" />
-    <Compile Include="MailboxSearch\NonIndexableItem.cs" />
-    <Compile Include="MailboxSearch\NonIndexableItemDetailsResult.cs" />
-    <Compile Include="MailboxSearch\NonIndexableItemStatistic.cs" />
-    <Compile Include="MailboxSearch\PreviewItemResponseShape.cs" />
-    <Compile Include="MailboxSearch\SearchableMailbox.cs" />
-    <Compile Include="MailboxSearch\SearchMailboxesParameters.cs" />
-    <Compile Include="MailboxSearch\SearchMailboxesResult.cs" />
-    <Compile Include="MailboxSearch\SearchPreviewItem.cs" />
-    <Compile Include="MailboxSearch\SetHoldOnMailboxesParameters.cs" />
-    <Compile Include="Misc\CalendarActionResults.cs" />
-    <Compile Include="Misc\ConversationAction.cs" />
-    <Compile Include="Misc\ManagementRole.cs" />
-    <Compile Include="Misc\PrivilegedUserId.cs" />
-    <Compile Include="Misc\ExpandGroupResults.cs" />
-    <Compile Include="Misc\HangingTraceStream.cs" />
-    <Compile Include="Misc\MapiTypeConverter.cs" />
-    <Compile Include="Misc\MapiTypeConverterMapEntry.cs" />
-    <Compile Include="Misc\MobilePhone.cs" />
-    <Compile Include="Notifications\GetStreamingEventsResults.cs" />
-    <Compile Include="Notifications\NotificationEventArgs.cs" />
-    <Compile Include="Notifications\StreamingSubscription.cs" />
-    <Compile Include="Notifications\StreamingSubscriptionConnection.cs" />
-    <Compile Include="Notifications\SubscriptionErrorEventArgs.cs" />
-    <Compile Include="PropertyDefinitions\AttachmentsPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\ListValuePropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\GroupMemberPropertyDefinition.cs" />
-    <Compile Include="Notifications\FolderEvent.cs" />
-    <Compile Include="Notifications\GetEventsResults.cs" />
-    <Compile Include="Notifications\ItemEvent.cs" />
-    <Compile Include="Misc\Availability\AttendeeInfo.cs" />
-    <Compile Include="ComplexProperties\Availability\Conflict.cs" />
-    <Compile Include="Misc\Availability\AvailabilityOptions.cs" />
-    <Compile Include="Misc\Availability\GetUserAvailabilityResults.cs" />
-    <Compile Include="Misc\Availability\LegacyAvailabilityTimeZone.cs" />
-    <Compile Include="Misc\Availability\LegacyAvailabilityTimeZoneTime.cs" />
-    <Compile Include="PropertyDefinitions\MeetingTimeZonePropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\ScopedDateTimePropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\StartTimeZonePropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\TimeZonePropertyDefinition.cs" />
-    <Compile Include="Exceptions\AutodiscoverResponseException.cs" />
-    <Compile Include="Search\ConversationIndexedItemView.cs" />
-    <Compile Include="Search\FindConversationResults.cs" />
-    <Compile Include="Search\FolderView.cs" />
-    <Compile Include="Search\GetUserPhotoResults.cs" />
-    <Compile Include="Search\ItemView.cs" />
-    <Compile Include="Search\PeopleIndexedItemView.cs" />
-    <Compile Include="Search\OrderByCollection.cs" />
-    <Compile Include="Search\PeopleQueryMode.cs" />
-    <Compile Include="Search\PeopleQueryResults.cs" />
-    <Compile Include="Search\SeekToConditionItemView.cs" />
-    <Compile Include="Security\SafeXmlDocument.cs" />
-    <Compile Include="Security\SafeXmlFactory.cs" />
-    <Compile Include="Security\SafeXmlSchema.cs" />
-    <Compile Include="Security\XmlDtdException.cs" />
-    <Compile Include="Strings.cs" />
-    <Compile Include="UnifiedMessaging\PhoneCallId.cs" />
-    <Compile Include="Core\EwsServiceXmlReader.cs" />
-    <Compile Include="Core\EwsServiceXmlWriter.cs" />
-    <Compile Include="Core\ExchangeServerInfo.cs" />
-    <Compile Include="Core\ExchangeServiceBase.cs" />
-    <Compile Include="Core\Requests\DeleteUserConfigurationRequest.cs" />
-    <Compile Include="Core\Requests\DisconnectPhoneCallRequest.cs" />
-    <Compile Include="Core\Requests\GetPhoneCallRequest.cs" />
-    <Compile Include="Core\Requests\GetUserConfigurationRequest.cs" />
-    <Compile Include="Core\Requests\PlayOnPhoneRequest.cs" />
-    <Compile Include="Core\Requests\UpdateUserConfigurationRequest.cs" />
-    <Compile Include="Core\Requests\CreateUserConfigurationRequest.cs" />
-    <Compile Include="Core\Requests\GetFolderRequestBase.cs" />
-    <Compile Include="Core\Requests\GetFolderRequestForLoad.cs" />
-    <Compile Include="Core\Requests\GetItemRequestBase.cs" />
-    <Compile Include="Core\Requests\GetItemRequestForLoad.cs" />
-    <Compile Include="Core\Responses\GetPhoneCallResponse.cs" />
-    <Compile Include="Core\Responses\GetUserConfigurationResponse.cs" />
-    <Compile Include="Core\Responses\PlayOnPhoneResponse.cs" />
-    <Compile Include="UnifiedMessaging\PhoneCall.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\CancelMeetingMessageSchema.cs" />
-    <Compile Include="UnifiedMessaging\UnifiedMessaging.cs" />
-    <Compile Include="Credentials\ExchangeCredentials.cs" />
-    <Compile Include="Credentials\WebCredentials.cs" />
-    <Compile Include="Credentials\WindowsLiveCredentials.cs" />
-    <Compile Include="Enumerations\AutodiscoverEndpoints.cs" />
-    <Compile Include="Enumerations\AutodiscoverErrorCode.cs" />
-    <Compile Include="Enumerations\ConnectionFailureCause.cs" />
-    <Compile Include="Enumerations\MemberStatus.cs" />
-    <Compile Include="Enumerations\PhoneCallState.cs" />
-    <Compile Include="Enumerations\TaskMode.cs" />
-    <Compile Include="Enumerations\UserConfigurationProperties.cs" />
-    <Compile Include="Enumerations\UserConfigurationDictionaryObjectType.cs" />
-    <Compile Include="Enumerations\UserSettingName.cs" />
-    <Compile Include="Exceptions\AutodiscoverLocalException.cs" />
-    <Compile Include="Exceptions\AutodiscoverRemoteException.cs" />
-    <Compile Include="Enumerations\AutodiscoverResponseType.cs" />
-    <Compile Include="Autodiscover\ConfigurationSettings\ConfigurationSettingsBase.cs" />
-    <Compile Include="Autodiscover\ConfigurationSettings\Outlook\OutlookAccount.cs" />
-    <Compile Include="Autodiscover\ConfigurationSettings\Outlook\OutlookConfigurationSettings.cs" />
-    <Compile Include="Autodiscover\ConfigurationSettings\Outlook\OutlookProtocol.cs" />
-    <Compile Include="Enumerations\OutlookProtocolType.cs" />
-    <Compile Include="Autodiscover\ConfigurationSettings\Outlook\OutlookUser.cs" />
-    <Compile Include="ComplexProperties\AppointmentOccurrenceId.cs" />
-    <Compile Include="ComplexProperties\Availability\CalendarEvent.cs" />
-    <Compile Include="ComplexProperties\DelegatePermissions.cs" />
-    <Compile Include="ComplexProperties\DelegateUser.cs" />
-    <Compile Include="ComplexProperties\FolderId.cs" />
-    <Compile Include="ComplexProperties\Availability\OofSettings.cs" />
-    <Compile Include="ComplexProperties\GenericItemAttachment.cs" />
-    <Compile Include="ComplexProperties\ItemId.cs" />
-    <Compile Include="ComplexProperties\FolderIdCollection.cs" />
-    <Compile Include="ComplexProperties\FolderPermission.cs" />
-    <Compile Include="ComplexProperties\ManagedFolderInformation.cs" />
-    <Compile Include="ComplexProperties\FolderPermissionCollection.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Patterns\Recurrence.DailyPattern.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Patterns\Recurrence.RelativeMonthlyPattern.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Patterns\Recurrence.MonthlyPattern.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Patterns\Recurrence.WeeklyPattern.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Patterns\Recurrence.RelativeYearlyPattern.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Patterns\Recurrence.YearlyPattern.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Patterns\Recurrence.IntervalPattern.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Patterns\Recurrence.DailyRegenerationPattern.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Patterns\Recurrence.MonthlyRegenerationPattern.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Patterns\Recurrence.WeeklyRegenerationPattern.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Patterns\Recurrence.YearlyRegenerationPattern.cs" />
-    <Compile Include="ComplexProperties\SearchFolderParameters.cs" />
-    <Compile Include="ComplexProperties\Availability\TimeSuggestion.cs" />
-    <Compile Include="ComplexProperties\UserConfigurationDictionary.cs" />
-    <Compile Include="ComplexProperties\UserId.cs" />
-    <Compile Include="ComplexProperties\Availability\WorkingHours.cs" />
-    <Compile Include="ComplexProperties\Availability\WorkingPeriod.cs" />
-    <Compile Include="Core\LazyMember.cs" />
-    <Compile Include="Core\Requests\AddDelegateRequest.cs" />
-    <Compile Include="Core\Requests\ConvertIdRequest.cs" />
-    <Compile Include="Core\Requests\DelegateManagementRequestBase.cs" />
-    <Compile Include="Core\Requests\GetDelegateRequest.cs" />
-    <Compile Include="Core\Requests\GetUserAvailabilityRequest.cs" />
-    <Compile Include="Core\Requests\GetUserOofSettingsRequest.cs" />
-    <Compile Include="Core\Requests\RemoveDelegateRequest.cs" />
-    <Compile Include="Core\Requests\ServiceRequestBase.cs" />
-    <Compile Include="Core\Requests\SetUserOofSettingsRequest.cs" />
-    <Compile Include="Core\Requests\UpdateDelegateRequest.cs" />
-    <Compile Include="Core\Responses\ConvertIdResponse.cs" />
-    <Compile Include="Core\Responses\DelegateManagementResponse.cs" />
-    <Compile Include="Core\Responses\DelegateUserResponse.cs" />
-    <Compile Include="Core\Responses\GetDelegateResponse.cs" />
-    <Compile Include="Core\Responses\GetUserOofSettingsResponse.cs" />
-    <Compile Include="Core\Responses\SuggestionsResponse.cs" />
-    <Compile Include="Core\ServiceObjects\Items\Item.cs" />
-    <Compile Include="Exceptions\BatchServiceResponseException.cs" />
-    <Compile Include="Exceptions\ServiceObjectPropertyException.cs" />
-    <Compile Include="Misc\DelegateInformation.cs" />
-    <Compile Include="Misc\UserConfiguration.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\AppointmentSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\CalendarResponseObjectSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\ContactSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\EmailMessageSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\FolderSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\ItemSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\MeetingMessageSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\MeetingRequestSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\PersonaSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\PostItemSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\PostReplySchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\ResponseMessageSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\ResponseObjectSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\SearchFolderSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\ServiceObjectSchema.cs" />
-    <Compile Include="Core\ServiceObjects\Schemas\TaskSchema.cs" />
-    <Compile Include="Core\ServiceObjects\ServiceObjectInfo.cs" />
-    <Compile Include="Enumerations\AffectedTaskOccurrence.cs" />
-    <Compile Include="Enumerations\AggregateType.cs" />
-    <Compile Include="Enumerations\ChangeType.cs" />
-    <Compile Include="Enumerations\ConnectingIdType.cs" />
-    <Compile Include="Enumerations\ComparisonMode.cs" />
-    <Compile Include="Enumerations\ContainmentMode.cs" />
-    <Compile Include="Enumerations\SyncFolderItemsScope.cs" />
-    <Compile Include="Enumerations\DelegateFolderPermissionLevel.cs" />
-    <Compile Include="Enumerations\EffectiveRights.cs" />
-    <Compile Include="Enumerations\ExchangeVersion.cs" />
-    <Compile Include="Enumerations\FreeBusyViewType.cs" />
-    <Compile Include="Enumerations\IdFormat.cs" />
-    <Compile Include="Enumerations\LogicalOperator.cs" />
-    <Compile Include="Enumerations\MeetingAttendeeType.cs" />
-    <Compile Include="Enumerations\MeetingRequestsDeliveryScope.cs" />
-    <Compile Include="Enumerations\OofExternalAudience.cs" />
-    <Compile Include="Enumerations\ItemTraversal.cs" />
-    <Compile Include="Enumerations\OofState.cs" />
-    <Compile Include="Enumerations\PhysicalAddressIndex.cs" />
-    <Compile Include="Enumerations\ResponseActions.cs" />
-    <Compile Include="Enumerations\ResponseMessageType.cs" />
-    <Compile Include="Enumerations\SendCancellationsMode.cs" />
-    <Compile Include="Enumerations\ServiceObjectType.cs" />
-    <Compile Include="Enumerations\FolderPermissionLevel.cs" />
-    <Compile Include="Enumerations\FolderPermissionReadAccess.cs" />
-    <Compile Include="Enumerations\PermissionScope.cs" />
-    <Compile Include="Enumerations\SearchFolderTraversal.cs" />
-    <Compile Include="Enumerations\SortDirection.cs" />
-    <Compile Include="Enumerations\StandardUser.cs" />
-    <Compile Include="ComplexProperties\Attachment.cs" />
-    <Compile Include="ComplexProperties\AttachmentCollection.cs" />
-    <Compile Include="ComplexProperties\Attendee.cs" />
-    <Compile Include="ComplexProperties\AttendeeCollection.cs" />
-    <Compile Include="ComplexProperties\CompleteName.cs" />
-    <Compile Include="ComplexProperties\DictionaryProperty.cs" />
-    <Compile Include="ComplexProperties\DictionaryEntryProperty.cs" />
-    <Compile Include="ComplexProperties\EmailAddressDictionary.cs" />
-    <Compile Include="ComplexProperties\EmailAddressEntry.cs" />
-    <Compile Include="ComplexProperties\ExtendedProperty.cs" />
-    <Compile Include="ComplexProperties\ExtendedPropertyCollection.cs" />
-    <Compile Include="ComplexProperties\ImAddressDictionary.cs" />
-    <Compile Include="ComplexProperties\ImAddressEntry.cs" />
-    <Compile Include="ComplexProperties\ItemCollection.cs" />
-    <Compile Include="ComplexProperties\MeetingTimeZone.cs" />
-    <Compile Include="ComplexProperties\PhoneNumberDictionary.cs" />
-    <Compile Include="ComplexProperties\PhoneNumberEntry.cs" />
-    <Compile Include="ComplexProperties\PhysicalAddressDictionary.cs" />
-    <Compile Include="ComplexProperties\PhysicalAddressEntry.cs" />
-    <Compile Include="ComplexProperties\InternetMessageHeader.cs" />
-    <Compile Include="ComplexProperties\InternetMessageHeaderCollection.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Ranges\EndDateRecurrenceRange.cs" />
-    <Compile Include="ComplexProperties\MessageBody.cs" />
-    <Compile Include="ComplexProperties\ComplexProperty.cs" />
-    <Compile Include="ComplexProperties\ComplexPropertyCollection.cs" />
-    <Compile Include="ComplexProperties\EmailAddress.cs" />
-    <Compile Include="ComplexProperties\EmailAddressCollection.cs" />
-    <Compile Include="ComplexProperties\FileAttachment.cs" />
-    <Compile Include="ComplexProperties\ItemAttachment.cs" />
-    <Compile Include="ComplexProperties\MimeContent.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Ranges\NoEndRecurrenceRange.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Ranges\NumberedRecurrenceRange.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Patterns\Recurrence.cs" />
-    <Compile Include="ComplexProperties\OccurrenceInfo.cs" />
-    <Compile Include="ComplexProperties\OccurrenceInfoCollection.cs" />
-    <Compile Include="ComplexProperties\PersonaEmailAddress.cs" />
-    <Compile Include="ComplexProperties\PersonaEmailAddressCollection.cs" />
-    <Compile Include="ComplexProperties\Recurrence\Ranges\RecurrenceRange.cs" />
-    <Compile Include="ComplexProperties\StringList.cs" />
-    <Compile Include="ComplexProperties\TimeChange.cs" />
-    <Compile Include="ComplexProperties\TimeChangeRecurrence.cs" />
-    <Compile Include="Core\SimplePropertyBag.cs" />
-    <Compile Include="Enumerations\AppointmentType.cs" />
-    <Compile Include="Enumerations\ConflictResolutionMode.cs" />
-    <Compile Include="Enumerations\ContactSource.cs" />
-    <Compile Include="Enumerations\DeleteMode.cs" />
-    <Compile Include="Enumerations\EmailAddressKey.cs" />
-    <Compile Include="Enumerations\EventType.cs" />
-    <Compile Include="Enumerations\FileAsMapping.cs" />
-    <Compile Include="Enumerations\ImAddressKey.cs" />
-    <Compile Include="Enumerations\Importance.cs" />
-    <Compile Include="Enumerations\LegacyFreeBusyStatus.cs" />
-    <Compile Include="Enumerations\MailboxType.cs" />
-    <Compile Include="Enumerations\MapiPropertyType.cs" />
-    <Compile Include="Enumerations\MeetingRequestType.cs" />
-    <Compile Include="Enumerations\MessageDisposition.cs" />
-    <Compile Include="Enumerations\Month.cs" />
-    <Compile Include="Enumerations\PhoneNumberKey.cs" />
-    <Compile Include="Enumerations\PhysicalAddressKey.cs" />
-    <Compile Include="Enumerations\PropertyDefinitionFlags.cs" />
-    <Compile Include="Enumerations\ResponseType.cs" />
-    <Compile Include="Enumerations\SendInvitationsMode.cs" />
-    <Compile Include="Enumerations\SendInvitationsOrCancellationsMode.cs" />
-    <Compile Include="Enumerations\Sensitivity.cs" />
-    <Compile Include="Enumerations\SuggestionQuality.cs" />
-    <Compile Include="Enumerations\TaskDelegationState.cs" />
-    <Compile Include="Enumerations\TaskStatus.cs" />
-    <Compile Include="Enumerations\DefaultExtendedPropertySet.cs" />
-    <Compile Include="Exceptions\CreateAttachmentException.cs" />
-    <Compile Include="Exceptions\DeleteAttachmentException.cs" />
-    <Compile Include="Exceptions\PropertyException.cs" />
-    <Compile Include="Exceptions\ServiceLocalException.cs" />
-    <Compile Include="Exceptions\ServiceRequestException.cs" />
-    <Compile Include="Exceptions\ServiceResponseException.cs" />
-    <Compile Include="Exceptions\ServiceValidationException.cs" />
-    <Compile Include="Exceptions\ServiceVersionException.cs" />
-    <Compile Include="Exceptions\ServiceXmlSerializationException.cs" />
-    <Compile Include="Interfaces\ICustomXmlUpdateSerializer.cs" />
-    <Compile Include="Interfaces\IFileAttachmentContentHandler.cs" />
-    <Compile Include="Interfaces\IOwnedProperty.cs" />
-    <Compile Include="Core\ServiceObjects\Items\PostItem.cs" />
-    <Compile Include="Core\ServiceObjects\ResponseObjects\AcceptMeetingInvitationMessage.cs" />
-    <Compile Include="Core\ServiceObjects\Folders\CalendarFolder.cs" />
-    <Compile Include="Core\ServiceObjects\Items\Appointment.cs" />
-    <Compile Include="Core\ServiceObjects\ResponseObjects\CalendarResponseMessage.cs" />
-    <Compile Include="Core\ServiceObjects\ResponseObjects\CancelMeetingMessage.cs" />
-    <Compile Include="Core\ServiceObjects\Items\Contact.cs" />
-    <Compile Include="Core\ServiceObjects\Folders\ContactsFolder.cs" />
-    <Compile Include="Core\ServiceObjects\ResponseObjects\DeclineMeetingInvitationMessage.cs" />
-    <Compile Include="Core\ServiceObjects\Items\MeetingCancellation.cs" />
-    <Compile Include="Core\ServiceObjects\Items\MeetingMessage.cs" />
-    <Compile Include="Core\ServiceObjects\Items\MeetingRequest.cs" />
-    <Compile Include="Core\ServiceObjects\Items\MeetingResponse.cs" />
-    <Compile Include="Core\ServiceObjects\ResponseObjects\PostReply.cs" />
-    <Compile Include="Core\ServiceObjects\ResponseObjects\RemoveFromCalendar.cs" />
-    <Compile Include="Core\ServiceObjects\ResponseObjects\ResponseMessage.cs" />
-    <Compile Include="Core\ServiceObjects\ResponseObjects\SuppressReadReceipt.cs" />
-    <Compile Include="Core\ServiceObjects\Folders\SearchFolder.cs" />
-    <Compile Include="Core\ServiceObjects\Items\Task.cs" />
-    <Compile Include="Core\ServiceObjects\Folders\TasksFolder.cs" />
-    <Compile Include="Interfaces\ISelfValidate.cs" />
-    <Compile Include="Interfaces\ITraceListener.cs" />
-    <Compile Include="Misc\AbstractFolderIdWrapper.cs" />
-    <Compile Include="Misc\AbstractItemIdWrapper.cs" />
-    <Compile Include="Misc\EwsTraceListener.cs" />
-    <Compile Include="Misc\FolderIdWrapper.cs" />
-    <Compile Include="Misc\FolderWrapper.cs" />
-    <Compile Include="Misc\IdConversion\AlternateId.cs" />
-    <Compile Include="Misc\IdConversion\AlternateIdBase.cs" />
-    <Compile Include="Misc\IdConversion\AlternatePublicFolderId.cs" />
-    <Compile Include="Misc\IdConversion\AlternatePublicFolderItemId.cs" />
-    <Compile Include="Misc\FolderIdWrapperList.cs" />
-    <Compile Include="Misc\ImpersonatedUserId.cs" />
-    <Compile Include="Misc\Availability\TimeWindow.cs" />
-    <Compile Include="Misc\Availability\OofReply.cs" />
-    <Compile Include="Misc\ItemIdWrapper.cs" />
-    <Compile Include="Misc\ItemIdWrapperList.cs" />
-    <Compile Include="Misc\ItemWrapper.cs" />
-    <Compile Include="Misc\SoapFaultDetails.cs" />
-    <Compile Include="PropertyDefinitions\ComplexPropertyDefinitionBase.cs" />
-    <Compile Include="PropertyDefinitions\EffectiveRightsPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\PermissionCollectionPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\ServiceObjectPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\TaskDelegationStatePropertyDefinition.cs" />
-    <Compile Include="Search\Filters\SearchFilter.ContainsSubstring.cs" />
-    <Compile Include="Search\Filters\SearchFilter.ExcludesBitmask.cs" />
-    <Compile Include="Search\Filters\SearchFilter.Exists.cs" />
-    <Compile Include="Search\Filters\SearchFilter.IsEqualTo.cs" />
-    <Compile Include="Search\Filters\SearchFilter.IsGreaterThan.cs" />
-    <Compile Include="Search\Filters\SearchFilter.IsGreaterThanOrEqualTo.cs" />
-    <Compile Include="Search\Filters\SearchFilter.IsLessThan.cs" />
-    <Compile Include="Search\Filters\SearchFilter.IsLessThanOrEqualTo.cs" />
-    <Compile Include="Search\Filters\SearchFilter.IsNotEqualTo.cs" />
-    <Compile Include="Search\Filters\SearchFilter.Not.cs" />
-    <Compile Include="Search\Filters\SearchFilter.PropertyBasedFilter.cs" />
-    <Compile Include="Search\Filters\SearchFilter.RelationalFilter.cs" />
-    <Compile Include="Search\Filters\SearchFilter.cs" />
-    <Compile Include="Search\Filters\SearchFilter.SearchFilterCollection.cs" />
-    <Compile Include="Search\FindFoldersResults.cs" />
-    <Compile Include="Search\FindItemsResults.cs" />
-    <Compile Include="Search\FindPeopleResults.cs" />
-    <Compile Include="Search\GroupedFindItemsResults.cs" />
-    <Compile Include="Search\Grouping.cs" />
-    <Compile Include="Search\ItemGroup.cs" />
-    <Compile Include="Security\SecurityTimestamp.cs" />
-    <Compile Include="Sync\Change.cs" />
-    <Compile Include="Sync\ChangeCollection.cs" />
-    <Compile Include="Sync\FolderChange.cs" />
-    <Compile Include="Sync\ItemChange.cs" />
-    <Compile Include="Misc\DelegateTypes.cs" />
-    <Compile Include="Notifications\NotificationEvent.cs" />
-    <Compile Include="Misc\NameResolution.cs" />
-    <Compile Include="Misc\NameResolutionCollection.cs" />
-    <Compile Include="Notifications\PullSubscription.cs" />
-    <Compile Include="Notifications\PushSubscription.cs" />
-    <Compile Include="Notifications\SubscriptionBase.cs" />
-    <Compile Include="Misc\Time.cs" />
-    <Compile Include="PropertyDefinitions\ByteArrayPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\DateTimePropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\DoublePropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\ExtendedPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\GenericPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\IndexedPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\RecurrencePropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\ResponseObjectsPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\PropertyDefinitionBase.cs" />
-    <Compile Include="PropertyDefinitions\TimeSpanPropertyDefinition.cs" />
-    <Compile Include="Core\Requests\CopyFolderRequest.cs" />
-    <Compile Include="Core\Requests\CopyItemRequest.cs" />
-    <Compile Include="Core\Requests\CreateResponseObjectRequest.cs" />
-    <Compile Include="Core\ServiceObjects\ResponseObjects\ResponseObject.cs" />
-    <Compile Include="PropertyDefinitions\BoolPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\ComplexPropertyDefinition.cs" />
-    <Compile Include="Core\EwsXmlReader.cs" />
-    <Compile Include="Core\XmlAttributeNames.cs" />
-    <Compile Include="Core\XmlElementNames.cs" />
-    <Compile Include="Enumerations\ServiceResult.cs" />
-    <Compile Include="Enumerations\ServiceError.cs" />
-    <Compile Include="Enumerations\FolderTraversal.cs" />
-    <Compile Include="Enumerations\OffsetBasePoint.cs" />
-    <Compile Include="Enumerations\XmlNamespace.cs" />
-    <Compile Include="Exceptions\ServiceXmlDeserializationException.cs" />
-    <Compile Include="Core\ServiceObjects\Items\EmailMessage.cs" />
-    <Compile Include="Core\Requests\CreateAttachmentRequest.cs" />
-    <Compile Include="Core\Requests\CreateFolderRequest.cs" />
-    <Compile Include="Core\Requests\CreateItemRequest.cs" />
-    <Compile Include="Core\Requests\CreateItemRequestBase.cs" />
-    <Compile Include="Core\Requests\CreateRequest.cs" />
-    <Compile Include="Core\Requests\DeleteAttachmentRequest.cs" />
-    <Compile Include="Core\Requests\DeleteFolderRequest.cs" />
-    <Compile Include="Core\Requests\DeleteItemRequest.cs" />
-    <Compile Include="Core\Requests\DeleteRequest.cs" />
-    <Compile Include="Core\Requests\GetAttachmentRequest.cs" />
-    <Compile Include="Core\Requests\GetEventsRequest.cs" />
-    <Compile Include="Core\Requests\GetFolderRequest.cs" />
-    <Compile Include="Core\Requests\MoveCopyFolderRequest.cs" />
-    <Compile Include="Core\Requests\MoveCopyItemRequest.cs" />
-    <Compile Include="Core\Requests\MoveCopyRequest.cs" />
-    <Compile Include="Core\Requests\MoveFolderRequest.cs" />
-    <Compile Include="Core\Requests\MoveItemRequest.cs" />
-    <Compile Include="Core\Requests\ResolveNamesRequest.cs" />
-    <Compile Include="Core\Requests\SendItemRequest.cs" />
-    <Compile Include="Core\Requests\SubscribeRequest.cs" />
-    <Compile Include="Core\Requests\SubscribeToPullNotificationsRequest.cs" />
-    <Compile Include="Core\Requests\SubscribeToPushNotificationsRequest.cs" />
-    <Compile Include="Core\Requests\SyncFolderHierarchyRequest.cs" />
-    <Compile Include="Core\Requests\SyncFolderItemsRequest.cs" />
-    <Compile Include="Core\Requests\UnsubscribeRequest.cs" />
-    <Compile Include="Core\Requests\UpdateFolderRequest.cs" />
-    <Compile Include="Core\Requests\UpdateItemRequest.cs" />
-    <Compile Include="Core\Responses\CreateAttachmentResponse.cs" />
-    <Compile Include="Core\Responses\CreateFolderResponse.cs" />
-    <Compile Include="Core\Responses\CreateItemResponse.cs" />
-    <Compile Include="Core\Responses\CreateItemResponseBase.cs" />
-    <Compile Include="Core\Responses\CreateResponseObjectResponse.cs" />
-    <Compile Include="Core\Responses\DeleteAttachmentResponse.cs" />
-    <Compile Include="Core\Responses\GetAttachmentResponse.cs" />
-    <Compile Include="Core\Responses\GetEventsResponse.cs" />
-    <Compile Include="Core\Responses\GetFolderResponse.cs" />
-    <Compile Include="Core\Responses\MoveCopyFolderResponse.cs" />
-    <Compile Include="Core\Responses\MoveCopyItemResponse.cs" />
-    <Compile Include="Core\Responses\ResolveNamesResponse.cs" />
-    <Compile Include="Core\Responses\SubscribeResponse.cs" />
-    <Compile Include="Core\Responses\SyncFolderHierarchyResponse.cs" />
-    <Compile Include="Core\Responses\SyncFolderItemsResponse.cs" />
-    <Compile Include="Core\Responses\SyncResponse.cs" />
-    <Compile Include="Core\Responses\UpdateFolderResponse.cs" />
-    <Compile Include="Core\Responses\UpdateItemResponse.cs" />
-    <Compile Include="Search\CalendarView.cs" />
-    <Compile Include="Search\ViewBase.cs" />
-    <Compile Include="Search\PagedView.cs" />
-    <Compile Include="PropertyDefinitions\ContainedPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\IntPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\StringPropertyDefinition.cs" />
-    <Compile Include="PropertyDefinitions\TypedPropertyDefinition.cs" />
-    <Compile Include="Core\Requests\FindFolderRequest.cs" />
-    <Compile Include="Core\Requests\FindItemRequest.cs" />
-    <Compile Include="Core\Requests\FindPeopleRequest.cs" />
-    <Compile Include="Core\Requests\FindRequest.cs" />
-    <Compile Include="Core\Requests\GetItemRequest.cs" />
-    <Compile Include="Core\Requests\MultiResponseServiceRequest.cs" />
-    <Compile Include="Core\Requests\GetRequest.cs" />
-    <Compile Include="Core\Responses\FindFolderResponse.cs" />
-    <Compile Include="Core\Responses\FindItemResponse.cs" />
-    <Compile Include="Core\Responses\FindPeopleResponse.cs" />
-    <Compile Include="Core\Responses\GetItemResponse.cs" />
-    <Compile Include="Core\Responses\ServiceResponse.cs" />
-    <Compile Include="Core\Responses\ServiceResponseCollection.cs" />
-    <Compile Include="Enumerations\BasePropertySet.cs" />
-    <Compile Include="Enumerations\BodyType.cs" />
-    <Compile Include="Enumerations\WellKnownFolderName.cs" />
-    <Compile Include="Exceptions\ServiceRemoteException.cs" />
-    <Compile Include="ComplexProperties\ServiceId.cs" />
-    <Compile Include="Core\ExchangeService.cs" />
-    <Compile Include="Core\ServiceObjects\ServiceObject.cs" />
-    <Compile Include="Core\ServiceObjects\Folders\Folder.cs" />
-    <Compile Include="Core\PropertySet.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Core\PropertyBag.cs" />
-    <Compile Include="PropertyDefinitions\PropertyDefinition.cs" />
-    <Compile Include="Core\EwsUtilities.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ews-managed-api.nuspec" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.DirectoryServices" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="5.0.0" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets. -->
-  <UsingTask TaskName="DownloadFile" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-
-    <ParameterGroup>
-
-      <Url ParameterType="System.String" Required="true" />
-
-      <FileName ParameterType="System.String" Required="true" />
-
-    </ParameterGroup>
-
-    <Task>
-
-      <Reference Include="System" />
-
-      <Code Type="Fragment" Language="cs">
-        <![CDATA[
-		
-          new System.Net.WebClient().DownloadFile(Url, FileName);
-		  
-        ]]>
-      </Code>
-
-    </Task>
-
-  </UsingTask>
-
-  <Target Name="AfterBuild" Condition="'$(Configuration)' == 'Release'">
-
-    <!-- Download nuget.exe if we need it -->
-
-    <DownloadFile Condition="!Exists('$(OutputPath)\nuget.exe')" FileName="$(OutputPath)\nuget.exe" Url="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" />
-
-    <!-- Pack up a nuget package -->
-
-    <Exec Command="$(OutputPath)\nuget pack $(ProjectFileName) -Properties Configuration=Release -Symbols -OutputDirectory $(OutputPath) -IncludeReferencedProjects" />
-
-  </Target>
- 
 </Project>
\ No newline at end of file
diff --git a/Misc/SoapFaultDetails.cs b/Misc/SoapFaultDetails.cs
index cf31cd46..24feb7ad 100644
--- a/Misc/SoapFaultDetails.cs
+++ b/Misc/SoapFaultDetails.cs
@@ -27,11 +27,6 @@ namespace Microsoft.Exchange.WebServices.Data
 {
     using System;
     using System.Collections.Generic;
-    using System.IO;
-    using System.Net;
-    using System.Reflection;
-    using System.Text;
-    using System.Web.Services.Protocols;
     using System.Xml;
 
     /// <summary>