Dev

ChangeLog.md

@@ -5,6 +5,35 @@
 * Azure RemoteApp: New cmdlets for managing stale machine accounts in AD:
   * Get-AzureRemoteAppVmStaleAdObject
   * Clear-AzureRemoteAppVmStaleAdObject
+* Azure Intune: New cmdlets for Mobile Application management:
+   * Add-AzureRmIntuneAndroidMAMPolicyApp      
+   * Add-AzureRmIntuneAndroidMAMPolicyGroup    
+   * Add-AzureRmIntuneiOSMAMPolicyApp          
+   * Add-AzureRmIntuneiOSMAMPolicyGroup        
+   * Get-AzureRmIntuneAndroidMAMApp            
+   * Get-AzureRmIntuneAndroidMAMPolicy         
+   * Get-AzureRmIntuneAndroidMAMPolicyApp      
+   * Get-AzureRmIntuneAndroidMAMPolicyGroup    
+   * Get-AzureRmIntuneiOSMAMApp                
+   * Get-AzureRmIntuneiOSMAMPolicy             
+   * Get-AzureRmIntuneiOSMAMPolicyApp          
+   * Get-AzureRmIntuneiOSMAMPolicyGroup        
+   * Get-AzureRmIntuneMAMFlaggedUser           
+   * Get-AzureRmIntuneMAMStatus                
+   * Get-AzureRmIntuneMAMUserDevice            
+   * Get-AzureRmIntuneMAMUserFlaggedEnrolledApp
+   * Get-AzureRmIntuneOperationResult          
+   * Invoke-AzureRmIntuneMAMUserDeviceWipe     
+   * New-AzureRmIntuneAndroidMAMPolicy         
+   * New-AzureRmIntuneiOSMAMPolicy             
+   * Remove-AzureRmIntuneAndroidMAMPolicy      
+   * Remove-AzureRmIntuneAndroidMAMPolicyApp   
+   * Remove-AzureRmIntuneAndroidMAMPolicyGroup 
+   * Remove-AzureRmIntuneIOSMAMPolicy          
+   * Remove-AzureRmIntuneiOSMAMPolicyApp       
+   * Remove-AzureRmIntuneiOSMAMPolicyGroup     
+   * Set-AzureRmIntuneAndroidMAMPolicy         
+   * Set-AzureRmIntuneiOSMAMPolicy                   
 
 ## 2015.11.09 version 1.0.1
 * Azure Compute

setup/azurecmdfiles.wxi

@@ -1174,6 +1174,71 @@
                             <File Id="fil7A9F66CF061583CA28B0DA562E249A8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Newtonsoft.Json.dll" />
                         </Component>
                     </Directory>
+                    <Directory Id="dirF8BB5CC2A8AA03F23D432B214F947ADA" Name="AzureRM.Intune">
+                        <Component Id="cmp26757C9254980E46634DDBF7FA3DC0EE" Guid="*">
+                            <File Id="fil15F8D200C8D0DEF2FBDEC493EDAB1BB4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\AzureRM.Intune.psd1" />
+                        </Component>
+                        <Component Id="cmp6A7508D641ABC42CBC47E8C71F5F7960" Guid="*">
+                            <File Id="fil1C925E148CCDCEC0309363FC8D38D29F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Hyak.Common.dll" />
+                        </Component>
+                        <Component Id="cmpC40A93532FA1B6B3CC495C44287DD4FD" Guid="*">
+                            <File Id="fil975F3E120A33EB1AD11D26AA54DC0E22" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.ApplicationInsights.dll" />
+                        </Component>
+                        <Component Id="cmpBA0E9AFF4B786F09AF8CA24A30DA0B3E" Guid="*">
+                            <File Id="fil383BA66850249A60C6F43C9B50FE1975" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.Intune.dll" />
+                        </Component>
+                        <Component Id="cmpC329903507D2C760A07068087F01E0F0" Guid="*">
+                            <File Id="fil6BD6B84E30BE331FEED4195F69F365FB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.Intune.dll-Help.xml" />
+                        </Component>
+                        <Component Id="cmpA98F34A253A4D33476481745DC338B72" Guid="*">
+                            <File Id="fil2BB88DE9212FEEA5B5883B030C218237" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
+                        </Component>
+                        <Component Id="cmp3218E7B28F820C614786457C75F68FDE" Guid="*">
+                            <File Id="fil2A8526A4DBACB5E1589A680FBBC5C68D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.Authentication.dll" />
+                        </Component>
+                        <Component Id="cmpD48ED88B3D289F81DFEB1BE8D8BDFDBB" Guid="*">
+                            <File Id="fil469E93C3E227C1882BBC95DF2B8EF8E9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.dll" />
+                        </Component>
+                        <Component Id="cmp9D7D5FC99E7FB18787B78A246F386511" Guid="*">
+                            <File Id="filBC526C0E7B432252967B14C5EDBE9ADE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.NetFramework.dll" />
+                        </Component>
+                        <Component Id="cmp01D375B8D50C7BB0584789AF3262E6EB" Guid="*">
+                            <File Id="filCA529DB57BEA2658246C587E86778481" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Management.Intune.dll" />
+                        </Component>
+                        <Component Id="cmp75A4FEB22AE2D2B4A03F04A4C7E8D32E" Guid="*">
+                            <File Id="fil61C8BE5CFE6844DFC7DA11E02D2F3820" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Bcl.Build.Tasks.dll" />
+                        </Component>
+                        <Component Id="cmp71E32FD24E0F5940BB92662C539A00BA" Guid="*">
+                            <File Id="fil1FCD51FDA84726CA73598C710DCF91C9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
+                        </Component>
+                        <Component Id="cmpC0D2910F1E8DD94834985F8BBB1133A5" Guid="*">
+                            <File Id="filD18744A14F342FBAF8AEEC84E7631535" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
+                        </Component>
+                        <Component Id="cmpB8F6CEC74DC065D2D08FB82A76CF7411" Guid="*">
+                            <File Id="filB56D69688254BE5906767249216D4B5C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
+                        </Component>
+                        <Component Id="cmpFF465588FB32BEF908242C7BC2621DF6" Guid="*">
+                            <File Id="fil40E441D30C21729F47D1073C6C45C06E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.Azure.dll" />
+                        </Component>
+                        <Component Id="cmpDEF412B27E738D9D17F5B36668F8D91C" Guid="*">
+                            <File Id="fil52611C34282A47F1829053BBE3A88C5C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.dll" />
+                        </Component>
+                        <Component Id="cmp28E39E96F170CA278BC16412EA44C66B" Guid="*">
+                            <File Id="filAFFBCF14874562DC60CBDBBD0023F27E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Threading.Tasks.dll" />
+                        </Component>
+                        <Component Id="cmpD4CEF26E124B97CCF29E53FCEA63DF11" Guid="*">
+                            <File Id="fil87975FFE36159391F2BFE90DC9870D1E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.WindowsAzure.Commands.Common.dll" />
+                        </Component>
+                        <Component Id="cmp91E4DB8DA0930C4EC30468BFA8F0C631" Guid="*">
+                            <File Id="fil254001240A6A5CC7E60E12E8993C003E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.WindowsAzure.Management.dll" />
+                        </Component>
+                        <Component Id="cmp5A44264503BFAF83A7DA76A44878BC02" Guid="*">
+                            <File Id="fil9CFE883503A62070640B22AC40754BF7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Newtonsoft.Json.dll" />
+                        </Component>
+                        <Component Id="cmp3C91684B2D48E072C9B84111E717AC26" Guid="*">
+                            <File Id="fil3B384C03C867008DE2C9E8A0F7926E84" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\System.Management.Automation.dll" />
+                        </Component>
+                    </Directory>
                     <Directory Id="dirA5BF4C5FC88CC5FD4E43A0FA840806C7" Name="AzureRM.KeyVault">
                         <Component Id="cmpFEE86D031CEC182D160B80C5EC00914F" Guid="*">
                             <File Id="fil6DABB515D371B3CE610505D7BF92C2F4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\AzureResourceManager.psd1" />
@@ -5097,6 +5162,27 @@
             <ComponentRef Id="cmpE2870DA9D9EABA49600629B6564747C7" />
             <ComponentRef Id="cmpD0CBA309930AE994CD67A5EB7C9B5B10" />
             <ComponentRef Id="cmp7781002FCC3D1B3F0519A286C3E916E9" />
