Skip to content

Remove new language features from generated type #2108

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
kshyju merged 2 commits into from
Nov 30, 2023
Merged

Remove new language features from generated type #2108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
514e14c
Remove new language features such as "target-typed object creation" &…
kshyju Nov 30, 2023
8bdaa0a
Adding CSharp language versions to test matrix
kshyju Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sdk/Sdk.Generators/FunctionExecutor/FunctionExecutorGenerator.Emitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ private static string GetTypesDictionary(IEnumerable<ExecutableFunction> functio
}

return $$"""
private readonly Dictionary<string, Type> types = new()
private readonly Dictionary<string, Type> types = new Dictionary<string, Type>()
{
{{string.Join($",{Environment.NewLine} ", typesDict.Select(c => $$""" { "{{c.Key}}", Type.GetType("{{c.Key}}, {{c.Value}}")! }"""))}}
{{string.Join($",{Environment.NewLine} ", typesDict.Select(c => $$""" { "{{c.Key}}", Type.GetType("{{c.Key}}, {{c.Value}}") }"""))}}
};

""";
Expand Down Expand Up @@ -144,8 +144,8 @@ private static string GetMethodBody(IEnumerable<ExecutableFunction> functions, b
var sb = new StringBuilder();
sb.Append(
$$"""
var inputBindingFeature = context.Features.Get<IFunctionInputBindingFeature>()!;
var inputBindingResult = await inputBindingFeature.BindFunctionInputAsync(context)!;
var inputBindingFeature = context.Features.Get<IFunctionInputBindingFeature>();
var inputBindingResult = await inputBindingFeature.BindFunctionInputAsync(context);
var inputArguments = inputBindingResult.Values;
{{(anyDefaultExecutor ? $" _defaultExecutor = new Lazy<IFunctionExecutor>(() => CreateDefaultExecutorInstance(context));{Environment.NewLine}" : string.Empty)}}
""");
Expand Down
40 changes: 31 additions & 9 deletions test/Sdk.Generator.Tests/ExtensionStartupRunnerGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Threading.Tasks;
using Microsoft.Azure.Functions.Tests.WorkerExtensionsSample;
using Microsoft.Azure.Functions.Worker.Sdk.Generators;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.Testing;
using Worker.Extensions.Sample_IncorrectImplementation;
using Xunit;
Expand All @@ -19,8 +20,14 @@ public class Foo
}
""";

[Fact]
public async Task StartupExecutorCodeGetsGenerated()
[Theory]
[InlineData(LanguageVersion.CSharp7_3)]
[InlineData(LanguageVersion.CSharp8)]
[InlineData(LanguageVersion.CSharp9)]
[InlineData(LanguageVersion.CSharp10)]
[InlineData(LanguageVersion.CSharp11)]
[InlineData(LanguageVersion.Latest)]
public async Task StartupExecutorCodeGetsGenerated(LanguageVersion languageVersion)
{
// Source generation is based on referenced assembly.
var referencedExtensionAssemblies = new[]
Expand Down Expand Up @@ -66,11 +73,18 @@ await TestHelpers.RunTestAsync<ExtensionStartupRunnerGenerator>(
referencedExtensionAssemblies,
InputCode,
expectedGeneratedFileName,
expectedOutput);
expectedOutput,
languageVersion: languageVersion);
}

[Fact]
public async Task StartupExecutorCodeDoesNotGetsGeneratedWheNoExtensionAssembliesAreReferenced()
[Theory]
[InlineData(LanguageVersion.CSharp7_3)]
[InlineData(LanguageVersion.CSharp8)]
[InlineData(LanguageVersion.CSharp9)]
[InlineData(LanguageVersion.CSharp10)]
[InlineData(LanguageVersion.CSharp11)]
[InlineData(LanguageVersion.Latest)]
public async Task StartupExecutorCodeDoesNotGetsGeneratedWheNoExtensionAssembliesAreReferenced(LanguageVersion languageVersion)
{
// source gen will happen only when an assembly with worker startup type is defined.
var referencedExtensionAssemblies = Array.Empty<System.Reflection.Assembly>();
Expand All @@ -82,11 +96,18 @@ await TestHelpers.RunTestAsync<ExtensionStartupRunnerGenerator>(
referencedExtensionAssemblies,
InputCode,
expectedGeneratedFileName,
expectedOutput);
expectedOutput,
languageVersion: languageVersion);
}

[Fact]
public async Task DiagnosticErrorsAreReportedWhenStartupTypeIsInvalid()
[Theory]
[InlineData(LanguageVersion.CSharp7_3)]
[InlineData(LanguageVersion.CSharp8)]
[InlineData(LanguageVersion.CSharp9)]
[InlineData(LanguageVersion.CSharp10)]
[InlineData(LanguageVersion.CSharp11)]
[InlineData(LanguageVersion.Latest)]
public async Task DiagnosticErrorsAreReportedWhenStartupTypeIsInvalid(LanguageVersion languageVersion)
{
var referencedExtensionAssemblies = new[]
{
Expand Down Expand Up @@ -154,7 +175,8 @@ await TestHelpers.RunTestAsync<ExtensionStartupRunnerGenerator>(
expectedGeneratedFileName,
expectedOutput,
expectedDiagnosticResults,
buildPropertiesDict);
buildPropertiesDict,
languageVersion: languageVersion);
}
}
}
14 changes: 7 additions & 7 deletions test/Sdk.Generator.Tests/FunctionExecutor/DependentAssemblyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ internal class DirectFunctionExecutor : IFunctionExecutor
{
private readonly IFunctionActivator _functionActivator;
private Lazy<IFunctionExecutor> _defaultExecutor;
private readonly Dictionary<string, Type> types = new()
private readonly Dictionary<string, Type> types = new Dictionary<string, Type>()
{
{ "MyCompany.MyHttpTriggers", Type.GetType("MyCompany.MyHttpTriggers, TestProject, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null")! },
{ "DependentAssemblyWithFunctions.DependencyFunction", Type.GetType("DependentAssemblyWithFunctions.DependencyFunction, DependentAssemblyWithFunctions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null")! },
{ "MyCompany.MyProduct.MyApp.HttpFunctions", Type.GetType("MyCompany.MyProduct.MyApp.HttpFunctions, DependentAssemblyWithFunctions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null")! },
{ "MyCompany.MyProduct.MyApp.Foo.Bar", Type.GetType("MyCompany.MyProduct.MyApp.Foo.Bar, DependentAssemblyWithFunctions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null")! }
{ "MyCompany.MyHttpTriggers", Type.GetType("MyCompany.MyHttpTriggers, TestProject, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null") },
{ "DependentAssemblyWithFunctions.DependencyFunction", Type.GetType("DependentAssemblyWithFunctions.DependencyFunction, DependentAssemblyWithFunctions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null") },
{ "MyCompany.MyProduct.MyApp.HttpFunctions", Type.GetType("MyCompany.MyProduct.MyApp.HttpFunctions, DependentAssemblyWithFunctions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null") },
{ "MyCompany.MyProduct.MyApp.Foo.Bar", Type.GetType("MyCompany.MyProduct.MyApp.Foo.Bar, DependentAssemblyWithFunctions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null") }
};

public DirectFunctionExecutor(IFunctionActivator functionActivator)
Expand All @@ -89,8 +89,8 @@ public DirectFunctionExecutor(IFunctionActivator functionActivator)
/// <inheritdoc/>
public async ValueTask ExecuteAsync(FunctionContext context)
{
var inputBindingFeature = context.Features.Get<IFunctionInputBindingFeature>()!;
var inputBindingResult = await inputBindingFeature.BindFunctionInputAsync(context)!;
var inputBindingFeature = context.Features.Get<IFunctionInputBindingFeature>();
var inputBindingResult = await inputBindingFeature.BindFunctionInputAsync(context);
var inputArguments = inputBindingResult.Values;
_defaultExecutor = new Lazy<IFunctionExecutor>(() => CreateDefaultExecutorInstance(context));

Expand Down
Loading