diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage.csproj b/samples/Azure.Management.Storage/Azure.Management.Storage.csproj index b15c5b770bc..f1c792be545 100644 --- a/samples/Azure.Management.Storage/Azure.Management.Storage.csproj +++ b/samples/Azure.Management.Storage/Azure.Management.Storage.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/Azure.ResourceManager.Sample/Azure.ResourceManager.Sample.csproj b/samples/Azure.ResourceManager.Sample/Azure.ResourceManager.Sample.csproj index b15c5b770bc..f1c792be545 100644 --- a/samples/Azure.ResourceManager.Sample/Azure.ResourceManager.Sample.csproj +++ b/samples/Azure.ResourceManager.Sample/Azure.ResourceManager.Sample.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/Azure.ResourceManager.Sample/Generated/Models/DiskEncryptionSetParameters.cs b/samples/Azure.ResourceManager.Sample/Generated/Models/DiskEncryptionSetParameters.cs index b6d1c1a7b17..7aff73af759 100644 --- a/samples/Azure.ResourceManager.Sample/Generated/Models/DiskEncryptionSetParameters.cs +++ b/samples/Azure.ResourceManager.Sample/Generated/Models/DiskEncryptionSetParameters.cs @@ -10,7 +10,7 @@ namespace Azure.ResourceManager.Sample { /// Describes the parameter of customer managed disk encryption set resource id that can be specified for disk. <br><br> NOTE: The disk encryption set resource id can only be specified for managed disk. Please refer https://aka.ms/mdssewithcmkoverview for more details. - public partial class DiskEncryptionSetParameters : SubResourceWritable + public partial class DiskEncryptionSetParameters : WritableSubResource { /// Initializes a new instance of DiskEncryptionSetParameters. public DiskEncryptionSetParameters() diff --git a/samples/Azure.ResourceManager.Sample/Generated/Models/ImageReference.cs b/samples/Azure.ResourceManager.Sample/Generated/Models/ImageReference.cs index 848f243c86f..0d949dfc2f9 100644 --- a/samples/Azure.ResourceManager.Sample/Generated/Models/ImageReference.cs +++ b/samples/Azure.ResourceManager.Sample/Generated/Models/ImageReference.cs @@ -10,7 +10,7 @@ namespace Azure.ResourceManager.Sample { /// Specifies information about the image to use. You can specify information about platform images, marketplace images, or virtual machine images. This element is required when you want to use a platform image, marketplace image, or virtual machine image, but is not used in other creation operations. NOTE: Image reference publisher and offer can only be set when you create the scale set. - public partial class ImageReference : SubResourceWritable + public partial class ImageReference : WritableSubResource { /// Initializes a new instance of ImageReference. public ImageReference() diff --git a/samples/Azure.ResourceManager.Sample/Generated/Models/ManagedDiskParameters.cs b/samples/Azure.ResourceManager.Sample/Generated/Models/ManagedDiskParameters.cs index a73db9f9c53..88b6590995d 100644 --- a/samples/Azure.ResourceManager.Sample/Generated/Models/ManagedDiskParameters.cs +++ b/samples/Azure.ResourceManager.Sample/Generated/Models/ManagedDiskParameters.cs @@ -10,7 +10,7 @@ namespace Azure.ResourceManager.Sample { /// The parameters of a managed disk. - public partial class ManagedDiskParameters : SubResourceWritable + public partial class ManagedDiskParameters : WritableSubResource { /// Initializes a new instance of ManagedDiskParameters. public ManagedDiskParameters() diff --git a/samples/Azure.ResourceManager.Sample/Generated/Models/NetworkInterfaceReference.cs b/samples/Azure.ResourceManager.Sample/Generated/Models/NetworkInterfaceReference.cs index 2d6e841defe..5afeb301f42 100644 --- a/samples/Azure.ResourceManager.Sample/Generated/Models/NetworkInterfaceReference.cs +++ b/samples/Azure.ResourceManager.Sample/Generated/Models/NetworkInterfaceReference.cs @@ -10,7 +10,7 @@ namespace Azure.ResourceManager.Sample { /// Describes a network interface reference. - public partial class NetworkInterfaceReference : SubResourceWritable + public partial class NetworkInterfaceReference : WritableSubResource { /// Initializes a new instance of NetworkInterfaceReference. public NetworkInterfaceReference() diff --git a/samples/Azure.ResourceManager.Sample/Generated/Models/SubResourceWithColocationStatus.cs b/samples/Azure.ResourceManager.Sample/Generated/Models/SubResourceWithColocationStatus.cs index 14468942895..3cc332f19b1 100644 --- a/samples/Azure.ResourceManager.Sample/Generated/Models/SubResourceWithColocationStatus.cs +++ b/samples/Azure.ResourceManager.Sample/Generated/Models/SubResourceWithColocationStatus.cs @@ -10,7 +10,7 @@ namespace Azure.ResourceManager.Sample { /// The SubResourceWithColocationStatus. - public partial class SubResourceWithColocationStatus : SubResourceWritable + public partial class SubResourceWithColocationStatus : WritableSubResource { /// Initializes a new instance of SubResourceWithColocationStatus. public SubResourceWithColocationStatus() diff --git a/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineCaptureResult.cs b/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineCaptureResult.cs index 25ceaad0c9f..0ea66f86250 100644 --- a/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineCaptureResult.cs +++ b/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineCaptureResult.cs @@ -12,7 +12,7 @@ namespace Azure.ResourceManager.Sample { /// Output of virtual machine capture operation. - public partial class VirtualMachineCaptureResult : SubResourceWritable + public partial class VirtualMachineCaptureResult : WritableSubResource { /// Initializes a new instance of VirtualMachineCaptureResult. public VirtualMachineCaptureResult() diff --git a/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineImageResource.cs b/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineImageResource.cs index 2ad88902f56..eae3fc549bb 100644 --- a/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineImageResource.cs +++ b/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineImageResource.cs @@ -13,7 +13,7 @@ namespace Azure.ResourceManager.Sample { /// Virtual machine image resource information. - public partial class VirtualMachineImageResource : SubResourceWritable + public partial class VirtualMachineImageResource : WritableSubResource { /// Initializes a new instance of VirtualMachineImageResource. /// The name of the resource. diff --git a/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetIPConfiguration.cs b/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetIPConfiguration.cs index 797d64f0d33..463f6e4e20a 100644 --- a/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetIPConfiguration.cs +++ b/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetIPConfiguration.cs @@ -13,7 +13,7 @@ namespace Azure.ResourceManager.Sample { /// Describes a virtual machine scale set network profile's IP configuration. - public partial class VirtualMachineScaleSetIPConfiguration : SubResourceWritable + public partial class VirtualMachineScaleSetIPConfiguration : WritableSubResource { /// Initializes a new instance of VirtualMachineScaleSetIPConfiguration. /// The IP configuration name. diff --git a/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetNetworkConfiguration.cs b/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetNetworkConfiguration.cs index e9f816c8644..c154acec99a 100644 --- a/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetNetworkConfiguration.cs +++ b/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetNetworkConfiguration.cs @@ -13,7 +13,7 @@ namespace Azure.ResourceManager.Sample { /// Describes a virtual machine scale set network profile's network configurations. - public partial class VirtualMachineScaleSetNetworkConfiguration : SubResourceWritable + public partial class VirtualMachineScaleSetNetworkConfiguration : WritableSubResource { /// Initializes a new instance of VirtualMachineScaleSetNetworkConfiguration. /// The network configuration name. diff --git a/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetUpdateIPConfiguration.cs b/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetUpdateIPConfiguration.cs index 533f8715ce3..447fc810455 100644 --- a/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetUpdateIPConfiguration.cs +++ b/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetUpdateIPConfiguration.cs @@ -12,7 +12,7 @@ namespace Azure.ResourceManager.Sample { /// Describes a virtual machine scale set network profile's IP configuration. NOTE: The subnet of a scale set may be modified as long as the original subnet and the new subnet are in the same virtual network. - public partial class VirtualMachineScaleSetUpdateIPConfiguration : SubResourceWritable + public partial class VirtualMachineScaleSetUpdateIPConfiguration : WritableSubResource { /// Initializes a new instance of VirtualMachineScaleSetUpdateIPConfiguration. public VirtualMachineScaleSetUpdateIPConfiguration() diff --git a/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetUpdateNetworkConfiguration.cs b/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetUpdateNetworkConfiguration.cs index 16c812db053..ef2c17df085 100644 --- a/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetUpdateNetworkConfiguration.cs +++ b/samples/Azure.ResourceManager.Sample/Generated/Models/VirtualMachineScaleSetUpdateNetworkConfiguration.cs @@ -12,7 +12,7 @@ namespace Azure.ResourceManager.Sample { /// Describes a virtual machine scale set network profile's network configurations. - public partial class VirtualMachineScaleSetUpdateNetworkConfiguration : SubResourceWritable + public partial class VirtualMachineScaleSetUpdateNetworkConfiguration : WritableSubResource { /// Initializes a new instance of VirtualMachineScaleSetUpdateNetworkConfiguration. public VirtualMachineScaleSetUpdateNetworkConfiguration() diff --git a/src/AutoRest.CSharp/AutoRest.CSharp.csproj b/src/AutoRest.CSharp/AutoRest.CSharp.csproj index c27674339f8..4bbaa90702b 100644 --- a/src/AutoRest.CSharp/AutoRest.CSharp.csproj +++ b/src/AutoRest.CSharp/AutoRest.CSharp.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/AutoRest.CSharp/Common/AutoRest/Plugins/CSharpProj.cs b/src/AutoRest.CSharp/Common/AutoRest/Plugins/CSharpProj.cs index f7aeab04fac..800f742ff66 100644 --- a/src/AutoRest.CSharp/Common/AutoRest/Plugins/CSharpProj.cs +++ b/src/AutoRest.CSharp/Common/AutoRest/Plugins/CSharpProj.cs @@ -33,7 +33,7 @@ internal class CSharpProj : IPlugin private string _armCsProjContent = @" - + "; diff --git a/src/AutoRest.CSharp/Mgmt/Generation/ResourceIdentifierChooser.cs b/src/AutoRest.CSharp/Mgmt/Generation/ResourceIdentifierChooser.cs index da2da80b33d..1f8e96f531f 100644 --- a/src/AutoRest.CSharp/Mgmt/Generation/ResourceIdentifierChooser.cs +++ b/src/AutoRest.CSharp/Mgmt/Generation/ResourceIdentifierChooser.cs @@ -22,7 +22,7 @@ internal static Type GetResourceIdentifierType(this OperationGroup operation, Mg return typeof(SubscriptionResourceIdentifier); else if (operation.IsTenantResource(config)) return typeof(TenantResourceIdentifier); - else if (!skipResourceIdentifier && (IsSubclassOf(GetObjectTypeBase(mgmtObjectType), typeof(SubResource)) || IsSubclassOf(GetObjectTypeBase(mgmtObjectType), typeof(SubResourceWritable)))) + else if (!skipResourceIdentifier && (IsSubclassOf(GetObjectTypeBase(mgmtObjectType), typeof(SubResource)) || IsSubclassOf(GetObjectTypeBase(mgmtObjectType), typeof(WritableSubResource)))) return typeof(ResourceIdentifier); else return typeof(ResourceGroupResourceIdentifier); diff --git a/src/AutoRest.CSharp/Mgmt/Output/ResourceData.cs b/src/AutoRest.CSharp/Mgmt/Output/ResourceData.cs index 430a34f81b5..5c39b6898b8 100644 --- a/src/AutoRest.CSharp/Mgmt/Output/ResourceData.cs +++ b/src/AutoRest.CSharp/Mgmt/Output/ResourceData.cs @@ -41,7 +41,7 @@ internal bool IsResource() .Select(t => t.Inherits!) .Any(csharpType => csharpType.Namespace == "Azure.ResourceManager.Core" - && (csharpType.Name == nameof(Resource) || csharpType.Name == "TrackedResource" || csharpType.Name == nameof(SubResource) || csharpType.Name == nameof(SubResourceWritable))); + && (csharpType.Name == nameof(Resource) || csharpType.Name == "TrackedResource" || csharpType.Name == nameof(SubResource) || csharpType.Name == nameof(WritableSubResource))); } } } diff --git a/test/AutoRest.Shared.Tests/AutoRest.Shared.Tests.csproj b/test/AutoRest.Shared.Tests/AutoRest.Shared.Tests.csproj index 2e8ab866f43..0bf69268a26 100644 --- a/test/AutoRest.Shared.Tests/AutoRest.Shared.Tests.csproj +++ b/test/AutoRest.Shared.Tests/AutoRest.Shared.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj b/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj index 42a75aac310..0479ffdc027 100644 --- a/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj +++ b/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/test/AutoRest.TestServer.Tests/Mgmt/TestProjects/ExactMatchInheritanceTests.cs b/test/AutoRest.TestServer.Tests/Mgmt/TestProjects/ExactMatchInheritanceTests.cs index 10487b1a6bf..19e3f8a7437 100644 --- a/test/AutoRest.TestServer.Tests/Mgmt/TestProjects/ExactMatchInheritanceTests.cs +++ b/test/AutoRest.TestServer.Tests/Mgmt/TestProjects/ExactMatchInheritanceTests.cs @@ -20,7 +20,7 @@ public ExactMatchInheritanceTests() [TestCase(typeof(Resource), typeof(ExactMatchModel1Data))] [TestCase(typeof(TrackedResource), typeof(ExactMatchModel5Data))] [TestCase(typeof(SubResource), typeof(ExactMatchModel6))] - [TestCase(typeof(SubResourceWritable), typeof(ExactMatchModel8))] + [TestCase(typeof(WritableSubResource), typeof(ExactMatchModel8))] [TestCase(typeof(ExactMatchModel7), typeof(ExactMatchModel2))] [TestCase(typeof(ExactMatchModel8), typeof(ExactMatchModel3Data))] [TestCase(typeof(ExactMatchModel9), typeof(ExactMatchModel4))] diff --git a/test/TestProjects/ExactMatchInheritance/ExactMatchInheritance.csproj b/test/TestProjects/ExactMatchInheritance/ExactMatchInheritance.csproj index b15c5b770bc..f1c792be545 100644 --- a/test/TestProjects/ExactMatchInheritance/ExactMatchInheritance.csproj +++ b/test/TestProjects/ExactMatchInheritance/ExactMatchInheritance.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/TestProjects/ExactMatchInheritance/Generated/Models/ExactMatchModel8.cs b/test/TestProjects/ExactMatchInheritance/Generated/Models/ExactMatchModel8.cs index 3b6f05f7240..1211ead0125 100644 --- a/test/TestProjects/ExactMatchInheritance/Generated/Models/ExactMatchModel8.cs +++ b/test/TestProjects/ExactMatchInheritance/Generated/Models/ExactMatchModel8.cs @@ -10,7 +10,7 @@ namespace ExactMatchInheritance { /// The ExactMatchModel8. - public partial class ExactMatchModel8 : SubResourceWritable + public partial class ExactMatchModel8 : WritableSubResource { /// Initializes a new instance of ExactMatchModel8. public ExactMatchModel8() diff --git a/test/TestProjects/MgmtParent/MgmtParent.csproj b/test/TestProjects/MgmtParent/MgmtParent.csproj index b15c5b770bc..f1c792be545 100644 --- a/test/TestProjects/MgmtParent/MgmtParent.csproj +++ b/test/TestProjects/MgmtParent/MgmtParent.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/TestProjects/OperationGroupMappings/OperationGroupMappings.csproj b/test/TestProjects/OperationGroupMappings/OperationGroupMappings.csproj index b15c5b770bc..f1c792be545 100644 --- a/test/TestProjects/OperationGroupMappings/OperationGroupMappings.csproj +++ b/test/TestProjects/OperationGroupMappings/OperationGroupMappings.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/TestProjects/ResourceIdentifierChooser/Generated/Models/ResourceLevelData.cs b/test/TestProjects/ResourceIdentifierChooser/Generated/Models/ResourceLevelData.cs index e3c7dd66f9b..2f702bfd6fb 100644 --- a/test/TestProjects/ResourceIdentifierChooser/Generated/Models/ResourceLevelData.cs +++ b/test/TestProjects/ResourceIdentifierChooser/Generated/Models/ResourceLevelData.cs @@ -12,7 +12,7 @@ namespace ResourceIdentifierChooser { /// A class representing the ResourceLevel data model. - public partial class ResourceLevelData : SubResourceWritable + public partial class ResourceLevelData : WritableSubResource { /// Initializes a new instance of ResourceLevelData. public ResourceLevelData() diff --git a/test/TestProjects/ResourceIdentifierChooser/ResourceIdentifierChooser.csproj b/test/TestProjects/ResourceIdentifierChooser/ResourceIdentifierChooser.csproj index b15c5b770bc..f1c792be545 100644 --- a/test/TestProjects/ResourceIdentifierChooser/ResourceIdentifierChooser.csproj +++ b/test/TestProjects/ResourceIdentifierChooser/ResourceIdentifierChooser.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/TestProjects/ResourceRename/ResourceRename.csproj b/test/TestProjects/ResourceRename/ResourceRename.csproj index b15c5b770bc..f1c792be545 100644 --- a/test/TestProjects/ResourceRename/ResourceRename.csproj +++ b/test/TestProjects/ResourceRename/ResourceRename.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/TestProjects/SubscriptionExtensions/SubscriptionExtensions.csproj b/test/TestProjects/SubscriptionExtensions/SubscriptionExtensions.csproj index b15c5b770bc..f1c792be545 100644 --- a/test/TestProjects/SubscriptionExtensions/SubscriptionExtensions.csproj +++ b/test/TestProjects/SubscriptionExtensions/SubscriptionExtensions.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/TestProjects/SupersetInheritance/SupersetInheritance.csproj b/test/TestProjects/SupersetInheritance/SupersetInheritance.csproj index b15c5b770bc..f1c792be545 100644 --- a/test/TestProjects/SupersetInheritance/SupersetInheritance.csproj +++ b/test/TestProjects/SupersetInheritance/SupersetInheritance.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/TestProjects/TenantOnly/TenantOnly.csproj b/test/TestProjects/TenantOnly/TenantOnly.csproj index b15c5b770bc..f1c792be545 100644 --- a/test/TestProjects/TenantOnly/TenantOnly.csproj +++ b/test/TestProjects/TenantOnly/TenantOnly.csproj @@ -7,7 +7,7 @@ - +