+            <ComponentRef Id="cmp26757C9254980E46634DDBF7FA3DC0EE" />
+            <ComponentRef Id="cmp6A7508D641ABC42CBC47E8C71F5F7960" />
+            <ComponentRef Id="cmpC40A93532FA1B6B3CC495C44287DD4FD" />
+            <ComponentRef Id="cmpBA0E9AFF4B786F09AF8CA24A30DA0B3E" />
+            <ComponentRef Id="cmpC329903507D2C760A07068087F01E0F0" />
+            <ComponentRef Id="cmpA98F34A253A4D33476481745DC338B72" />
+            <ComponentRef Id="cmp3218E7B28F820C614786457C75F68FDE" />
+            <ComponentRef Id="cmpD48ED88B3D289F81DFEB1BE8D8BDFDBB" />
+            <ComponentRef Id="cmp9D7D5FC99E7FB18787B78A246F386511" />
+            <ComponentRef Id="cmp01D375B8D50C7BB0584789AF3262E6EB" />
+            <ComponentRef Id="cmp75A4FEB22AE2D2B4A03F04A4C7E8D32E" />
+            <ComponentRef Id="cmp71E32FD24E0F5940BB92662C539A00BA" />
+            <ComponentRef Id="cmpC0D2910F1E8DD94834985F8BBB1133A5" />
+            <ComponentRef Id="cmpB8F6CEC74DC065D2D08FB82A76CF7411" />
+            <ComponentRef Id="cmpFF465588FB32BEF908242C7BC2621DF6" />
+            <ComponentRef Id="cmpDEF412B27E738D9D17F5B36668F8D91C" />
+            <ComponentRef Id="cmp28E39E96F170CA278BC16412EA44C66B" />
+            <ComponentRef Id="cmpD4CEF26E124B97CCF29E53FCEA63DF11" />
+            <ComponentRef Id="cmp91E4DB8DA0930C4EC30468BFA8F0C631" />
+            <ComponentRef Id="cmp5A44264503BFAF83A7DA76A44878BC02" />
+            <ComponentRef Id="cmp3C91684B2D48E072C9B84111E717AC26" />
             <ComponentRef Id="cmpFEE86D031CEC182D160B80C5EC00914F" />
             <ComponentRef Id="cmpAB04FC1EEE889CA90013762F64086BFF" />
             <ComponentRef Id="cmp4714276292444ADF7D34F509F31C8102" />

src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

@@ -96,7 +96,7 @@
       <HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime">
-      <HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.3.0\lib\portable-net45+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.4.1\lib\portable-net45+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

src/Common/Commands.Common/Commands.Common.csproj

@@ -83,7 +83,7 @@
       <HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime">
-      <HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.3.0\lib\portable-net45+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.4.1\lib\portable-net45+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

src/ResourceManager.ForRefactoringOnly.sln

@@ -135,6 +135,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataLakeStore.Test
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataLakeAnalytics.Test", "ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\Commands.DataLakeAnalytics.Test.csproj", "{E6122DB1-1466-47EE-8BA0-73F9CA90F826}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Intune", "ResourceManager\Intune\Commands.Intune\Commands.Intune.csproj", "{189B40C3-7505-410A-9E55-7E7671BB2E14}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Intune.Test", "ResourceManager\Intune\Commands.Intune.Test\Commands.Intune.Test.csproj", "{CA5F571B-550B-4BE3-9BA3-06442DF52768}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -389,6 +393,14 @@ Global
 		{E6122DB1-1466-47EE-8BA0-73F9CA90F826}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E6122DB1-1466-47EE-8BA0-73F9CA90F826}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6122DB1-1466-47EE-8BA0-73F9CA90F826}.Release|Any CPU.Build.0 = Release|Any CPU
