Skip to content

Commit b49e848

Browse files
huangpfhuangpf
committed
Merge pull request #72 from huangpf/dev
Dev
2 parents 8a6ec2a + 7077de2 commit b49e848

File tree

143 files changed

+44123
-33
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+44123
-33
lines changed

‎ChangeLog.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,35 @@
55
* Azure RemoteApp: New cmdlets for managing stale machine accounts in AD:
66
* Get-AzureRemoteAppVmStaleAdObject
77
* Clear-AzureRemoteAppVmStaleAdObject
8+
* Azure Intune: New cmdlets for Mobile Application management:
9+
* Add-AzureRmIntuneAndroidMAMPolicyApp
10+
* Add-AzureRmIntuneAndroidMAMPolicyGroup
11+
* Add-AzureRmIntuneiOSMAMPolicyApp
12+
* Add-AzureRmIntuneiOSMAMPolicyGroup
13+
* Get-AzureRmIntuneAndroidMAMApp
14+
* Get-AzureRmIntuneAndroidMAMPolicy
15+
* Get-AzureRmIntuneAndroidMAMPolicyApp
16+
* Get-AzureRmIntuneAndroidMAMPolicyGroup
17+
* Get-AzureRmIntuneiOSMAMApp
18+
* Get-AzureRmIntuneiOSMAMPolicy
19+
* Get-AzureRmIntuneiOSMAMPolicyApp
20+
* Get-AzureRmIntuneiOSMAMPolicyGroup
21+
* Get-AzureRmIntuneMAMFlaggedUser
22+
* Get-AzureRmIntuneMAMStatus
23+
* Get-AzureRmIntuneMAMUserDevice
24+
* Get-AzureRmIntuneMAMUserFlaggedEnrolledApp
25+
* Get-AzureRmIntuneOperationResult
26+
* Invoke-AzureRmIntuneMAMUserDeviceWipe
27+
* New-AzureRmIntuneAndroidMAMPolicy
28+
* New-AzureRmIntuneiOSMAMPolicy
29+
* Remove-AzureRmIntuneAndroidMAMPolicy
30+
* Remove-AzureRmIntuneAndroidMAMPolicyApp
31+
* Remove-AzureRmIntuneAndroidMAMPolicyGroup
32+
* Remove-AzureRmIntuneIOSMAMPolicy
33+
* Remove-AzureRmIntuneiOSMAMPolicyApp
34+
* Remove-AzureRmIntuneiOSMAMPolicyGroup
35+
* Set-AzureRmIntuneAndroidMAMPolicy
36+
* Set-AzureRmIntuneiOSMAMPolicy
837

938
## 2015.11.09 version 1.0.1
1039
* Azure Compute

