Skip to content

Commit 82cc29c

Browse files
author
Zhongjie Li
committed
Resolve conflicts
1 parent 849c8cf commit 82cc29c

File tree

11 files changed

+8
-882
lines changed

11 files changed

+8
-882
lines changed

‎generated/Monitor/DiagnosticSetting.Autorest/generated/api/Models/SystemData.PowerShell.cs‎

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
// Code generated by Microsoft (R) AutoRest Code Generator.
44
// Changes may cause incorrect behavior and will be lost if the code is regenerated.
55

6-
<<<<<<<< HEAD:generated/ApplicationInsights/ApplicationInsights.Autorest/generated/api/Models/SystemData.PowerShell.cs
7-
namespace Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models
8-
========
96
namespace Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models
10-
>>>>>>>> Azure/main:generated/Monitor/DiagnosticSetting.Autorest/generated/api/Models/SystemData.PowerShell.cs
117
{
128
using Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Runtime.PowerShell;
139

@@ -67,47 +63,27 @@ public partial class SystemData
6763
partial void OverrideToString(ref string stringResult, ref bool returnNow);
6864

6965
/// <summary>
70-
<<<<<<<< HEAD:generated/ApplicationInsights/ApplicationInsights.Autorest/generated/api/Models/SystemData.PowerShell.cs
71-
/// Deserializes a <see cref="global::System.Collections.IDictionary" /> into an instance of <see cref="Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.SystemData"
72-
========
7366
/// Deserializes a <see cref="global::System.Collections.IDictionary" /> into an instance of <see cref="Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.SystemData"
74-
>>>>>>>> Azure/main:generated/Monitor/DiagnosticSetting.Autorest/generated/api/Models/SystemData.PowerShell.cs
7567
/// />.
7668
/// </summary>
7769
/// <param name="content">The global::System.Collections.IDictionary content that should be used.</param>
7870
/// <returns>
79-
<<<<<<<< HEAD:generated/ApplicationInsights/ApplicationInsights.Autorest/generated/api/Models/SystemData.PowerShell.cs
80-
/// an instance of <see cref="Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemData" />.
81-
/// </returns>
82-
public static Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemData DeserializeFromDictionary(global::System.Collections.IDictionary content)
83-
========
8471
/// an instance of <see cref="Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemData" />.
8572
/// </returns>
8673
public static Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemData DeserializeFromDictionary(global::System.Collections.IDictionary content)
87-
>>>>>>>> Azure/main:generated/Monitor/DiagnosticSetting.Autorest/generated/api/Models/SystemData.PowerShell.cs
8874
{
8975
return new SystemData(content);
9076
}
9177

9278
/// <summary>
93-
<<<<<<<< HEAD:generated/ApplicationInsights/ApplicationInsights.Autorest/generated/api/Models/SystemData.PowerShell.cs
94-
/// Deserializes a <see cref="global::System.Management.Automation.PSObject" /> into an instance of <see cref="Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.SystemData"
95-
========
9679
/// Deserializes a <see cref="global::System.Management.Automation.PSObject" /> into an instance of <see cref="Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.SystemData"
97-
>>>>>>>> Azure/main:generated/Monitor/DiagnosticSetting.Autorest/generated/api/Models/SystemData.PowerShell.cs
9880
/// />.
9981
/// </summary>
10082
/// <param name="content">The global::System.Management.Automation.PSObject content that should be used.</param>
10183
/// <returns>
102-
<<<<<<<< HEAD:generated/ApplicationInsights/ApplicationInsights.Autorest/generated/api/Models/SystemData.PowerShell.cs
103-
/// an instance of <see cref="Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemData" />.
104-
/// </returns>
105-
public static Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemData DeserializeFromPSObject(global::System.Management.Automation.PSObject content)
106-
========
10784
/// an instance of <see cref="Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemData" />.
10885
/// </returns>
10986
public static Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemData DeserializeFromPSObject(global::System.Management.Automation.PSObject content)
110-
>>>>>>>> Azure/main:generated/Monitor/DiagnosticSetting.Autorest/generated/api/Models/SystemData.PowerShell.cs
11187
{
11288
return new SystemData(content);
11389
}
@@ -117,17 +93,10 @@ public static Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Model
11793
/// </summary>
11894
/// <param name="jsonText">a string containing a JSON serialized instance of this model.</param>
11995
/// <returns>an instance of the <see cref="SystemData" /> model class.</returns>
120-
<<<<<<<< HEAD:generated/ApplicationInsights/ApplicationInsights.Autorest/generated/api/Models/SystemData.PowerShell.cs
121-
public static Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemData FromJsonString(string jsonText) => FromJson(Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Runtime.Json.JsonNode.Parse(jsonText));
122-
123-
/// <summary>
124-
/// Deserializes a <see cref="global::System.Collections.IDictionary" /> into a new instance of <see cref="Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.SystemData"
125-
========
12696
public static Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemData FromJsonString(string jsonText) => FromJson(Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Runtime.Json.JsonNode.Parse(jsonText));
12797

12898
/// <summary>
12999
/// Deserializes a <see cref="global::System.Collections.IDictionary" /> into a new instance of <see cref="Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.SystemData"
130-
>>>>>>>> Azure/main:generated/Monitor/DiagnosticSetting.Autorest/generated/api/Models/SystemData.PowerShell.cs
131100
/// />.
132101
/// </summary>
133102
/// <param name="content">The global::System.Collections.IDictionary content that should be used.</param>
@@ -142,29 +111,6 @@ internal SystemData(global::System.Collections.IDictionary content)
142111
// actually deserialize
143112
if (content.Contains("CreatedBy"))
144113
{
145-
<<<<<<<< HEAD:generated/ApplicationInsights/ApplicationInsights.Autorest/generated/api/Models/SystemData.PowerShell.cs
146-
((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).CreatedBy = (string) content.GetValueForProperty("CreatedBy",((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).CreatedBy, global::System.Convert.ToString);
147-
}
148-
if (content.Contains("CreatedByType"))
149-
{
150-
((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).CreatedByType = (string) content.GetValueForProperty("CreatedByType",((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).CreatedByType, global::System.Convert.ToString);
151-
}
152-
if (content.Contains("CreatedAt"))
153-
{
154-
((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).CreatedAt = (global::System.DateTime?) content.GetValueForProperty("CreatedAt",((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).CreatedAt, (v) => v is global::System.DateTime _v ? _v : global::System.Xml.XmlConvert.ToDateTime( v.ToString() , global::System.Xml.XmlDateTimeSerializationMode.Unspecified));
155-
}
156-
if (content.Contains("LastModifiedBy"))
157-
{
158-
((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).LastModifiedBy = (string) content.GetValueForProperty("LastModifiedBy",((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).LastModifiedBy, global::System.Convert.ToString);
159-
}
160-
if (content.Contains("LastModifiedByType"))
161-
{
162-
((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).LastModifiedByType = (string) content.GetValueForProperty("LastModifiedByType",((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).LastModifiedByType, global::System.Convert.ToString);
163-
}
164-
if (content.Contains("LastModifiedAt"))
165-
{
166-
((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).LastModifiedAt = (global::System.DateTime?) content.GetValueForProperty("LastModifiedAt",((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).LastModifiedAt, (v) => v is global::System.DateTime _v ? _v : global::System.Xml.XmlConvert.ToDateTime( v.ToString() , global::System.Xml.XmlDateTimeSerializationMode.Unspecified));
167-
========
168114
((Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemDataInternal)this).CreatedBy = (string) content.GetValueForProperty("CreatedBy",((Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemDataInternal)this).CreatedBy, global::System.Convert.ToString);
169115
}
170116
if (content.Contains("CreatedByType"))
@@ -186,17 +132,12 @@ internal SystemData(global::System.Collections.IDictionary content)
186132
if (content.Contains("LastModifiedAt"))
187133
{
188134
((Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemDataInternal)this).LastModifiedAt = (global::System.DateTime?) content.GetValueForProperty("LastModifiedAt",((Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemDataInternal)this).LastModifiedAt, (v) => v is global::System.DateTime _v ? _v : global::System.Xml.XmlConvert.ToDateTime( v.ToString() , global::System.Xml.XmlDateTimeSerializationMode.Unspecified));
189-
>>>>>>>> Azure/main:generated/Monitor/DiagnosticSetting.Autorest/generated/api/Models/SystemData.PowerShell.cs
190135
}
191136
AfterDeserializeDictionary(content);
192137
}
193138

194139
/// <summary>
195-
<<<<<<<< HEAD:generated/ApplicationInsights/ApplicationInsights.Autorest/generated/api/Models/SystemData.PowerShell.cs
196-
/// Deserializes a <see cref="global::System.Management.Automation.PSObject" /> into a new instance of <see cref="Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.SystemData"
197-
========
198140
/// Deserializes a <see cref="global::System.Management.Automation.PSObject" /> into a new instance of <see cref="Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.SystemData"
199-
>>>>>>>> Azure/main:generated/Monitor/DiagnosticSetting.Autorest/generated/api/Models/SystemData.PowerShell.cs
200141
/// />.
201142
/// </summary>
202143
/// <param name="content">The global::System.Management.Automation.PSObject content that should be used.</param>
@@ -211,29 +152,6 @@ internal SystemData(global::System.Management.Automation.PSObject content)
211152
// actually deserialize
212153
if (content.Contains("CreatedBy"))
213154
{
214-
<<<<<<<< HEAD:generated/ApplicationInsights/ApplicationInsights.Autorest/generated/api/Models/SystemData.PowerShell.cs
215-
((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).CreatedBy = (string) content.GetValueForProperty("CreatedBy",((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).CreatedBy, global::System.Convert.ToString);
216-
}
217-
if (content.Contains("CreatedByType"))
218-
{
219-
((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).CreatedByType = (string) content.GetValueForProperty("CreatedByType",((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).CreatedByType, global::System.Convert.ToString);
220-
}
221-
if (content.Contains("CreatedAt"))
222-
{
223-
((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).CreatedAt = (global::System.DateTime?) content.GetValueForProperty("CreatedAt",((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).CreatedAt, (v) => v is global::System.DateTime _v ? _v : global::System.Xml.XmlConvert.ToDateTime( v.ToString() , global::System.Xml.XmlDateTimeSerializationMode.Unspecified));
224-
}
225-
if (content.Contains("LastModifiedBy"))
226-
{
227-
((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).LastModifiedBy = (string) content.GetValueForProperty("LastModifiedBy",((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).LastModifiedBy, global::System.Convert.ToString);
228-
}
229-
if (content.Contains("LastModifiedByType"))
230-
{
231-
((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).LastModifiedByType = (string) content.GetValueForProperty("LastModifiedByType",((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).LastModifiedByType, global::System.Convert.ToString);
232-
}
233-
if (content.Contains("LastModifiedAt"))
234-
{
235-
((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).LastModifiedAt = (global::System.DateTime?) content.GetValueForProperty("LastModifiedAt",((Microsoft.Azure.PowerShell.Cmdlets.ApplicationInsights.Models.ISystemDataInternal)this).LastModifiedAt, (v) => v is global::System.DateTime _v ? _v : global::System.Xml.XmlConvert.ToDateTime( v.ToString() , global::System.Xml.XmlDateTimeSerializationMode.Unspecified));
236-
========
237155
((Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemDataInternal)this).CreatedBy = (string) content.GetValueForProperty("CreatedBy",((Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemDataInternal)this).CreatedBy, global::System.Convert.ToString);
238156
}
239157
if (content.Contains("CreatedByType"))
@@ -255,7 +173,6 @@ internal SystemData(global::System.Management.Automation.PSObject content)
255173
if (content.Contains("LastModifiedAt"))
256174
{
257175
((Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemDataInternal)this).LastModifiedAt = (global::System.DateTime?) content.GetValueForProperty("LastModifiedAt",((Microsoft.Azure.PowerShell.Cmdlets.Monitor.DiagnosticSetting.Models.ISystemDataInternal)this).LastModifiedAt, (v) => v is global::System.DateTime _v ? _v : global::System.Xml.XmlConvert.ToDateTime( v.ToString() , global::System.Xml.XmlDateTimeSerializationMode.Unspecified));
258-
>>>>>>>> Azure/main:generated/Monitor/DiagnosticSetting.Autorest/generated/api/Models/SystemData.PowerShell.cs
259176
}
260177
AfterDeserializePSObject(content);
261178
}

‎src/ApplicationInsights/ApplicationInsights/ChangeLog.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21-
* Improved user experience and consistency. This may introduce breaking changes. Please refer to [here](https://go.microsoft.com/fwlink/?linkid=2340249).
2221

2322
## Version 3.0.0
2423
* Improved user experience and consistency. This may introduce breaking changes. Please refer to [here](https://go.microsoft.com/fwlink/?linkid=2340249).

‎src/Monitor/Monitor/ChangeLog.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
-->
2020

2121
## Upcoming Release
22-
* Improved user experience and consistency. This may introduce breaking changes. Please refer to [here](https://go.microsoft.com/fwlink/?linkid=2340249).
2322

2423
## Version 7.0.0
2524
* Parameters EmailSendToSubscriptionAdministrator and EmailSendToSubscriptionCoAdministrator of cmdlet `New-AzAutoscaleNotificationObject` was unavailable after April 3, 2024 due to Azure classic administrator retirement.

‎src/NetworkCloud/NetworkCloud/Az.NetworkCloud.psd1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '5.3.1'; })
5757
RequiredAssemblies = 'NetworkCloud.Autorest/bin/Az.NetworkCloud.private.dll'
5858

5959
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
60-
ScriptsToProcess = @()
60+
# ScriptsToProcess = @()
6161

6262
# Type files (.ps1xml) to be loaded when importing this module
63-
TypesToProcess = @()
63+
# TypesToProcess = @()
6464

6565
# Format files (.ps1xml) to be loaded when importing this module
6666
FormatsToProcess = 'NetworkCloud.Autorest/Az.NetworkCloud.format.ps1xml'
@@ -181,7 +181,7 @@ PrivateData = @{
181181
PSData = @{
182182

183183
# Tags applied to this module. These help with module discovery in online galleries.
184-
Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'NetworkCloud'
184+
Tags = 'Azure','ResourceManager','ARM','PSModule','NetworkCloud'
185185

186186
# A URL to the license for this module.
187187
LicenseUri = 'https://aka.ms/azps-license'
@@ -211,7 +211,7 @@ PrivateData = @{
211211

212212
} # End of PSData hashtable
213213

214-
} # End of PrivateData hashtable
214+
} # End of PrivateData hashtable
215215

216216
# HelpInfo URI of this module
217217
# HelpInfoURI = ''

‎src/NetworkCloud/NetworkCloud/ChangeLog.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21-
* Below commands to support for new Managed Identity setting.
22-
* Cmdlet `New-AzNetworkCloudCluster`
23-
* Cmdlet `New-AzNetworkCloudClusterManager`
24-
* Cmdlet `Update-AzNetworkCloudCluster`
25-
* Cmdlet `Update-AzNetworkCloudClusterManager`
26-
* Improved user experience and consistency. This may introduce breaking changes. Please refer to [here](https://go.microsoft.com/fwlink/?linkid=2340249).).
2721

2822
## Version 2.0.0
2923
* Below commands to support for new Managed Identity setting.

‎src/Resources/Resources/Az.Resources.psd1‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ RequiredAssemblies = 'Authorization.Autorest/bin/Az.Authorization.private.dll',
7272
'System.Runtime.CompilerServices.Unsafe.dll'
7373

7474
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
75-
ScriptsToProcess = @()
75+
# ScriptsToProcess = @()
7676

7777
# Type files (.ps1xml) to be loaded when importing this module
78-
TypesToProcess = @()
78+
# TypesToProcess = @()
7979

8080
# Format files (.ps1xml) to be loaded when importing this module
8181
FormatsToProcess = 'Authorization.Autorest/Az.Authorization.format.ps1xml',
@@ -256,9 +256,7 @@ PrivateData = @{
256256
PSData = @{
257257

258258
# Tags applied to this module. These help with module discovery in online galleries.
259-
Tags = 'Azure', 'ResourceManager', 'ARM', 'Provider', 'ResourceGroup',
260-
'Deployment', 'ActiveDirectory', 'Authorization', 'Management',
261-
'ManagementGroups', 'Tags'
259+
Tags = 'Azure','ResourceManager','ARM','Provider','ResourceGroup','Deployment','ActiveDirectory','Authorization','Management','ManagementGroups','Tags'
262260

263261
# A URL to the license for this module.
264262
LicenseUri = 'https://aka.ms/azps-license'
@@ -285,7 +283,7 @@ PrivateData = @{
285283

286284
} # End of PSData hashtable
287285

288-
} # End of PrivateData hashtable
286+
} # End of PrivateData hashtable
289287

290288
# HelpInfo URI of this module
291289
# HelpInfoURI = ''

‎src/Resources/Resources/ChangeLog.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
-->
2020

2121
## Upcoming Release
22-
* Removed unavailable variant Get-AzRoleEligibleChildResource cmdlet for InputObject parameter.
23-
* Introduced various new features by upgrading code generator. Please see details [here](https://github.com/Azure/azure-powershell/blob/main/documentation/Autorest-powershell-v4-new-features.md).
24-
* Aligned dependency versions with other modules
2522

2623
## Version 9.0.0
2724
* Removed unavailable variant Get-AzRoleEligibleChildResource cmdlet for InputObject parameter.

0 commit comments

Comments
 (0)