+		{189B40C3-7505-410A-9E55-7E7671BB2E14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{189B40C3-7505-410A-9E55-7E7671BB2E14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{189B40C3-7505-410A-9E55-7E7671BB2E14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{189B40C3-7505-410A-9E55-7E7671BB2E14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -421,5 +433,6 @@ Global
 		{EA66BF2C-4E5F-42FE-912C-B62AEB588308} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{B0D03ECF-9F25-499A-BE25-D668E0D208AA} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{E6122DB1-1466-47EE-8BA0-73F9CA90F826} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{CA5F571B-550B-4BE3-9BA3-06442DF52768} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 	EndGlobalSection
 EndGlobal

src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj

@@ -227,6 +227,7 @@
     <Compile Include="Model\DscOnboardingMetaconfig.cs" />
     <Compile Include="Model\Job.cs" />
     <Compile Include="Model\JobSchedule.cs" />
+    <Compile Include="Model\JobStreamRecord.cs" />
     <Compile Include="Model\JobStream.cs" />
     <Compile Include="Model\Module.cs" />
     <Compile Include="Model\NodeConfiguration.cs" />

src/ResourceManager/Automation/Commands.Automation/Common/AutomationClient.cs

@@ -989,6 +989,13 @@ public IEnumerable<JobStream> GetJobStream(string resourceGroupName, string auto
                     stream => this.CreateJobStreamFromJobStreamModel(stream, resourceGroupName, automationAccountName, jobId));
         }
 
+        public JobStreamRecord GetJobStreamRecord(string resourceGroupName, string automationAccountName, Guid jobId, string jobStreamId)
+        {
+            var response = this.automationManagementClient.JobStreams.Get(resourceGroupName, automationAccountName, jobId, jobStreamId);
+
+            return new JobStreamRecord(response.JobStream, resourceGroupName, automationAccountName, jobId);
+        }
+
         public Job GetJob(string resourceGroupName, string automationAccountName, Guid Id)
         {
             var job = this.automationManagementClient.Jobs.Get(resourceGroupName, automationAccountName, Id).Job;

src/ResourceManager/Automation/Commands.Automation/Common/AutomationClientDSC.cs

@@ -809,6 +809,7 @@ public void RegisterDscNode(string resourceGroupName,
             templateParameters.Add("rebootNodeIfNeeded", rebootFlag);
             templateParameters.Add("actionAfterReboot", actionAfterReboot);
             templateParameters.Add("allowModuleOverwrite", moduleOverwriteFlag);
+            templateParameters.Add("timestamp", DateTimeOffset.UtcNow.ToString("o"));
 
             // invoke the New-AzureRmResourceGroupDeployment cmdlet
             using (Pipeline pipe = Runspace.DefaultRunspace.CreateNestedPipeline())

src/ResourceManager/Automation/Commands.Automation/Common/Constants.cs

@@ -38,6 +38,8 @@ public class Constants
 
         public const string ClientRequestIdHeaderName = "x-ms-client-request-id";
 
+        public const string ActivityIdHeaderName = "x-ms-activity-id";
+
         // default schedule expiry time for daily schedule, consistent with UX
         // 12/31/9999 12:00:00 AM
         public static readonly DateTimeOffset DefaultScheduleExpiryTime = DateTimeOffset.MaxValue;
@@ -59,13 +61,15 @@ public class AutomationAccountState
 
         public const int PsCommandValueDepth = 10;
 
+        public const int JobSummaryLength = 80;
+
         // The template file is a json
-        public const string TemplateFile = @"https://eus2oaasibizamarketprod1.blob.core.windows.net/automationdscpreview/azuredeploy.json";
+        public const string TemplateFile = @"https://eus2oaasibizamarketprod1.blob.core.windows.net/automationdscpreview/azuredeployV2.json";
 
         // The metaconfig file
-        public const string ModulesUrl = @"https://eus2oaasibizamarketprod1.blob.core.windows.net/automationdscpreview/RegistrationMetaConfig.zip";
+        public const string ModulesUrl = @"https://eus2oaasibizamarketprod1.blob.core.windows.net/automationdscpreview/RegistrationMetaConfigV2.zip";
 
-        public const string ConfigurationFunction = @"RegistrationMetaConfig.ps1\RegistrationMetaConfig";
+        public const string ConfigurationFunction = @"RegistrationMetaConfigV2.ps1\RegistrationMetaConfigV2";
 
 
         public static class RunbookType

src/ResourceManager/Automation/Commands.Automation/Common/IAutomationClient.cs

@@ -235,6 +235,8 @@ Model.Webhook CreateWebhook(
         IEnumerable<JobStream> GetJobStream(string resourceGroupName, string automationAccountName, Guid jobId,
             DateTimeOffset? time, string streamType, ref string nextLink);
 
+        JobStreamRecord GetJobStreamRecord(string resourceGroupName, string automationAccountName, Guid jobId, string jobStreamId);
+
         #endregion
 
         #region Certificates

src/ResourceManager/Automation/Commands.Automation/Common/RequestSettings.cs

@@ -14,6 +14,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.Eventing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -31,6 +32,11 @@ public RequestSettings(IAutomationManagementClient automationClient)
             client = ((AutomationManagementClient)automationClient);
             client.HttpClient.DefaultRequestHeaders.Remove(Constants.ClientRequestIdHeaderName);
             client.HttpClient.DefaultRequestHeaders.Add(Constants.ClientRequestIdHeaderName, Guid.NewGuid().ToString());
+
+            client.HttpClient.DefaultRequestHeaders.Remove(Constants.ActivityIdHeaderName);
+            var activityId = Guid.NewGuid();
+            EventProvider.SetActivityId(ref activityId);
+            client.HttpClient.DefaultRequestHeaders.Add(Constants.ActivityIdHeaderName, activityId.ToString());
         }
 
         public void Dispose()
@@ -43,6 +49,7 @@ protected virtual void Dispose(bool disposing)
             if (disposing)
             {
                 client.HttpClient.DefaultRequestHeaders.Remove(Constants.ClientRequestIdHeaderName);
+                client.HttpClient.DefaultRequestHeaders.Remove(Constants.ActivityIdHeaderName);
             }
         }
     }