diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props index e9118ce98468..2dbb56a749fe 100644 --- a/eng/Packages.Data.props +++ b/eng/Packages.Data.props @@ -27,7 +27,7 @@ 1.0.0-dev.20260128.1 - 1.0.0-alpha.20260212.3 + 1.0.0-alpha.20260212.5 1.0.0-alpha.20260209.2 diff --git a/eng/http-client-csharp-emitter-package-lock.json b/eng/http-client-csharp-emitter-package-lock.json index 92c6398017fe..05b355180945 100644 --- a/eng/http-client-csharp-emitter-package-lock.json +++ b/eng/http-client-csharp-emitter-package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@typespec/http-client-csharp": "1.0.0-alpha.20260212.3", + "@typespec/http-client-csharp": "1.0.0-alpha.20260212.5", "client-plugin": "file:../../../../eng/packages/plugins/client" }, "devDependencies": { @@ -613,9 +613,9 @@ } }, "node_modules/@typespec/http-client-csharp": { - "version": "1.0.0-alpha.20260212.3", - "resolved": "https://registry.npmjs.org/@typespec/http-client-csharp/-/http-client-csharp-1.0.0-alpha.20260212.3.tgz", - "integrity": "sha512-vtLiAShL8fZ2CgZXL0ltD4QZ1zClhxQ/7dsnRRlhWyVvYNSPVSTINzuBCd1PeFzUgFBnGLzmHrzEwAWfAIsBqw==", + "version": "1.0.0-alpha.20260212.5", + "resolved": "https://registry.npmjs.org/@typespec/http-client-csharp/-/http-client-csharp-1.0.0-alpha.20260212.5.tgz", + "integrity": "sha512-PYbtaWp7G5omTfb82i3LoSF3Tx0s9K5W30aoEruycrx+WBbAG5PN2QFHuBu+ZPkb+Pq/VS2h05qkWJ4vsvMZfg==", "license": "MIT", "peerDependencies": { "@azure-tools/typespec-client-generator-core": ">=0.64.3 < 0.65.0 || ~0.65.0-0", diff --git a/eng/http-client-csharp-emitter-package.json b/eng/http-client-csharp-emitter-package.json index 451789888654..a8a89e2e5739 100644 --- a/eng/http-client-csharp-emitter-package.json +++ b/eng/http-client-csharp-emitter-package.json @@ -2,7 +2,7 @@ "main": "dist/src/index.js", "dependencies": { "client-plugin": "file:../../../../eng/packages/plugins/client", - "@typespec/http-client-csharp": "1.0.0-alpha.20260212.3" + "@typespec/http-client-csharp": "1.0.0-alpha.20260212.5" }, "devDependencies": { "@azure-tools/typespec-client-generator-core": "0.64.4", diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/src/Providers/AzureCollectionResultDefinition.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/src/Providers/AzureCollectionResultDefinition.cs index 5c54f060b16b..8032ddcf0b5d 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/src/Providers/AzureCollectionResultDefinition.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/src/Providers/AzureCollectionResultDefinition.cs @@ -117,7 +117,12 @@ private MethodBodyStatement[] BuildAsPagesMethodBody() Declare("result", ResponseModelType, responseVariable.CastTo(ResponseModelType), out var resultVariable), }; - var nextPageExpression = _paging.NextLink != null ? nextPageVariable.NullConditional().Property("AbsoluteUri") : nextPageVariable; + ValueExpression nextPageExpression = _paging.NextLink != null + ? new TernaryConditionalExpression( + nextPageVariable.NullConditional().Property(nameof(Uri.IsAbsoluteUri)).Equal(True), + nextPageVariable.Property(nameof(Uri.AbsoluteUri)), + nextPageVariable.NullConditional().Property(nameof(Uri.OriginalString))) + : nextPageVariable; if (_isProtocol) { // Convert items to BinaryData diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/MaxPageSizePassedToNextRequest.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/MaxPageSizePassedToNextRequest.cs index 8f8642a0e69a..274fd709a06d 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/MaxPageSizePassedToNextRequest.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/MaxPageSizePassedToNextRequest.cs @@ -52,7 +52,7 @@ public CatClientGetCatsCollectionResult(global::Samples.CatClient client, int? m { items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default)); } - yield return global::Azure.Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return global::Azure.Page.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); nextPage = result.NextCat; if ((nextPage == null)) { diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/MaxPageSizeRequiredPassedToNextRequest.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/MaxPageSizeRequiredPassedToNextRequest.cs index fcece0dc504d..842ab8b7afff 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/MaxPageSizeRequiredPassedToNextRequest.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/MaxPageSizeRequiredPassedToNextRequest.cs @@ -52,7 +52,7 @@ public CatClientGetCatsCollectionResult(global::Samples.CatClient client, int ma { items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default)); } - yield return global::Azure.Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return global::Azure.Page.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); nextPage = result.NextCat; if ((nextPage == null)) { diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBody.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBody.cs index 1a4c25db957f..ffbd18872843 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBody.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBody.cs @@ -49,7 +49,7 @@ public CatClientGetCatsCollectionResult(global::Samples.CatClient client, global { items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default)); } - yield return global::Azure.Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return global::Azure.Page.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); nextPage = result.NextCat; if ((nextPage == null)) { diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyAsync.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyAsync.cs index b0a3ddbf7aaf..18adcc6c7d90 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyAsync.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyAsync.cs @@ -50,7 +50,7 @@ public CatClientGetCatsAsyncCollectionResult(global::Samples.CatClient client, g { items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default)); } - yield return global::Azure.Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return global::Azure.Page.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); nextPage = result.NextCat; if ((nextPage == null)) { diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfT.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfT.cs index 86e8c216a0a9..1f5577f6147f 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfT.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfT.cs @@ -43,7 +43,7 @@ public CatClientGetCatsCollectionResultOfT(global::Samples.CatClient client, glo yield break; } global::Samples.Models.Page result = ((global::Samples.Models.Page)response); - yield return global::Azure.Page.FromValues(((global::System.Collections.Generic.IReadOnlyList)result.Cats), nextPage?.AbsoluteUri, response); + yield return global::Azure.Page.FromValues(((global::System.Collections.Generic.IReadOnlyList)result.Cats), (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); nextPage = result.NextCat; if ((nextPage == null)) { diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTAsync.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTAsync.cs index 474db7ac5fde..74c63b2b6172 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTAsync.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTAsync.cs @@ -44,7 +44,7 @@ public CatClientGetCatsAsyncCollectionResultOfT(global::Samples.CatClient client yield break; } global::Samples.Models.Page result = ((global::Samples.Models.Page)response); - yield return global::Azure.Page.FromValues(((global::System.Collections.Generic.IReadOnlyList)result.Cats), nextPage?.AbsoluteUri, response); + yield return global::Azure.Page.FromValues(((global::System.Collections.Generic.IReadOnlyList)result.Cats), (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); nextPage = result.NextCat; if ((nextPage == null)) { diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTWithStringProperty.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTWithStringProperty.cs index f231ec4dd93b..499bf7d2724c 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTWithStringProperty.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTWithStringProperty.cs @@ -43,13 +43,13 @@ public CatClientGetCatsCollectionResultOfT(global::Samples.CatClient client, glo yield break; } global::Samples.Models.Page result = ((global::Samples.Models.Page)response); - yield return global::Azure.Page.FromValues(((global::System.Collections.Generic.IReadOnlyList)result.Cats), nextPage?.AbsoluteUri, response); + yield return global::Azure.Page.FromValues(((global::System.Collections.Generic.IReadOnlyList)result.Cats), (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); string nextPageString = result.NextCat; if (string.IsNullOrEmpty(nextPageString)) { yield break; } - nextPage = new global::System.Uri(nextPageString); + nextPage = new global::System.Uri(nextPageString, global::System.UriKind.RelativeOrAbsolute); } } diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyWithStringProperty.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyWithStringProperty.cs index d85232d9d9a8..7c882f70bcf4 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyWithStringProperty.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyWithStringProperty.cs @@ -49,13 +49,13 @@ public CatClientGetCatsCollectionResult(global::Samples.CatClient client, global { items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default)); } - yield return global::Azure.Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return global::Azure.Page.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); string nextPageString = result.NextCat; if (string.IsNullOrEmpty(nextPageString)) { yield break; } - nextPage = new global::System.Uri(nextPageString); + nextPage = new global::System.Uri(nextPageString, global::System.UriKind.RelativeOrAbsolute); } } diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeader.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeader.cs index 5ba3e9dd35ef..971445cd9719 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeader.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeader.cs @@ -49,10 +49,10 @@ public CatClientGetCatsCollectionResult(global::Samples.CatClient client, global { items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default)); } - yield return global::Azure.Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return global::Azure.Page.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); if ((response.Headers.TryGetValue("nextCat", out string value) && !string.IsNullOrEmpty(value))) { - nextPage = new global::System.Uri(value); + nextPage = new global::System.Uri(value, global::System.UriKind.RelativeOrAbsolute); } else { diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderAsync.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderAsync.cs index 9acdbb104f08..d70517c28fca 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderAsync.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderAsync.cs @@ -50,10 +50,10 @@ public CatClientGetCatsAsyncCollectionResult(global::Samples.CatClient client, g { items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default)); } - yield return global::Azure.Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return global::Azure.Page.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); if ((response.Headers.TryGetValue("nextCat", out string value) && !string.IsNullOrEmpty(value))) { - nextPage = new global::System.Uri(value); + nextPage = new global::System.Uri(value, global::System.UriKind.RelativeOrAbsolute); } else { diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfT.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfT.cs index f47ff1331eb7..ef4f11722b56 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfT.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfT.cs @@ -43,10 +43,10 @@ public CatClientGetCatsCollectionResultOfT(global::Samples.CatClient client, glo yield break; } global::Samples.Models.Page result = ((global::Samples.Models.Page)response); - yield return global::Azure.Page.FromValues(((global::System.Collections.Generic.IReadOnlyList)result.Cats), nextPage?.AbsoluteUri, response); + yield return global::Azure.Page.FromValues(((global::System.Collections.Generic.IReadOnlyList)result.Cats), (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); if ((response.Headers.TryGetValue("nextCat", out string value) && !string.IsNullOrEmpty(value))) { - nextPage = new global::System.Uri(value); + nextPage = new global::System.Uri(value, global::System.UriKind.RelativeOrAbsolute); } else { diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfTAsync.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfTAsync.cs index 03f4eea3ea15..61810ec27ed8 100644 --- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfTAsync.cs +++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfTAsync.cs @@ -44,10 +44,10 @@ public CatClientGetCatsAsyncCollectionResultOfT(global::Samples.CatClient client yield break; } global::Samples.Models.Page result = ((global::Samples.Models.Page)response); - yield return global::Azure.Page.FromValues(((global::System.Collections.Generic.IReadOnlyList)result.Cats), nextPage?.AbsoluteUri, response); + yield return global::Azure.Page.FromValues(((global::System.Collections.Generic.IReadOnlyList)result.Cats), (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); if ((response.Headers.TryGetValue("nextCat", out string value) && !string.IsNullOrEmpty(value))) { - nextPage = new global::System.Uri(value); + nextPage = new global::System.Uri(value, global::System.UriKind.RelativeOrAbsolute); } else { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs index 9f6e57954698..d47dcc545bd1 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs @@ -300,7 +300,15 @@ internal HttpMessage CreateGetWithNextLinkRequest(RequestContext context) internal HttpMessage CreateNextGetWithNextLinkRequest(Uri nextPage, RequestContext context) { RawRequestUriBuilder uri = new RawRequestUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } HttpMessage message = Pipeline.CreateMessage(context, PipelineMessageClassifier200); Request request = message.Request; request.Uri = uri; @@ -325,7 +333,15 @@ internal HttpMessage CreateGetWithStringNextLinkRequest(RequestContext context) internal HttpMessage CreateNextGetWithStringNextLinkRequest(Uri nextPage, RequestContext context) { RawRequestUriBuilder uri = new RawRequestUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } HttpMessage message = Pipeline.CreateMessage(context, PipelineMessageClassifier200); Request request = message.Request; request.Uri = uri; @@ -350,7 +366,15 @@ internal HttpMessage CreateGetWithHeaderNextLinkRequest(RequestContext context) internal HttpMessage CreateNextGetWithHeaderNextLinkRequest(Uri nextPage, RequestContext context) { RawRequestUriBuilder uri = new RawRequestUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } HttpMessage message = Pipeline.CreateMessage(context, PipelineMessageClassifier200); Request request = message.Request; request.Uri = uri; @@ -376,7 +400,15 @@ internal HttpMessage CreateGetWithHeaderNextLinkWithMaxPageRequest(int numElemen internal HttpMessage CreateNextGetWithHeaderNextLinkWithMaxPageRequest(Uri nextPage, int numElements, RequestContext context) { RawRequestUriBuilder uri = new RawRequestUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("numElements", TypeFormatters.ConvertToString(numElements)); HttpMessage message = Pipeline.CreateMessage(context, PipelineMessageClassifier200); Request request = message.Request; diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkAsyncCollectionResult.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkAsyncCollectionResult.cs index dd8cd7556a2c..005466e2348e 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkAsyncCollectionResult.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkAsyncCollectionResult.cs @@ -49,10 +49,10 @@ public override async IAsyncEnumerable> AsPages(string continua { items.Add(ModelReaderWriter.Write(item, ModelSerializationExtensions.WireOptions, BasicTypeSpecContext.Default)); } - yield return Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return Page.FromValues(items, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); if (response.Headers.TryGetValue("next", out string value) && !string.IsNullOrEmpty(value)) { - nextPage = new Uri(value); + nextPage = new Uri(value, UriKind.RelativeOrAbsolute); } else { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkAsyncCollectionResultOfT.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkAsyncCollectionResultOfT.cs index 017f0783af4b..07a845cc0426 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkAsyncCollectionResultOfT.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkAsyncCollectionResultOfT.cs @@ -43,10 +43,10 @@ public override async IAsyncEnumerable> AsPages(string continua yield break; } ListWithHeaderNextLinkResponse result = (ListWithHeaderNextLinkResponse)response; - yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.AbsoluteUri, response); + yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); if (response.Headers.TryGetValue("next", out string value) && !string.IsNullOrEmpty(value)) { - nextPage = new Uri(value); + nextPage = new Uri(value, UriKind.RelativeOrAbsolute); } else { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkCollectionResult.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkCollectionResult.cs index f4916dca79d7..2ecbfdff4b8d 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkCollectionResult.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkCollectionResult.cs @@ -48,10 +48,10 @@ public override IEnumerable> AsPages(string continuationToken, { items.Add(ModelReaderWriter.Write(item, ModelSerializationExtensions.WireOptions, BasicTypeSpecContext.Default)); } - yield return Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return Page.FromValues(items, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); if (response.Headers.TryGetValue("next", out string value) && !string.IsNullOrEmpty(value)) { - nextPage = new Uri(value); + nextPage = new Uri(value, UriKind.RelativeOrAbsolute); } else { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkCollectionResultOfT.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkCollectionResultOfT.cs index dd41237475bc..e6417f9a9250 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkCollectionResultOfT.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkCollectionResultOfT.cs @@ -42,10 +42,10 @@ public override IEnumerable> AsPages(string continuationToken, yield break; } ListWithHeaderNextLinkResponse result = (ListWithHeaderNextLinkResponse)response; - yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.AbsoluteUri, response); + yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); if (response.Headers.TryGetValue("next", out string value) && !string.IsNullOrEmpty(value)) { - nextPage = new Uri(value); + nextPage = new Uri(value, UriKind.RelativeOrAbsolute); } else { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageAsyncCollectionResult.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageAsyncCollectionResult.cs index 680b45fc9e5f..18b361fd4dbd 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageAsyncCollectionResult.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageAsyncCollectionResult.cs @@ -52,10 +52,10 @@ public override async IAsyncEnumerable> AsPages(string continua { items.Add(ModelReaderWriter.Write(item, ModelSerializationExtensions.WireOptions, BasicTypeSpecContext.Default)); } - yield return Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return Page.FromValues(items, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); if (response.Headers.TryGetValue("next", out string value) && !string.IsNullOrEmpty(value)) { - nextPage = new Uri(value); + nextPage = new Uri(value, UriKind.RelativeOrAbsolute); } else { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageAsyncCollectionResultOfT.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageAsyncCollectionResultOfT.cs index 4797d9797d20..99026d638e58 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageAsyncCollectionResultOfT.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageAsyncCollectionResultOfT.cs @@ -46,10 +46,10 @@ public override async IAsyncEnumerable> AsPages(string continua yield break; } ListWithHeaderNextLinkWithMaxPageResponse result = (ListWithHeaderNextLinkWithMaxPageResponse)response; - yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.AbsoluteUri, response); + yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); if (response.Headers.TryGetValue("next", out string value) && !string.IsNullOrEmpty(value)) { - nextPage = new Uri(value); + nextPage = new Uri(value, UriKind.RelativeOrAbsolute); } else { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageCollectionResult.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageCollectionResult.cs index 2b1424f1a0ab..f12acb7bcd64 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageCollectionResult.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageCollectionResult.cs @@ -51,10 +51,10 @@ public override IEnumerable> AsPages(string continuationToken, { items.Add(ModelReaderWriter.Write(item, ModelSerializationExtensions.WireOptions, BasicTypeSpecContext.Default)); } - yield return Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return Page.FromValues(items, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); if (response.Headers.TryGetValue("next", out string value) && !string.IsNullOrEmpty(value)) { - nextPage = new Uri(value); + nextPage = new Uri(value, UriKind.RelativeOrAbsolute); } else { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageCollectionResultOfT.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageCollectionResultOfT.cs index eb9dd1c71450..e1f19c769c3a 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageCollectionResultOfT.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageCollectionResultOfT.cs @@ -45,10 +45,10 @@ public override IEnumerable> AsPages(string continuationToken, yield break; } ListWithHeaderNextLinkWithMaxPageResponse result = (ListWithHeaderNextLinkWithMaxPageResponse)response; - yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.AbsoluteUri, response); + yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); if (response.Headers.TryGetValue("next", out string value) && !string.IsNullOrEmpty(value)) { - nextPage = new Uri(value); + nextPage = new Uri(value, UriKind.RelativeOrAbsolute); } else { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs index cc2e17adfaa2..ec5158dd1551 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs @@ -49,7 +49,7 @@ public override async IAsyncEnumerable> AsPages(string continua { items.Add(ModelReaderWriter.Write(item, ModelSerializationExtensions.WireOptions, BasicTypeSpecContext.Default)); } - yield return Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return Page.FromValues(items, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); nextPage = result.Next; if (nextPage == null) { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs index 0d2a8afe07a9..93d3e6aed3d0 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs @@ -43,7 +43,7 @@ public override async IAsyncEnumerable> AsPages(string continua yield break; } ListWithNextLinkResponse result = (ListWithNextLinkResponse)response; - yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.AbsoluteUri, response); + yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); nextPage = result.Next; if (nextPage == null) { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkCollectionResult.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkCollectionResult.cs index c677f589a60d..49a5a2c8e4b7 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkCollectionResult.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkCollectionResult.cs @@ -48,7 +48,7 @@ public override IEnumerable> AsPages(string continuationToken, { items.Add(ModelReaderWriter.Write(item, ModelSerializationExtensions.WireOptions, BasicTypeSpecContext.Default)); } - yield return Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return Page.FromValues(items, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); nextPage = result.Next; if (nextPage == null) { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkCollectionResultOfT.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkCollectionResultOfT.cs index b5a704943f9e..0638f2ecd058 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkCollectionResultOfT.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkCollectionResultOfT.cs @@ -42,7 +42,7 @@ public override IEnumerable> AsPages(string continuationToken, yield break; } ListWithNextLinkResponse result = (ListWithNextLinkResponse)response; - yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.AbsoluteUri, response); + yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); nextPage = result.Next; if (nextPage == null) { diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs index 3fc5c855ff92..a65d8e3f745d 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkAsyncCollectionResult.cs @@ -49,13 +49,13 @@ public override async IAsyncEnumerable> AsPages(string continua { items.Add(ModelReaderWriter.Write(item, ModelSerializationExtensions.WireOptions, BasicTypeSpecContext.Default)); } - yield return Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return Page.FromValues(items, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); string nextPageString = result.Next; if (string.IsNullOrEmpty(nextPageString)) { yield break; } - nextPage = new Uri(nextPageString); + nextPage = new Uri(nextPageString, UriKind.RelativeOrAbsolute); } } diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs index b24269500699..e3662bfae99f 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkAsyncCollectionResultOfT.cs @@ -43,13 +43,13 @@ public override async IAsyncEnumerable> AsPages(string continua yield break; } ListWithStringNextLinkResponse result = (ListWithStringNextLinkResponse)response; - yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.AbsoluteUri, response); + yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); string nextPageString = result.Next; if (string.IsNullOrEmpty(nextPageString)) { yield break; } - nextPage = new Uri(nextPageString); + nextPage = new Uri(nextPageString, UriKind.RelativeOrAbsolute); } } diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkCollectionResult.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkCollectionResult.cs index 4748a0816a93..c65f6848e2de 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkCollectionResult.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkCollectionResult.cs @@ -48,13 +48,13 @@ public override IEnumerable> AsPages(string continuationToken, { items.Add(ModelReaderWriter.Write(item, ModelSerializationExtensions.WireOptions, BasicTypeSpecContext.Default)); } - yield return Page.FromValues(items, nextPage?.AbsoluteUri, response); + yield return Page.FromValues(items, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); string nextPageString = result.Next; if (string.IsNullOrEmpty(nextPageString)) { yield break; } - nextPage = new Uri(nextPageString); + nextPage = new Uri(nextPageString, UriKind.RelativeOrAbsolute); } } diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs index 80eb546bd364..8f729bf36826 100644 --- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs +++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithStringNextLinkCollectionResultOfT.cs @@ -42,13 +42,13 @@ public override IEnumerable> AsPages(string continuationToken, yield break; } ListWithStringNextLinkResponse result = (ListWithStringNextLinkResponse)response; - yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.AbsoluteUri, response); + yield return Page.FromValues((IReadOnlyList)result.Things, nextPage?.IsAbsoluteUri == true ? nextPage.AbsoluteUri : nextPage?.OriginalString, response); string nextPageString = result.Next; if (string.IsNullOrEmpty(nextPageString)) { yield break; } - nextPage = new Uri(nextPageString); + nextPage = new Uri(nextPageString, UriKind.RelativeOrAbsolute); } } diff --git a/eng/packages/http-client-csharp/package-lock.json b/eng/packages/http-client-csharp/package-lock.json index e0f4155f563d..915d94fbe0af 100644 --- a/eng/packages/http-client-csharp/package-lock.json +++ b/eng/packages/http-client-csharp/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@typespec/http-client-csharp": "1.0.0-alpha.20260212.3" + "@typespec/http-client-csharp": "1.0.0-alpha.20260212.5" }, "devDependencies": { "@azure-tools/azure-http-specs": "0.1.0-alpha.35", @@ -2837,9 +2837,9 @@ } }, "node_modules/@typespec/http-client-csharp": { - "version": "1.0.0-alpha.20260212.3", - "resolved": "https://registry.npmjs.org/@typespec/http-client-csharp/-/http-client-csharp-1.0.0-alpha.20260212.3.tgz", - "integrity": "sha512-vtLiAShL8fZ2CgZXL0ltD4QZ1zClhxQ/7dsnRRlhWyVvYNSPVSTINzuBCd1PeFzUgFBnGLzmHrzEwAWfAIsBqw==", + "version": "1.0.0-alpha.20260212.5", + "resolved": "https://registry.npmjs.org/@typespec/http-client-csharp/-/http-client-csharp-1.0.0-alpha.20260212.5.tgz", + "integrity": "sha512-PYbtaWp7G5omTfb82i3LoSF3Tx0s9K5W30aoEruycrx+WBbAG5PN2QFHuBu+ZPkb+Pq/VS2h05qkWJ4vsvMZfg==", "license": "MIT", "peerDependencies": { "@azure-tools/typespec-client-generator-core": ">=0.64.3 < 0.65.0 || ~0.65.0-0", diff --git a/eng/packages/http-client-csharp/package.json b/eng/packages/http-client-csharp/package.json index 83b6ac80cc32..6de73a1f90d1 100644 --- a/eng/packages/http-client-csharp/package.json +++ b/eng/packages/http-client-csharp/package.json @@ -38,7 +38,7 @@ "dist/generator/**" ], "dependencies": { - "@typespec/http-client-csharp": "1.0.0-alpha.20260212.3" + "@typespec/http-client-csharp": "1.0.0-alpha.20260212.5" }, "devDependencies": { "@azure-tools/azure-http-specs": "0.1.0-alpha.35", diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectConnectionsOperations.RestClient.cs b/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectConnectionsOperations.RestClient.cs index a8d0ce790187..a486d184fec4 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectConnectionsOperations.RestClient.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectConnectionsOperations.RestClient.cs @@ -70,7 +70,15 @@ internal PipelineMessage CreateGetConnectionsRequest(string connectionType, bool internal PipelineMessage CreateNextGetConnectionsRequest(Uri nextPage, string connectionType, bool? defaultConnection, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectDatasetsOperations.RestClient.cs b/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectDatasetsOperations.RestClient.cs index f4f03df76117..537b41240d63 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectDatasetsOperations.RestClient.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectDatasetsOperations.RestClient.cs @@ -39,7 +39,15 @@ internal PipelineMessage CreateGetDatasetVersionsRequest(string name, RequestOpt internal PipelineMessage CreateNextGetDatasetVersionsRequest(Uri nextPage, string name, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; @@ -64,7 +72,15 @@ internal PipelineMessage CreateGetDatasetsRequest(RequestOptions options) internal PipelineMessage CreateNextGetDatasetsRequest(Uri nextPage, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectDeploymentsOperations.RestClient.cs b/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectDeploymentsOperations.RestClient.cs index ec09f4da5ee7..428ad398ba45 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectDeploymentsOperations.RestClient.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectDeploymentsOperations.RestClient.cs @@ -58,7 +58,15 @@ internal PipelineMessage CreateGetDeploymentsRequest(string modelPublisher, stri internal PipelineMessage CreateNextGetDeploymentsRequest(Uri nextPage, string modelPublisher, string modelName, string deploymentType, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectIndexesOperations.RestClient.cs b/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectIndexesOperations.RestClient.cs index 9ee9e9516be6..d6bb4655ffef 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectIndexesOperations.RestClient.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectIndexesOperations.RestClient.cs @@ -39,7 +39,15 @@ internal PipelineMessage CreateGetIndexVersionsRequest(string name, RequestOptio internal PipelineMessage CreateNextGetIndexVersionsRequest(Uri nextPage, string name, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; @@ -64,7 +72,15 @@ internal PipelineMessage CreateGetIndexesRequest(RequestOptions options) internal PipelineMessage CreateNextGetIndexesRequest(Uri nextPage, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsAsyncCollectionResult.cs index 60182b26fa32..65a6541f4ff3 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsAsyncCollectionResult.cs @@ -58,7 +58,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedConnection)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsAsyncCollectionResultOfT.cs index afd777252837..9f5672e13f91 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsAsyncCollectionResultOfT.cs @@ -59,7 +59,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedConnection)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsCollectionResult.cs index d3053b4b362e..496f829cd87b 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsCollectionResult.cs @@ -58,7 +58,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedConnection)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsCollectionResultOfT.cs index d6dddbe6ed4c..123543348bb3 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectConnectionsOperationsGetConnectionsCollectionResultOfT.cs @@ -58,7 +58,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedConnection)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsAsyncCollectionResult.cs index 98efb1b2d5db..e74e17e5caca 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsAsyncCollectionResult.cs @@ -55,7 +55,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedDatasetVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsAsyncCollectionResultOfT.cs index 278072882d2b..3849afcf9656 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsAsyncCollectionResultOfT.cs @@ -56,7 +56,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedDatasetVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsCollectionResult.cs index 35010d9d6057..b566a787481c 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsCollectionResult.cs @@ -55,7 +55,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedDatasetVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsCollectionResultOfT.cs index 142f080d33b9..e3fb5017459e 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetVersionsCollectionResultOfT.cs @@ -55,7 +55,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedDatasetVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsAsyncCollectionResult.cs index f480b698d5a0..66a6f9c49faa 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsAsyncCollectionResult.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedDatasetVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsAsyncCollectionResultOfT.cs index e58427a41915..61732563cf49 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsAsyncCollectionResultOfT.cs @@ -53,7 +53,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedDatasetVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsCollectionResult.cs index f629b363c46f..9e236c57feb1 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsCollectionResult.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedDatasetVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsCollectionResultOfT.cs index 0a0adbc7930b..b07c0cf4cda8 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDatasetsOperationsGetDatasetsCollectionResultOfT.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedDatasetVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsAsyncCollectionResult.cs index 7116a6622a1a..61002be745a3 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsAsyncCollectionResult.cs @@ -61,7 +61,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedDeployment)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsAsyncCollectionResultOfT.cs index 7525a2ffe8b8..2ddf4ebb3958 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsAsyncCollectionResultOfT.cs @@ -62,7 +62,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedDeployment)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsCollectionResult.cs index 3fc84a16250c..f768a6c34e46 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsCollectionResult.cs @@ -61,7 +61,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedDeployment)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsCollectionResultOfT.cs index 3b08eb7753ff..596f44033fab 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectDeploymentsOperationsGetDeploymentsCollectionResultOfT.cs @@ -61,7 +61,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedDeployment)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsAsyncCollectionResult.cs index 659e3b23f58a..45097eb963a3 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsAsyncCollectionResult.cs @@ -55,7 +55,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedIndex)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsAsyncCollectionResultOfT.cs index c3361f1251ae..96a5f3b34fd6 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsAsyncCollectionResultOfT.cs @@ -56,7 +56,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedIndex)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsCollectionResult.cs index c07d9685fe73..b44095a46304 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsCollectionResult.cs @@ -55,7 +55,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedIndex)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsCollectionResultOfT.cs index 5791146f4b74..522ba74b49d9 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexVersionsCollectionResultOfT.cs @@ -55,7 +55,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedIndex)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesAsyncCollectionResult.cs index 55f18b3cfd9d..ca40eb5a9e50 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesAsyncCollectionResult.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedIndex)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesAsyncCollectionResultOfT.cs index bb3857abb0c2..2ea9563fcd86 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesAsyncCollectionResultOfT.cs @@ -53,7 +53,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedIndex)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesCollectionResult.cs index 743be131d9ed..a97c94872dce 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesCollectionResult.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedIndex)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesCollectionResultOfT.cs index e6a6c6e2a197..21b615798c88 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/AIProjectIndexesOperationsGetIndexesCollectionResultOfT.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedIndex)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllAsyncCollectionResult.cs index ce18f5e148f4..0ec31661f1a3 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllAsyncCollectionResult.cs @@ -61,7 +61,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluationRule)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllAsyncCollectionResultOfT.cs index c17f066cec75..4e16e36d8efc 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllAsyncCollectionResultOfT.cs @@ -62,7 +62,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluationRule)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllCollectionResult.cs index 198a6fca03b2..1334a27600ec 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllCollectionResult.cs @@ -61,7 +61,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluationRule)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllCollectionResultOfT.cs index de9e8d7efe8e..2aa3c6c3d354 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationRulesGetAllCollectionResultOfT.cs @@ -61,7 +61,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluationRule)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllAsyncCollectionResult.cs index 3f798c2ecd46..689716797de6 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllAsyncCollectionResult.cs @@ -58,7 +58,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluationTaxonomy)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllAsyncCollectionResultOfT.cs index 4122cd40dcdc..66df537e079d 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllAsyncCollectionResultOfT.cs @@ -59,7 +59,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluationTaxonomy)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllCollectionResult.cs index 2823c48a0ce0..2c095ddebd7a 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllCollectionResult.cs @@ -58,7 +58,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluationTaxonomy)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllCollectionResultOfT.cs index f50bc5a743c6..a21063700f74 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluationTaxonomiesGetAllCollectionResultOfT.cs @@ -58,7 +58,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluationTaxonomy)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsAsyncCollectionResult.cs index 687a1b3be38b..bf0db7ac31b2 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsAsyncCollectionResult.cs @@ -58,7 +58,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluatorVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsAsyncCollectionResultOfT.cs index 4365e0138c05..cc4206009ec5 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsAsyncCollectionResultOfT.cs @@ -59,7 +59,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluatorVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsCollectionResult.cs index fb732381618c..1986ba0c7dd9 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsCollectionResult.cs @@ -58,7 +58,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluatorVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsCollectionResultOfT.cs index b3a319cad5a8..f011413e406e 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetLatestVersionsCollectionResultOfT.cs @@ -58,7 +58,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluatorVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsAsyncCollectionResult.cs index 91230f0d3da8..39a4ae469a01 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsAsyncCollectionResult.cs @@ -61,7 +61,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluatorVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsAsyncCollectionResultOfT.cs index 9a44c9cd9719..08d263871f4f 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsAsyncCollectionResultOfT.cs @@ -62,7 +62,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluatorVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsCollectionResult.cs index 5f4246d3ca58..7176660943cb 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsCollectionResult.cs @@ -61,7 +61,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluatorVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsCollectionResultOfT.cs index c771545948db..4fd628eabad4 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/EvaluatorsGetVersionsCollectionResultOfT.cs @@ -61,7 +61,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedEvaluatorVersion)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllAsyncCollectionResult.cs index 576b87b3cc72..0922e04abcf6 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllAsyncCollectionResult.cs @@ -67,7 +67,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedInsight)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllAsyncCollectionResultOfT.cs index 099bc2e41b7d..f6eef7912421 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllAsyncCollectionResultOfT.cs @@ -68,7 +68,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedInsight)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllCollectionResult.cs index 1f7757be0570..9c5fc8019ebc 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllCollectionResult.cs @@ -67,7 +67,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedInsight)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllCollectionResultOfT.cs index 905ab22ba80b..b57289b0400c 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/InsightsGetAllCollectionResultOfT.cs @@ -67,7 +67,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedInsight)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllAsyncCollectionResult.cs index 79c83c9de67c..8b3629639cce 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllAsyncCollectionResult.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedRedTeam)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllAsyncCollectionResultOfT.cs index 81c7812915b5..8fcd98ccede0 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllAsyncCollectionResultOfT.cs @@ -53,7 +53,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedRedTeam)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllCollectionResult.cs index 44d0c241d13e..c9ae160e7fd8 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllCollectionResult.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedRedTeam)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllCollectionResultOfT.cs index 101e6cd381ee..59a432c5194e 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/RedTeamsGetAllCollectionResultOfT.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedRedTeam)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllAsyncCollectionResult.cs index 3b221f19383f..4c0a6c969aa2 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllAsyncCollectionResult.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedSchedule)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllAsyncCollectionResultOfT.cs index c4975720a24c..0ddf7aae0904 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllAsyncCollectionResultOfT.cs @@ -53,7 +53,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedSchedule)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllCollectionResult.cs index 805a84519874..a0284b102fc8 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllCollectionResult.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedSchedule)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllCollectionResultOfT.cs index 0b2d0bdb91d1..23df864b1a63 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetAllCollectionResultOfT.cs @@ -52,7 +52,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedSchedule)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsAsyncCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsAsyncCollectionResult.cs index bb75424ec24a..058ad5efd892 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsAsyncCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsAsyncCollectionResult.cs @@ -55,7 +55,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedScheduleRun)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsAsyncCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsAsyncCollectionResultOfT.cs index fcb0a8dba063..3a06cfdda5f3 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsAsyncCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsAsyncCollectionResultOfT.cs @@ -56,7 +56,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedScheduleRun)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsCollectionResult.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsCollectionResult.cs index 4989a64e987d..01d161200acc 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsCollectionResult.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsCollectionResult.cs @@ -55,7 +55,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedScheduleRun)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsCollectionResultOfT.cs b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsCollectionResultOfT.cs index 465d492f907e..822734450555 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsCollectionResultOfT.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/CollectionResults/SchedulesGetRunsCollectionResultOfT.cs @@ -55,7 +55,7 @@ public override ContinuationToken GetContinuationToken(ClientResult page) Uri nextPage = ((PagedScheduleRun)page).NextLink; if (nextPage != null) { - return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.AbsoluteUri)); + return ContinuationToken.FromBytes(BinaryData.FromString(nextPage.IsAbsoluteUri ? nextPage.AbsoluteUri : nextPage.OriginalString)); } else { diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/EvaluationRules.RestClient.cs b/sdk/ai/Azure.AI.Projects/src/Generated/EvaluationRules.RestClient.cs index 6b4a35bd3463..6df10c4edcb8 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/EvaluationRules.RestClient.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/EvaluationRules.RestClient.cs @@ -95,7 +95,15 @@ internal PipelineMessage CreateGetAllRequest(string actionType, string agentName internal PipelineMessage CreateNextGetAllRequest(Uri nextPage, string actionType, string agentName, bool? enabled, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/EvaluationTaxonomies.RestClient.cs b/sdk/ai/Azure.AI.Projects/src/Generated/EvaluationTaxonomies.RestClient.cs index f38b58f367d8..a89b779677de 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/EvaluationTaxonomies.RestClient.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/EvaluationTaxonomies.RestClient.cs @@ -61,7 +61,15 @@ internal PipelineMessage CreateGetAllRequest(string inputName, string inputType, internal PipelineMessage CreateNextGetAllRequest(Uri nextPage, string inputName, string inputType, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/Evaluators.RestClient.cs b/sdk/ai/Azure.AI.Projects/src/Generated/Evaluators.RestClient.cs index 13b5ab7ac6f7..012d428f4392 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/Evaluators.RestClient.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/Evaluators.RestClient.cs @@ -47,7 +47,15 @@ internal PipelineMessage CreateGetVersionsRequest(string name, string @type, int internal PipelineMessage CreateNextGetVersionsRequest(Uri nextPage, string name, string @type, int? limit, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; @@ -80,7 +88,15 @@ internal PipelineMessage CreateGetLatestVersionsRequest(string @type, int? limit internal PipelineMessage CreateNextGetLatestVersionsRequest(Uri nextPage, string @type, int? limit, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/Insights.RestClient.cs b/sdk/ai/Azure.AI.Projects/src/Generated/Insights.RestClient.cs index fdab1a3a2a9e..20ddacda3d9d 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/Insights.RestClient.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/Insights.RestClient.cs @@ -91,7 +91,15 @@ internal PipelineMessage CreateGetAllRequest(string @type, string evalId, string internal PipelineMessage CreateNextGetAllRequest(Uri nextPage, string @type, string evalId, string runId, string agentName, bool? includeCoordinates, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/RedTeams.RestClient.cs b/sdk/ai/Azure.AI.Projects/src/Generated/RedTeams.RestClient.cs index 35a53218a7a2..57ea858749f9 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/RedTeams.RestClient.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/RedTeams.RestClient.cs @@ -50,7 +50,15 @@ internal PipelineMessage CreateGetAllRequest(RequestOptions options) internal PipelineMessage CreateNextGetAllRequest(Uri nextPage, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/Schedules.RestClient.cs b/sdk/ai/Azure.AI.Projects/src/Generated/Schedules.RestClient.cs index aac2e753cf3d..10109540f0f2 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/Schedules.RestClient.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/Schedules.RestClient.cs @@ -67,7 +67,15 @@ internal PipelineMessage CreateGetAllRequest(RequestOptions options) internal PipelineMessage CreateNextGetAllRequest(Uri nextPage, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request; @@ -128,7 +136,15 @@ internal PipelineMessage CreateGetRunsRequest(string id, RequestOptions options) internal PipelineMessage CreateNextGetRunsRequest(Uri nextPage, string id, RequestOptions options) { ClientUriBuilder uri = new ClientUriBuilder(); - uri.Reset(nextPage); + if (nextPage.IsAbsoluteUri) + { + uri.Reset(nextPage); + } + else + { + uri.Reset(_endpoint); + uri.AppendPath(nextPage.OriginalString, false); + } uri.UpdateQuery("api-version", _apiVersion); PipelineMessage message = Pipeline.CreateMessage(uri.ToUri(), "GET", PipelineMessageClassifier200); PipelineRequest request = message.Request;