Skip to content

Commit bf83aaf

Browse files
authored
Prepare release for Azure.ResourceManager (Azure#51339)
1 parent 3e92e8c commit bf83aaf

File tree

50 files changed

+106
-116
lines changed

Some content is hidden

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

50 files changed

+106
-116
lines changed

sdk/resourcemanager/Azure.ResourceManager/CHANGELOG.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
# Release History
22

3-
## 1.14.0-beta.2 (Unreleased)
3+
## 1.13.2 (2025-07-18)
44

55
### Features Added
66

7-
### Breaking Changes
8-
9-
### Bugs Fixed
10-
11-
### Other Changes
7+
- Make `Azure.ResourceManager` AOT-compatible.
128

139
## 1.14.0-beta.1 (2025-06-23)
1410

sdk/resourcemanager/Azure.ResourceManager/api/Azure.ResourceManager.net8.0.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ public ManagedServiceIdentity(Azure.ResourceManager.Models.ManagedServiceIdentit
805805
}
806806
public partial class OperationStatusResult : System.ClientModel.Primitives.IJsonModel<Azure.ResourceManager.Models.OperationStatusResult>, System.ClientModel.Primitives.IPersistableModel<Azure.ResourceManager.Models.OperationStatusResult>
807807
{
808-
protected OperationStatusResult() { }
808+
protected internal OperationStatusResult() { }
809809
protected OperationStatusResult(Azure.Core.ResourceIdentifier id, string name, string status, float? percentComplete, System.DateTimeOffset? startOn, System.DateTimeOffset? endOn, System.Collections.Generic.IReadOnlyList<Azure.ResourceManager.Models.OperationStatusResult> operations, Azure.ResponseError error) { }
810810
public OperationStatusResult(string status) { }
811811
public System.DateTimeOffset? EndOn { get { throw null; } }

sdk/resourcemanager/Azure.ResourceManager/api/Azure.ResourceManager.netstandard2.0.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ public ManagedServiceIdentity(Azure.ResourceManager.Models.ManagedServiceIdentit
804804
}
805805
public partial class OperationStatusResult : System.ClientModel.Primitives.IJsonModel<Azure.ResourceManager.Models.OperationStatusResult>, System.ClientModel.Primitives.IPersistableModel<Azure.ResourceManager.Models.OperationStatusResult>
806806
{
807-
protected OperationStatusResult() { }
807+
protected internal OperationStatusResult() { }
808808
protected OperationStatusResult(Azure.Core.ResourceIdentifier id, string name, string status, float? percentComplete, System.DateTimeOffset? startOn, System.DateTimeOffset? endOn, System.Collections.Generic.IReadOnlyList<Azure.ResourceManager.Models.OperationStatusResult> operations, Azure.ResponseError error) { }
809809
public OperationStatusResult(string status) { }
810810
public System.DateTimeOffset? EndOn { get { throw null; } }

sdk/resourcemanager/Azure.ResourceManager/src/ArmOperation.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55

66
#nullable disable
77

8+
using System;
89
using System.ClientModel.Primitives;
10+
using System.Diagnostics.CodeAnalysis;
911
using System.Reflection;
10-
using System;
12+
using System.Threading.Tasks;
1113
using Azure.Core;
1214
using Azure.Core.Pipeline;
13-
using System.Threading.Tasks;
1415

1516
namespace Azure.ResourceManager
1617
{
@@ -41,7 +42,7 @@ public static ArmOperation Rehydrate(ArmClient client, RehydrationToken rehydrat
4142
/// <param name="rehydrationToken">The rehydration token.</param>
4243
/// <param name="options">The Arm client options.</param>
4344
/// <returns>The long-running operation.</returns>
44-
public static ArmOperation<T> Rehydrate<T>(ArmClient client, RehydrationToken rehydrationToken, ArmClientOptions options = null) where T : notnull
45+
public static ArmOperation<T> Rehydrate<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>(ArmClient client, RehydrationToken rehydrationToken, ArmClientOptions options = null) where T : notnull
4546
{
4647

4748
Argument.AssertNotNull(client, nameof(client));
@@ -79,7 +80,7 @@ public static async Task<ArmOperation> RehydrateAsync(ArmClient client, Rehydrat
7980
/// <param name="rehydrationToken">The rehydration token.</param>
8081
/// <param name="options">The Arm client options.</param>
8182
/// <returns>The long-running operation.</returns>
82-
public static async Task<ArmOperation<T>> RehydrateAsync<T>(ArmClient client, RehydrationToken rehydrationToken, ArmClientOptions options = null) where T : notnull
83+
public static async Task<ArmOperation<T>> RehydrateAsync<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>(ArmClient client, RehydrationToken rehydrationToken, ArmClientOptions options = null) where T : notnull
8384
{
8485

8586
Argument.AssertNotNull(client, nameof(client));
@@ -93,7 +94,7 @@ public static async Task<ArmOperation<T>> RehydrateAsync<T>(ArmClient client, Re
9394
return new RehydrationOperation<T>(nextLinkOperation, operationState, operation, options);
9495
}
9596

96-
private static bool IsResource<T>() where T : notnull
97+
private static bool IsResource<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>() where T : notnull
9798
{
9899
var isResource = typeof(T).GetConstructor(
99100
BindingFlags.NonPublic | BindingFlags.Instance,

sdk/resourcemanager/Azure.ResourceManager/src/Azure.ResourceManager.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Version>1.14.0-beta.2</Version>
4+
<Version>1.13.2</Version>
55
<!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
66
<ApiCompatVersion>1.13.1</ApiCompatVersion>
77
<PackageId>Azure.ResourceManager</PackageId>
@@ -30,4 +30,9 @@
3030
<EmbeddedResource Include="Assets\Profile\2020-09-01-hybrid.json" />
3131
</ItemGroup>
3232

33+
<ItemGroup>
34+
<!-- TODO: Temporarily pin the version of generator here to release Azure.ResourceManager firstly -->
35+
<PackageReference Include="Microsoft.Azure.AutoRest.CSharp" VersionOverride="3.0.0-beta.20250718.1" PrivateAssets="All" />
36+
</ItemGroup>
37+
3338
</Project>

sdk/resourcemanager/Azure.ResourceManager/src/Common/Custom/Models/AzureResourceManagerContext.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -147,19 +147,5 @@ namespace Azure.ResourceManager
147147
[ModelReaderWriterBuildable(typeof(ZoneMapping))]
148148
public partial class AzureResourceManagerContext
149149
{
150-
partial void AddAdditionalFactories(Dictionary<Type, Func<ModelReaderWriterTypeBuilder>> factories)
151-
{
152-
factories.Add(typeof(ManagedServiceIdentity), () => new ManagedServiceIdentityTypeBuilder());
153-
}
154-
155-
private class ManagedServiceIdentityTypeBuilder : ModelReaderWriterTypeBuilder
156-
{
157-
protected override Type BuilderType => typeof(ManagedServiceIdentity);
158-
159-
protected override object CreateInstance()
160-
{
161-
return new ManagedServiceIdentity(ManagedServiceIdentityType.None);
162-
}
163-
}
164150
}
165151
}

sdk/resourcemanager/Azure.ResourceManager/src/Common/Custom/Models/ManagedServiceIdentity.Serialization.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,7 @@ internal static ManagedServiceIdentity DeserializeManagedServiceIdentity(JsonEle
263263
Dictionary<ResourceIdentifier, UserAssignedIdentity> dictionary = new Dictionary<ResourceIdentifier, UserAssignedIdentity>();
264264
foreach (var property0 in property.Value.EnumerateObject())
265265
{
266-
#if NET9_0_OR_GREATER
267-
var data = new BinaryData(JsonMarshal.GetRawUtf8Value(property0.Value).ToArray());
268-
#else
269266
var data = new BinaryData(Encoding.UTF8.GetBytes(property0.Value.GetRawText()));
270-
#endif
271267
dictionary.Add(new ResourceIdentifier(property0.Name), ModelReaderWriter.Read<UserAssignedIdentity>(data, options, AzureResourceManagerContext.Default));
272268
}
273269
userAssignedIdentities = dictionary;

sdk/resourcemanager/Azure.ResourceManager/src/Common/Custom/Models/ManagedServiceIdentity.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ namespace Azure.ResourceManager.Models
1313
[PropertyReferenceType(new string[] { "UserAssignedIdentities" })]
1414
public partial class ManagedServiceIdentity
1515
{
16+
internal ManagedServiceIdentity()
17+
{
18+
}
19+
1620
/// <summary> Initializes a new instance of ManagedServiceIdentity. </summary>
1721
/// <param name="managedServiceIdentityType"> Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed). </param>
1822
[InitializationConstructor]
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
namespace Azure.ResourceManager.Models
5+
{
6+
public partial class OperationStatusResult
7+
{
8+
/// <summary> Initializes a new instance of <see cref="OperationStatusResult"/> for deserialization. </summary>
9+
protected internal OperationStatusResult()
10+
{
11+
}
12+
}
13+
}

sdk/resourcemanager/Azure.ResourceManager/src/Common/Generated/Internal/ModelSerializationExtensions.cs

Lines changed: 0 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)