‎setup/azurecmdfiles.wxi

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,6 +1174,71 @@
11741174
<File Id="fil7A9F66CF061583CA28B0DA562E249A8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Newtonsoft.Json.dll" />
11751175
</Component>
11761176
</Directory>
1177+
<Directory Id="dirF8BB5CC2A8AA03F23D432B214F947ADA" Name="AzureRM.Intune">
1178+
<Component Id="cmp26757C9254980E46634DDBF7FA3DC0EE" Guid="*">
1179+
<File Id="fil15F8D200C8D0DEF2FBDEC493EDAB1BB4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\AzureRM.Intune.psd1" />
1180+
</Component>
1181+
<Component Id="cmp6A7508D641ABC42CBC47E8C71F5F7960" Guid="*">
1182+
<File Id="fil1C925E148CCDCEC0309363FC8D38D29F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Hyak.Common.dll" />
1183+
</Component>
1184+
<Component Id="cmpC40A93532FA1B6B3CC495C44287DD4FD" Guid="*">
1185+
<File Id="fil975F3E120A33EB1AD11D26AA54DC0E22" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.ApplicationInsights.dll" />
1186+
</Component>
1187+
<Component Id="cmpBA0E9AFF4B786F09AF8CA24A30DA0B3E" Guid="*">
1188+
<File Id="fil383BA66850249A60C6F43C9B50FE1975" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.Intune.dll" />
1189+
</Component>
1190+
<Component Id="cmpC329903507D2C760A07068087F01E0F0" Guid="*">
1191+
<File Id="fil6BD6B84E30BE331FEED4195F69F365FB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.Intune.dll-Help.xml" />
1192+
</Component>
1193+
<Component Id="cmpA98F34A253A4D33476481745DC338B72" Guid="*">
1194+
<File Id="fil2BB88DE9212FEEA5B5883B030C218237" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
1195+
</Component>
1196+
<Component Id="cmp3218E7B28F820C614786457C75F68FDE" Guid="*">
1197+
<File Id="fil2A8526A4DBACB5E1589A680FBBC5C68D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.Authentication.dll" />
1198+
</Component>
1199+
<Component Id="cmpD48ED88B3D289F81DFEB1BE8D8BDFDBB" Guid="*">
1200+
<File Id="fil469E93C3E227C1882BBC95DF2B8EF8E9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.dll" />
1201+
</Component>
1202+
<Component Id="cmp9D7D5FC99E7FB18787B78A246F386511" Guid="*">
1203+
<File Id="filBC526C0E7B432252967B14C5EDBE9ADE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.NetFramework.dll" />
1204+
</Component>
1205+
<Component Id="cmp01D375B8D50C7BB0584789AF3262E6EB" Guid="*">
1206+
<File Id="filCA529DB57BEA2658246C587E86778481" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Management.Intune.dll" />
1207+
</Component>
1208+
<Component Id="cmp75A4FEB22AE2D2B4A03F04A4C7E8D32E" Guid="*">
1209+
<File Id="fil61C8BE5CFE6844DFC7DA11E02D2F3820" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Bcl.Build.Tasks.dll" />
1210+
</Component>
1211+
<Component Id="cmp71E32FD24E0F5940BB92662C539A00BA" Guid="*">
1212+
<File Id="fil1FCD51FDA84726CA73598C710DCF91C9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1213+
</Component>
1214+
<Component Id="cmpC0D2910F1E8DD94834985F8BBB1133A5" Guid="*">
1215+
<File Id="filD18744A14F342FBAF8AEEC84E7631535" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1216+
</Component>
1217+
<Component Id="cmpB8F6CEC74DC065D2D08FB82A76CF7411" Guid="*">
1218+
<File Id="filB56D69688254BE5906767249216D4B5C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
1219+
</Component>
1220+
<Component Id="cmpFF465588FB32BEF908242C7BC2621DF6" Guid="*">
1221+
<File Id="fil40E441D30C21729F47D1073C6C45C06E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.Azure.dll" />
1222+
</Component>
1223+
<Component Id="cmpDEF412B27E738D9D17F5B36668F8D91C" Guid="*">
1224+
<File Id="fil52611C34282A47F1829053BBE3A88C5C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.dll" />
1225+
</Component>
1226+
<Component Id="cmp28E39E96F170CA278BC16412EA44C66B" Guid="*">
1227+
<File Id="filAFFBCF14874562DC60CBDBBD0023F27E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Threading.Tasks.dll" />
1228+
</Component>
1229+
<Component Id="cmpD4CEF26E124B97CCF29E53FCEA63DF11" Guid="*">
1230+
<File Id="fil87975FFE36159391F2BFE90DC9870D1E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.WindowsAzure.Commands.Common.dll" />
1231+
</Component>
1232+
<Component Id="cmp91E4DB8DA0930C4EC30468BFA8F0C631" Guid="*">
1233+
<File Id="fil254001240A6A5CC7E60E12E8993C003E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.WindowsAzure.Management.dll" />
1234+
</Component>
1235+
<Component Id="cmp5A44264503BFAF83A7DA76A44878BC02" Guid="*">
1236+
<File Id="fil9CFE883503A62070640B22AC40754BF7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Newtonsoft.Json.dll" />
1237+
</Component>
1238+
<Component Id="cmp3C91684B2D48E072C9B84111E717AC26" Guid="*">
1239+
<File Id="fil3B384C03C867008DE2C9E8A0F7926E84" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\System.Management.Automation.dll" />
1240+
</Component>
1241+
</Directory>
11771242
<Directory Id="dirA5BF4C5FC88CC5FD4E43A0FA840806C7" Name="AzureRM.KeyVault">
11781243
<Component Id="cmpFEE86D031CEC182D160B80C5EC00914F" Guid="*">
11791244
<File Id="fil6DABB515D371B3CE610505D7BF92C2F4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\AzureResourceManager.psd1" />
@@ -5097,6 +5162,27 @@
50975162
<ComponentRef Id="cmpE2870DA9D9EABA49600629B6564747C7" />
50985163
<ComponentRef Id="cmpD0CBA309930AE994CD67A5EB7C9B5B10" />
50995164
<ComponentRef Id="cmp7781002FCC3D1B3F0519A286C3E916E9" />
5165+
<ComponentRef Id="cmp26757C9254980E46634DDBF7FA3DC0EE" />
5166+
<ComponentRef Id="cmp6A7508D641ABC42CBC47E8C71F5F7960" />
5167+
<ComponentRef Id="cmpC40A93532FA1B6B3CC495C44287DD4FD" />
5168+
<ComponentRef Id="cmpBA0E9AFF4B786F09AF8CA24A30DA0B3E" />
5169+
<ComponentRef Id="cmpC329903507D2C760A07068087F01E0F0" />
5170+
<ComponentRef Id="cmpA98F34A253A4D33476481745DC338B72" />
5171+
<ComponentRef Id="cmp3218E7B28F820C614786457C75F68FDE" />
5172+
<ComponentRef Id="cmpD48ED88B3D289F81DFEB1BE8D8BDFDBB" />
5173+
<ComponentRef Id="cmp9D7D5FC99E7FB18787B78A246F386511" />
5174+
<ComponentRef Id="cmp01D375B8D50C7BB0584789AF3262E6EB" />
5175+
<ComponentRef Id="cmp75A4FEB22AE2D2B4A03F04A4C7E8D32E" />
5176+
<ComponentRef Id="cmp71E32FD24E0F5940BB92662C539A00BA" />
5177+
<ComponentRef Id="cmpC0D2910F1E8DD94834985F8BBB1133A5" />
5178+
<ComponentRef Id="cmpB8F6CEC74DC065D2D08FB82A76CF7411" />
5179+
<ComponentRef Id="cmpFF465588FB32BEF908242C7BC2621DF6" />
5180+
<ComponentRef Id="cmpDEF412B27E738D9D17F5B36668F8D91C" />
5181+
<ComponentRef Id="cmp28E39E96F170CA278BC16412EA44C66B" />
5182+
<ComponentRef Id="cmpD4CEF26E124B97CCF29E53FCEA63DF11" />
5183+
<ComponentRef Id="cmp91E4DB8DA0930C4EC30468BFA8F0C631" />
5184+
<ComponentRef Id="cmp5A44264503BFAF83A7DA76A44878BC02" />
5185+
<ComponentRef Id="cmp3C91684B2D48E072C9B84111E717AC26" />
51005186
<ComponentRef Id="cmpFEE86D031CEC182D160B80C5EC00914F" />
51015187
<ComponentRef Id="cmpAB04FC1EEE889CA90013762F64086BFF" />
51025188
<ComponentRef Id="cmp4714276292444ADF7D34F509F31C8102" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
9797
</Reference>
9898
<Reference Include="Microsoft.Rest.ClientRuntime">
99-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.3.0\lib\portable-net45+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
99+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.4.1\lib\portable-net45+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
100100
<Private>True</Private>
101101
</Reference>
102102
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
8484
</Reference>
8585
<Reference Include="Microsoft.Rest.ClientRuntime">
86-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.3.0\lib\portable-net45+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
86+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.4.1\lib\portable-net45+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
8787
<Private>True</Private>
8888
</Reference>
8989
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/ResourceManager.ForRefactoringOnly.sln

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataLakeStore.Test
135135
EndProject
136136
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataLakeAnalytics.Test", "ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\Commands.DataLakeAnalytics.Test.csproj", "{E6122DB1-1466-47EE-8BA0-73F9CA90F826}"
137137
EndProject
138+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Intune", "ResourceManager\Intune\Commands.Intune\Commands.Intune.csproj", "{189B40C3-7505-410A-9E55-7E7671BB2E14}"
139+
EndProject
140+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Intune.Test", "ResourceManager\Intune\Commands.Intune.Test\Commands.Intune.Test.csproj", "{CA5F571B-550B-4BE3-9BA3-06442DF52768}"
141+
EndProject
138142
Global
139143
GlobalSection(SolutionConfigurationPlatforms) = preSolution
140144
Debug|Any CPU = Debug|Any CPU
@@ -389,6 +393,14 @@ Global
389393
{E6122DB1-1466-47EE-8BA0-73F9CA90F826}.Debug|Any CPU.Build.0 = Debug|Any CPU
390394
{E6122DB1-1466-47EE-8BA0-73F9CA90F826}.Release|Any CPU.ActiveCfg = Release|Any CPU
391395
{E6122DB1-1466-47EE-8BA0-73F9CA90F826}.Release|Any CPU.Build.0 = Release|Any CPU
396+
{189B40C3-7505-410A-9E55-7E7671BB2E14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
397+
{189B40C3-7505-410A-9E55-7E7671BB2E14}.Debug|Any CPU.Build.0 = Debug|Any CPU
398+
{189B40C3-7505-410A-9E55-7E7671BB2E14}.Release|Any CPU.ActiveCfg = Release|Any CPU
399+
{189B40C3-7505-410A-9E55-7E7671BB2E14}.Release|Any CPU.Build.0 = Release|Any CPU
400+
{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
401+
{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Debug|Any CPU.Build.0 = Debug|Any CPU
402+
{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Release|Any CPU.ActiveCfg = Release|Any CPU
403+
{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Release|Any CPU.Build.0 = Release|Any CPU
392404
EndGlobalSection
393405
GlobalSection(SolutionProperties) = preSolution
394406
HideSolutionNode = FALSE
@@ -421,5 +433,6 @@ Global
421433
{EA66BF2C-4E5F-42FE-912C-B62AEB588308} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
422434
{B0D03ECF-9F25-499A-BE25-D668E0D208AA} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
423435
{E6122DB1-1466-47EE-8BA0-73F9CA90F826} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
436+
{CA5F571B-550B-4BE3-9BA3-06442DF52768} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
424437
EndGlobalSection
425438
EndGlobal

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@
227227
<Compile Include="Model\DscOnboardingMetaconfig.cs" />
228228
<Compile Include="Model\Job.cs" />
229229
<Compile Include="Model\JobSchedule.cs" />
230+
<Compile Include="Model\JobStreamRecord.cs" />
230231
<Compile Include="Model\JobStream.cs" />
231232
<Compile Include="Model\Module.cs" />
232233
<Compile Include="Model\NodeConfiguration.cs" />

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,13 @@ public IEnumerable<JobStream> GetJobStream(string resourceGroupName, string auto
989989
stream => this.CreateJobStreamFromJobStreamModel(stream, resourceGroupName, automationAccountName, jobId));
990990
}
991991

992+
public JobStreamRecord GetJobStreamRecord(string resourceGroupName, string automationAccountName, Guid jobId, string jobStreamId)
993+
{
994+
var response = this.automationManagementClient.JobStreams.Get(resourceGroupName, automationAccountName, jobId, jobStreamId);
995+
996+
return new JobStreamRecord(response.JobStream, resourceGroupName, automationAccountName, jobId);
997+
}
998+
992999
public Job GetJob(string resourceGroupName, string automationAccountName, Guid Id)
9931000
{
9941001
var job = this.automationManagementClient.Jobs.Get(resourceGroupName, automationAccountName, Id).Job;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,7 @@ public void RegisterDscNode(string resourceGroupName,
809809
templateParameters.Add("rebootNodeIfNeeded", rebootFlag);
810810
templateParameters.Add("actionAfterReboot", actionAfterReboot);
811811
templateParameters.Add("allowModuleOverwrite", moduleOverwriteFlag);
812+
templateParameters.Add("timestamp", DateTimeOffset.UtcNow.ToString("o"));
812813

813814
// invoke the New-AzureRmResourceGroupDeployment cmdlet
814815
using (Pipeline pipe = Runspace.DefaultRunspace.CreateNestedPipeline())

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ public class Constants
3838

3939
public const string ClientRequestIdHeaderName = "x-ms-client-request-id";
4040

41+
public const string ActivityIdHeaderName = "x-ms-activity-id";
42+
4143
// default schedule expiry time for daily schedule, consistent with UX
4244
// 12/31/9999 12:00:00 AM
4345
public static readonly DateTimeOffset DefaultScheduleExpiryTime = DateTimeOffset.MaxValue;
@@ -59,13 +61,15 @@ public class AutomationAccountState
5961

6062
public const int PsCommandValueDepth = 10;
6163

64+
public const int JobSummaryLength = 80;
65+
6266
// The template file is a json
63-
public const string TemplateFile = @"https://eus2oaasibizamarketprod1.blob.core.windows.net/automationdscpreview/azuredeploy.json";
67+
public const string TemplateFile = @"https://eus2oaasibizamarketprod1.blob.core.windows.net/automationdscpreview/azuredeployV2.json";
6468

6569
// The metaconfig file
66-
public const string ModulesUrl = @"https://eus2oaasibizamarketprod1.blob.core.windows.net/automationdscpreview/RegistrationMetaConfig.zip";
70+
public const string ModulesUrl = @"https://eus2oaasibizamarketprod1.blob.core.windows.net/automationdscpreview/RegistrationMetaConfigV2.zip";
6771

68-
public const string ConfigurationFunction = @"RegistrationMetaConfig.ps1\RegistrationMetaConfig";
72+
public const string ConfigurationFunction = @"RegistrationMetaConfigV2.ps1\RegistrationMetaConfigV2";
6973

7074

7175
public static class RunbookType

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ Model.Webhook CreateWebhook(
235235
IEnumerable<JobStream> GetJobStream(string resourceGroupName, string automationAccountName, Guid jobId,
236236
DateTimeOffset? time, string streamType, ref string nextLink);
237237

238+
JobStreamRecord GetJobStreamRecord(string resourceGroupName, string automationAccountName, Guid jobId, string jobStreamId);
239+
238240
#endregion
239241

240242
#region Certificates

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
using System;
1616
using System.Collections.Generic;
17+
using System.Diagnostics.Eventing;
1718
using System.Linq;
1819
using System.Text;
1920
using System.Threading.Tasks;
@@ -31,6 +32,11 @@ public RequestSettings(IAutomationManagementClient automationClient)
3132
client = ((AutomationManagementClient)automationClient);
3233
client.HttpClient.DefaultRequestHeaders.Remove(Constants.ClientRequestIdHeaderName);
3334
client.HttpClient.DefaultRequestHeaders.Add(Constants.ClientRequestIdHeaderName, Guid.NewGuid().ToString());
35+
36+
client.HttpClient.DefaultRequestHeaders.Remove(Constants.ActivityIdHeaderName);
37+
var activityId = Guid.NewGuid();
38+
EventProvider.SetActivityId(ref activityId);
39+
client.HttpClient.DefaultRequestHeaders.Add(Constants.ActivityIdHeaderName, activityId.ToString());
3440
}
3541

3642
public void Dispose()
@@ -43,6 +49,7 @@ protected virtual void Dispose(bool disposing)
4349
if (disposing)
4450
{
4551
client.HttpClient.DefaultRequestHeaders.Remove(Constants.ClientRequestIdHeaderName);
52+
client.HttpClient.DefaultRequestHeaders.Remove(Constants.ActivityIdHeaderName);
4653
}
4754
}
4855
}

0 commit comments

Comments
 (0)