Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update MGC and fix renaming
  • Loading branch information
live1206 committed Feb 20, 2025
commit 3210a5e3ea338a2ab7bec4725424df1e25181fb7
2 changes: 1 addition & 1 deletion eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
</ItemGroup>

<ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
<PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250218.1" />
<PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250219.6" />
</ItemGroup>

<!--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Azure.Generator;
/// </summary>
[Export(typeof(CodeModelPlugin))]
[ExportMetadata("PluginName", nameof(AzureClientPlugin))]
public class AzureClientPlugin : ClientModelPlugin
public class AzureClientPlugin : ScmCodeModelPlugin
{
private static AzureClientPlugin? _instance;
internal static AzureClientPlugin Instance => _instance ?? throw new InvalidOperationException("AzureClientPlugin is not loaded.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ protected override string GetSourceProjectFileContent()
{
var builder = new CSharpProjectWriter()
{
Description = $"This is the {AzureClientPlugin.Instance.InputLibrary.InputNamespace.Name} client library for developing .NET applications with rich experience.",
AssemblyTitle = $"SDK Code Generation {AzureClientPlugin.Instance.InputLibrary.InputNamespace.Name}",
Description = $"This is the {AzureClientPlugin.Instance.TypeFactory.PackageName} client library for developing .NET applications with rich experience.",
AssemblyTitle = $"SDK Code Generation {AzureClientPlugin.Instance.TypeFactory.PackageName}",
Version = "1.0.0-beta.1",
PackageTags = AzureClientPlugin.Instance.InputLibrary.InputNamespace.Name,
PackageTags = AzureClientPlugin.Instance.TypeFactory.PackageName,
GenerateDocumentationFile = true,
};

Expand Down Expand Up @@ -162,7 +162,7 @@ protected override string GetSolutionFileContent()
EndGlobalSection
EndGlobal
";
return string.Format(slnContent, AzureClientPlugin.Instance.InputLibrary.InputNamespace.Name);
return string.Format(slnContent, AzureClientPlugin.Instance.TypeFactory.PackageName);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@ private static void TransformResource(TypeProvider type)
if (type is ModelProvider && AzureClientPlugin.Instance.OutputLibrary.IsResource(type.Name))
{
type.RelativeFilePath = TransformRelativeFilePath(type);
type.Name = TransformName(type);
type.Type.Name = type.Name;
foreach (var serialization in type.SerializationProviders)
{
serialization.RelativeFilePath = TransformRelativeFilePathForSerialization(serialization);
serialization.Name = TransformName(serialization);
serialization.Type.Name = TransformName(serialization);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ internal class RestClientVisitor : ScmLibraryVisitor
/// <inheritdoc/>
protected override TypeProvider? Visit(TypeProvider type)
{
base.Visit(type);
var result = base.Visit(type);

if (type is ClientProvider)
if (result is ClientProvider)
{
type.DeclarationModifiers = TransfromPublicModifiersToInternal(type);
type.RelativeFilePath = TransformRelativeFilePathForClient(type);
result.DeclarationModifiers = TransfromPublicModifiersToInternal(result);
result.RelativeFilePath = TransformRelativeFilePathForClient(result);
}
// TODO: uncomment this once resources are generated
//if (type is RestClientProvider)
//{
// type.Update(modifiers: TransfromPublicModifiersToInternal(type), relativeFilePath: TransformRelativeFilePathForRestClient(type));
//}
return type;
return result;
}

private static string TransformRelativeFilePathForClient(TypeProvider type)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public static Mock<AzureClientPlugin> LoadMockPlugin(

// initialize the mock singleton instance of the plugin
var codeModelInstance = typeof(CodeModelPlugin).GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic);
var clientModelInstance = typeof(ClientModelPlugin).GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic);
var clientModelInstance = typeof(ScmCodeModelPlugin).GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic);
var azureInstance = typeof(AzureClientPlugin).GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic);
// invoke the load method with the config file path
var loadMethod = typeof(Configuration).GetMethod("Load", BindingFlags.Static | BindingFlags.NonPublic);
Expand Down
Loading