Bring back Utf8JsonRequestContent/Utf8JsonBinaryContent and RequestContentHelper/BinaryContentHelper for non-azure libraries

Packages.Data.props

@@ -33,7 +33,7 @@
   <!-- All csproj dependencies. -->
   <ItemGroup>
     <PackageReference Update="NUnit" Version="3.13.2" />
-    <PackageReference Update="System.ClientModel" Version="1.1.0-beta.2" />
+    <PackageReference Update="System.ClientModel" Version="1.1.0-beta.3" />
     <PackageReference Update="Azure.Core" Version="1.39.0" />
     <PackageReference Update="Azure.Core.Experimental" Version="0.1.0-preview.18" />
     <PackageReference Update="Azure.ResourceManager" Version="1.11.0" />

eng/testProjects.json

@@ -52,6 +52,8 @@
         "client/structure/two-operation-group"
     ],
     "CadlRanchProjectsNonAzure":[
+        "type/array",
+        "type/dictionary",
         "authentication/http/custom"
     ],
     "TestServerProjects": [

src/AutoRest.CSharp/Common/AutoRest/Plugins/NewProjectScaffolding.cs

@@ -343,7 +343,7 @@ private string GetUnbrandedSrcCSProj()
         };
         private static readonly IReadOnlyList<CSProjWriter.CSProjDependencyPackage> _unbrandedDependencyPackages = new CSProjWriter.CSProjDependencyPackage[]
         {
-            new("System.ClientModel", "1.1.0-beta.2"),
+            new("System.ClientModel", "1.1.0-beta.3"),
             new("System.Text.Json", "4.7.2")
         };
 

src/AutoRest.CSharp/Common/Output/Expressions/KnownValueExpressions/JsonDocumentExpression.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System.Text.Json;
+using AutoRest.CSharp.Common.Input;
 using AutoRest.CSharp.Common.Output.Expressions.ValueExpressions;
 using AutoRest.CSharp.Common.Output.Models;
 using AutoRest.CSharp.Output.Models.Shared;
@@ -21,7 +22,8 @@ public static JsonDocumentExpression Parse(StreamExpression stream, bool async)
         {
             // Sync and async methods have different set of parameters
             return async
-                ? new JsonDocumentExpression(InvokeStatic(nameof(JsonDocument.ParseAsync), new[] { stream, Snippets.Default, KnownParameters.CancellationTokenParameter }, true))
+                // non-azure libraries do not have cancellationToken parameter
+                ? new JsonDocumentExpression(InvokeStatic(nameof(JsonDocument.ParseAsync), new[] { stream, Snippets.Default, Configuration.IsBranded ? KnownParameters.CancellationTokenParameter : Snippets.Default }, true))
                 : new JsonDocumentExpression(InvokeStatic(nameof(JsonDocument.Parse), stream));
         }
     }

src/AutoRest.CSharp/Common/Output/Models/Types/ExpressionTypeProvider.cs

@@ -30,11 +30,8 @@ internal static IEnumerable<ExpressionTypeProvider> GetHelperProviders()
                 yield return ClientPipelineExtensionsProvider.Instance;
                 yield return ClientUriBuilderProvider.Instance;
             }
-            if (Configuration.IsBranded)
-            {
-                yield return RequestContentHelperProvider.Instance;
-                yield return Utf8JsonRequestContentProvider.Instance;
-            }
+            yield return RequestContentHelperProvider.Instance;
+            yield return Utf8JsonRequestContentProvider.Instance;
             if (Configuration.EnableBicepSerialization)
             {
                 yield return BicepSerializationTypeProvider.Instance;

src/AutoRest.CSharp/Common/Output/Models/Types/HelperTypeProviders/RequestContentHelperProvider.cs

@@ -26,15 +26,13 @@ internal class RequestContentHelperProvider : ExpressionTypeProvider
         private readonly MethodSignatureModifiers _methodModifiers = MethodSignatureModifiers.Public | MethodSignatureModifiers.Static;
         private RequestContentHelperProvider() : base(Configuration.HelperNamespace, null)
         {
-            // non-azure libraries do not need this type
-            Debug.Assert(Configuration.IsBranded);
-
+            DefaultName = $"{Configuration.ApiTypes.RequestContentType.Name}Helper";
             DeclarationModifiers = TypeSignatureModifiers.Internal | TypeSignatureModifiers.Static;
             _requestBodyType = Configuration.ApiTypes.RequestContentType;
             _utf8JsonRequestBodyType = Utf8JsonRequestContentProvider.Instance.Type;
         }
 
-        protected override string DefaultName => "RequestContentHelper";
+        protected override string DefaultName { get; }
 
         protected override IEnumerable<Method> BuildMethods()
         {

src/AutoRest.CSharp/Common/Output/Models/Types/HelperTypeProviders/Utf8JsonRequestContentProvider.cs

@@ -28,11 +28,8 @@ internal class Utf8JsonRequestContentProvider : ExpressionTypeProvider
 
         private Utf8JsonRequestContentProvider() : base(Configuration.HelperNamespace, null)
         {
-            // non-azure libraries do not need this type
-            Debug.Assert(Configuration.IsBranded);
-
             DeclarationModifiers = TypeSignatureModifiers.Internal;
-            DefaultName = Configuration.IsBranded ? "Utf8JsonRequestContent" : "Utf8JsonRequestBody";
+            DefaultName = $"Utf8Json{Configuration.ApiTypes.RequestContentType.Name}";
             Inherits = Configuration.ApiTypes.RequestContentType;
 
             _streamField = new FieldDeclaration(

src/AutoRest.CSharp/LowLevel/Output/ConvenienceMethod.cs

@@ -146,7 +146,7 @@ public IEnumerable<MethodBodyStatement> GetConvertStatements(LowLevelClientMetho
 
                     yield return new[]
                     {
-                        new DeclareVariableStatement(value.Type, value.Declaration, Default),
+                        Declare(value, Default),
                         JsonSerializationMethodsBuilder.BuildDeserializationForMethods(serialization, async, value, Extensible.RestOperations.GetContentStream(response), false, null),
                         Return(Extensible.RestOperations.GetTypedResponseFromValue(value, response))
                     };

src/AutoRest.CSharp/Properties/launchSettings.json

@@ -688,6 +688,14 @@
       "commandName": "Project",
       "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjectsNonAzure\\authentication\\http\\custom\\src\\Generated -n"
     },
+    "typespec-nonAzure-type/array": {
+      "commandName": "Project",
+      "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjectsNonAzure\\type\\array\\src\\Generated -n"
+    },
+    "typespec-nonAzure-type/dictionary": {
+      "commandName": "Project",
+      "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjectsNonAzure\\type\\dictionary\\src\\Generated -n"
+    },
     "typespec-parameters/body-optionality": {
       "commandName": "Project",
       "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\parameters\\body-optionality\\src\\Generated -n"

test/AutoRest.Shared.Tests/RequestContentHelperTests.cs

@@ -23,8 +23,8 @@ public static IEnumerable<TestCaseData> GetDateTimeData()
         [TestCase(1, 2)]
         [TestCase("a", "b")]
         [TestCase(true, false)]
-        [TestCaseSource("GetTimeSpanData")]
-        [TestCaseSource("GetDateTimeData")]
+        [TestCaseSource(nameof(GetTimeSpanData))]
+        [TestCaseSource(nameof(GetDateTimeData))]
         public void TestGenericFromEnumerable<T>(T expectedValue1, T expectedValue2)
         {
             var expectedList = new List<T> { expectedValue1, expectedValue2 };
@@ -81,8 +81,8 @@ public void TestBinaryDataFromEnumerable()
         [TestCase(1, 2)]
         [TestCase("a", "b")]
         [TestCase(true, false)]
-        [TestCaseSource("GetTimeSpanData")]
-        [TestCaseSource("GetDateTimeData")]
+        [TestCaseSource(nameof(GetTimeSpanData))]
+        [TestCaseSource(nameof(GetDateTimeData))]
         public void TestGenericFromDictionary<T>(T expectedValue1, T expectedValue2)
         {
             var expectedDictionary = new Dictionary<string, T>()

test/CadlRanchProjects.Tests/type-array.cs

@@ -20,23 +20,21 @@ public class TypeArrayTests : CadlRanchTestBase
         public Task Type_Array_Int32Value_get() => Test(async (host) =>
         {
             var response = await new ArrayClient(host, null).GetInt32ValueClient().GetInt32ValueAsync();
-            Assert.AreEqual(1, response.Value.First());
-            Assert.AreEqual(2, response.Value.Last());
+            CollectionAssert.AreEqual(new[] { 1, 2 }, response.Value);
         });
 
         [Test]
         public Task Type_Array_Int32Value_put() => Test(async (host) =>
         {
-            var response = await new ArrayClient(host, null).GetInt32ValueClient().PutAsync(new List<int> { 1, 2});
+            var response = await new ArrayClient(host, null).GetInt32ValueClient().PutAsync(new List<int> { 1, 2 });
             Assert.AreEqual(204, response.Status);
         });
 
         [Test]
         public Task Type_Array_Int64Value_get() => Test(async (host) =>
         {
             var response = await new ArrayClient(host, null).GetInt64ValueClient().GetInt64ValueAsync();
-            Assert.AreEqual(9007199254740991, response.Value.First());
-            Assert.AreEqual(-9007199254740991, response.Value.Last());
+            CollectionAssert.AreEqual(new[] { 9007199254740991, -9007199254740991 }, response.Value);
         });
 
         [Test]
@@ -50,8 +48,7 @@ public Task Type_Array_Int64Value_put() => Test(async (host) =>
         public Task Type_Array_BooleanValue_get() => Test(async (host) =>
         {
             var response = await new ArrayClient(host, null).GetBooleanValueClient().GetBooleanValueAsync();
-            Assert.AreEqual(true, response.Value.First());
-            Assert.AreEqual(false, response.Value.Last());
+            CollectionAssert.AreEqual(new[] { true, false }, response.Value);
         });
 
         [Test]
@@ -65,8 +62,7 @@ public Task Type_Array_BooleanValue_put() => Test(async (host) =>
         public Task Type_Array_StringValue_get() => Test(async (host) =>
         {
             var response = await new ArrayClient(host, null).GetStringValueClient().GetStringValueAsync();
-            Assert.AreEqual("hello", response.Value.First());
-            Assert.AreEqual("", response.Value.Last());
+            CollectionAssert.AreEqual(new[] { "hello", "" }, response.Value);
         });
 
         [Test]
@@ -80,7 +76,7 @@ public Task Type_Array_StringValue_put() => Test(async (host) =>
         public Task Type_Array_Float32Value_get() => Test(async (host) =>
         {
             var response = await new ArrayClient(host, null).GetFloat32ValueClient().GetFloat32ValueAsync();
-            Assert.AreEqual(43.125f, response.Value.First());
+            CollectionAssert.AreEqual(new[] { 43.125f }, response.Value);
         });
 
         [Test]
@@ -94,7 +90,8 @@ public Task Type_Array_Float32Value_put() => Test(async (host) =>
         public Task Type_Array_DatetimeValue_get() => Test(async (host) =>
         {
             var response = await new ArrayClient(host, null).GetDatetimeValueClient().GetDatetimeValueAsync();
-            Assert.AreEqual(DateTimeOffset.Parse("2022-08-26T18:38:00Z"), response.Value.First());
+            Assert.AreEqual(1, response.Value.Count);
+            Assert.AreEqual(DateTimeOffset.Parse("2022-08-26T18:38:00Z"), response.Value[0]);
         });
 
         [Test]
@@ -108,13 +105,14 @@ public Task Type_Array_DatetimeValue_put() => Test(async (host) =>
         public Task Type_Array_DurationValue_get() => Test(async (host) =>
         {
             var response = await new ArrayClient(host, null).GetDurationValueClient().GetDurationValueAsync();
-            Assert.AreEqual(XmlConvert.ToTimeSpan("P123DT22H14M12.011S"), response.Value.First());
+            Assert.AreEqual(1, response.Value.Count);
+            Assert.AreEqual(XmlConvert.ToTimeSpan("P123DT22H14M12.011S"), response.Value[0]);
         });
 
         [Test]
         public Task Type_Array_DurationValue_put() => Test(async (host) =>
         {
-            var response = await new ArrayClient(host, null).GetDurationValueClient().PutAsync(new List<TimeSpan> { XmlConvert.ToTimeSpan("P123DT22H14M12.011S")});
+            var response = await new ArrayClient(host, null).GetDurationValueClient().PutAsync(new List<TimeSpan> { XmlConvert.ToTimeSpan("P123DT22H14M12.011S") });
             Assert.AreEqual(204, response.Status);
         });
 
@@ -138,8 +136,9 @@ public Task Type_Array_UnknownValue_put() => Test(async (host) =>
         public Task Type_Array_ModelValue_get() => Test(async (host) =>
         {
             var response = await new ArrayClient(host, null).GetModelValueClient().GetModelValueAsync();
-            Assert.AreEqual("hello", response.Value.First().Property);
-            Assert.AreEqual("world", response.Value.Last().Property);
+            Assert.AreEqual(2, response.Value.Count);
+            Assert.AreEqual("hello", response.Value[0].Property);
+            Assert.AreEqual("world", response.Value[1].Property);
         });
 
         [Test]
@@ -153,10 +152,7 @@ public Task Type_Array_ModelValue_put() => Test(async (host) =>
         public Task Type_Array_NullableFloatValue_get() => Test(async (host) =>
         {
             var response = await new ArrayClient(host, null).GetNullableFloatValueClient().GetNullableFloatValueAsync();
-            var result = response.Value.ToList();
-            Assert.AreEqual(1.25f, result[0]);
-            Assert.AreEqual(null, result[1]);
-            Assert.AreEqual(3.0f, result[2]);
+            CollectionAssert.AreEqual(new float?[] { 1.25f, null, 3.0f }, response.Value);
         });
 
         [Test]

test/CadlRanchProjects.Tests/type-dictionary.cs

@@ -16,6 +16,7 @@ public class TypeDictionaryTests : CadlRanchTestBase
         public Task Dictionary_Int32Value_get() => Test(async (host) =>
         {
             var response = await new DictionaryClient(host, null).GetInt32ValueClient().GetInt32ValueAsync();
+            Assert.AreEqual(2, response.Value.Count);
             Assert.AreEqual(1, response.Value["k1"]);
             Assert.AreEqual(2, response.Value["k2"]);
         });
@@ -35,6 +36,7 @@ public Task Dictionary_Int32Value_put() => Test(async (host) =>
         public Task Dictionary_Int64Value_get() => Test(async (host) =>
         {
             var response = await new DictionaryClient(host, null).GetInt64ValueClient().GetInt64ValueAsync();
+            Assert.AreEqual(2, response.Value.Count);
             Assert.AreEqual(9007199254740991, response.Value["k1"]);
             Assert.AreEqual(-9007199254740991, response.Value["k2"]);
         });
@@ -54,6 +56,7 @@ public Task Dictionary_Int64Value_put() => Test(async (host) =>
         public Task Dictionary_BooleanValue_get() => Test(async (host) =>
         {
             var response = await new DictionaryClient(host, null).GetBooleanValueClient().GetBooleanValueAsync();
+            Assert.AreEqual(2, response.Value.Count);
             Assert.AreEqual(true, response.Value["k1"]);
             Assert.AreEqual(false, response.Value["k2"]);
         });
@@ -73,6 +76,7 @@ public Task Dictionary_BooleanValue_put() => Test(async (host) =>
         public Task Dictionary_StringValue_get() => Test(async (host) =>
         {
             var response = await new DictionaryClient(host, null).GetStringValueClient().GetStringValueAsync();
+            Assert.AreEqual(2, response.Value.Count);
             Assert.AreEqual("hello", response.Value["k1"]);
             Assert.AreEqual("", response.Value["k2"]);
         });
@@ -92,6 +96,7 @@ public Task Dictionary_StringValue_put() => Test(async (host) =>
         public Task Dictionary_Float32Value_get() => Test(async (host) =>
         {
             var response = await new DictionaryClient(host, null).GetFloat32ValueClient().GetFloat32ValueAsync();
+            Assert.AreEqual(1, response.Value.Count);
             Assert.AreEqual(43.125f, response.Value["k1"]);
         });
 
@@ -109,6 +114,7 @@ public Task Dictionary_Float32Value_put() => Test(async (host) =>
         public Task Dictionary_DatetimeValue_get() => Test(async (host) =>
         {
             var response = await new DictionaryClient(host, null).GetDatetimeValueClient().GetDatetimeValueAsync();
+            Assert.AreEqual(1, response.Value.Count);
             Assert.AreEqual(DateTimeOffset.Parse("2022-08-26T18:38:00Z"), response.Value["k1"]);
         });
 
@@ -126,6 +132,7 @@ public Task Dictionary_DatetimeValue_put() => Test(async (host) =>
         public Task Dictionary_DurationValue_get() => Test(async (host) =>
         {
             var response = await new DictionaryClient(host, null).GetDurationValueClient().GetDurationValueAsync();
+            Assert.AreEqual(1, response.Value.Count);
             Assert.AreEqual(XmlConvert.ToTimeSpan("P123DT22H14M12.011S"), response.Value["k1"]);
         });
 
@@ -143,6 +150,7 @@ public Task Dictionary_DurationValue_put() => Test(async (host) =>
         public Task Dictionary_UnknownValue_get() => Test(async (host) =>
         {
             var response = await new DictionaryClient(host, null).GetUnknownValueClient().GetUnknownValueAsync();
+            Assert.AreEqual(3, response.Value.Count);
             Assert.AreEqual(1, response.Value["k1"].ToObjectFromJson());
             Assert.AreEqual("hello", response.Value["k2"].ToObjectFromJson());
             Assert.AreEqual(null, response.Value["k3"]);
@@ -164,6 +172,7 @@ public Task Dictionary_UnknownValue_put() => Test(async (host) =>
         public Task Dictionary_ModelValue_get() => Test(async (host) =>
         {
             var response = await new DictionaryClient(host, null).GetModelValueClient().GetModelValueAsync();
+            Assert.AreEqual(2, response.Value.Count);
             Assert.AreEqual("hello", response.Value["k1"].Property);
             Assert.AreEqual("world", response.Value["k2"].Property);
         });
@@ -183,6 +192,7 @@ public Task Dictionary_ModelValue_put() => Test(async (host) =>
         public Task Dictionary_RecursiveModelValue_get() => Test(async (host) =>
         {
             var response = await new DictionaryClient(host, null).GetRecursiveModelValueClient().GetRecursiveModelValueAsync();
+            Assert.AreEqual(2, response.Value.Count);
             Assert.AreEqual("hello", response.Value["k1"].Property);
             Assert.AreEqual(0, response.Value["k1"].Children.Count);
             Assert.AreEqual("world", response.Value["k2"].Property);
@@ -212,6 +222,7 @@ public Task Dictionary_RecursiveModelValue_put() => Test(async (host) =>
         public Task Type_Dictionary_NullableFloatValue_get() => Test(async (host) =>
         {
             var response = await new DictionaryClient(host, null).GetNullableFloatValueClient().GetNullableFloatValueAsync();
+            Assert.AreEqual(3, response.Value.Count);
             Assert.AreEqual(1.25f, response.Value["k1"]);
             Assert.AreEqual(0.5f, response.Value["k2"]);
             Assert.AreEqual(null, response.Value["k3"]);

test/CadlRanchProjectsNonAzure.Tests/authentication-http-custom.cs

@@ -6,7 +6,7 @@
 
 namespace CadlRanchProjectsNonAzure.Tests
 {
-    public class AuthenticationHttpCustomTests: CadlRanchNonAzureTestBase
+    public class AuthenticationHttpCustomTests : CadlRanchNonAzureTestBase
     {
         [Test]
         public Task Authentication_Http_Custom_valid() => Test(async (host) =>