Skip to content

Remove ClientUriBuilder in generated Azure client #47259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 25, 2024
Merged

Remove ClientUriBuilder in generated Azure client #47259

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b8b9c4d
Remove ClientUriBuilder in generated Azure client, use RawRequestUriB…
live1206 Nov 20, 2024
ab73aeb
cleanup
live1206 Nov 20, 2024
aaf6ee2
Apply latest MGC
live1206 Nov 21, 2024
b83bb87
Apply latest MGC
live1206 Nov 22, 2024
6ea6f8c
AddSharedSourceDirectory to remove unnecessary namespace using
live1206 Nov 22, 2024
e53d5ed
update path
live1206 Nov 22, 2024
b846f89
Copy shared code to output directory
live1206 Nov 25, 2024
266a070
path combine
live1206 Nov 25, 2024
f2ca768
remove reflection
live1206 Nov 25, 2024
1fc1808
cleanup
live1206 Nov 25, 2024
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
2 changes: 1 addition & 1 deletion eng/Packages.Data.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
</ItemGroup>

<ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
<PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20241113.8" />
<PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20241121.2" />
</ItemGroup>

<!--
Expand Down
1 change: 1 addition & 0 deletions eng/packages/http-client-csharp/generator/Azure.Generator/src/Azure.Generator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<!-- Include shared code from Azure.Core -->
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\..\sdk\core\Azure.Core\src\Shared\AzureKeyCredentialPolicy.cs" LinkBase="Shared/Core" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\..\sdk\core\Azure.Core\src\Shared\RawRequestUriBuilder.cs" LinkBase="Shared/Core" />
</ItemGroup>

</Project>
14 changes: 14 additions & 0 deletions eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.ClientModel;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;

namespace Azure.Generator;

Expand Down Expand Up @@ -46,6 +47,19 @@ public override void Configure()
{
base.Configure();
AddMetadataReference(MetadataReference.CreateFromFile(typeof(Response).Assembly.Location));
AddSharedSourceDirectory(Path.Combine(GetRepositoryRootPath(), "sdk/core/Azure.Core/src/Shared"));
}

private string GetRepositoryRootPath()
{
// This assumes we're always running in place, in the repo
string? path = Environment.CurrentDirectory;
while (path is not null && !Directory.Exists(Path.Combine(path, ".git")))
{
// Walk up a level
path = Path.GetDirectoryName(path);
}
return path ?? throw new InvalidOperationException("Can't find the repository root directory.");
}

/// <summary>
Expand Down
4 changes: 0 additions & 4 deletions eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureTypeFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Azure.Core;
using Azure.Generator.Primitives;
using Azure.Generator.Providers;
using Azure.Generator.Providers.Abstraction;
Expand All @@ -18,9 +17,6 @@ public class AzureTypeFactory : ScmTypeFactory
/// <inheritdoc/>
public override CSharpType KeyCredentialType => typeof(AzureKeyCredential);

/// <inheritdoc/>
public override CSharpType ClientUriBuilderBaseType => typeof(RequestUriBuilder);

/// <inheritdoc/>
public override IClientResponseApi ClientResponseApi => AzureClientResponseProvider.Instance;

Expand Down
2 changes: 2 additions & 0 deletions ...-client-csharp/generator/Azure.Generator/src/Providers/Abstraction/HttpRequestProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public HttpRequestProvider(ValueExpression original) : base(typeof(Request), ori
{
}

public override Type UriBuilderType => typeof(RawRequestUriBuilder);

public override ValueExpression Content()
=> Original.Property(nameof(Request.Content));

Expand Down
1 change: 1 addition & 0 deletions ...s/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/BasicTypeSpec.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
<!-- Include shared code from Azure.Core -->
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\..\..\..\sdk\core\Azure.Core\src\Shared\AzureKeyCredentialPolicy.cs" LinkBase="Shared/Core" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\..\..\..\sdk\core\Azure.Core\src\Shared\RawRequestUriBuilder.cs" LinkBase="Shared/Core" />
</ItemGroup>
</Project>
36 changes: 18 additions & 18 deletions ...nerator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading