Skip to content

Replace - with _ when generating namespace for generated types #2097

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 7 commits into from
Nov 28, 2023
Merged

Replace - with _ when generating namespace for generated types #2097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6f4c33
Replace - with _ when generating namespace for generated types.
kshyju Nov 20, 2023
dbce5e5
Generate valid namespace when root namespace contains -
kshyju Nov 20, 2023
6c2fe2b
Moving the logic to use rootnamespace to msbuil target
kshyju Nov 27, 2023
d0b0ed8
Replace "-" with "_" when using the RootNamespace if customer app doe…
kshyju Nov 27, 2023
f67f37f
Reverting a test change which is not relevant anymore.
kshyju Nov 27, 2023
2b66347
Fix release notes
kshyju Nov 27, 2023
0df226e
Merge branch 'main' into shkr/get_srcgen_namespace
kshyju Nov 28, 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
13 changes: 4 additions & 9 deletions sdk/Sdk.Generators/FunctionsUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,12 @@ internal static string GetFullyQualifiedMethodName(IMethodSymbol method)
/// </summary>
internal static string GetNamespaceForGeneratedCode(GeneratorExecutionContext context)
{
// If csproj has the msbuild property specified, use it's value.
if (context.AnalyzerConfigOptions.GlobalOptions.TryGetValue(Constants.BuildProperties.GeneratedCodeNamespace, out var namespaceValue)
&& !string.IsNullOrWhiteSpace(namespaceValue))
{
return namespaceValue;
}
// If user has not provided a custom namespace explicitly,
// our msbuild target will set the RootNamespace msbuild property value as the value of this property.
context.AnalyzerConfigOptions.GlobalOptions.TryGetValue(Constants.BuildProperties.GeneratedCodeNamespace, out var namespaceValue);

// Get the "RootNamespace" msbuild property value.(This gets populated in Microsoft.NET.Sdk.props and can be overridden by user in their function app)
context.AnalyzerConfigOptions.GlobalOptions.TryGetValue(Constants.BuildProperties.MSBuildRootNamespace, out var rootNamespaceValue);
return namespaceValue!;

return rootNamespaceValue!;
}
}
}
1 change: 1 addition & 0 deletions sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
<FunctionsEnableExecutorSourceGen Condition="$(FunctionsEnableExecutorSourceGen) == ''">false</FunctionsEnableExecutorSourceGen>
<FunctionsAutoRegisterGeneratedFunctionsExecutor Condition="$(FunctionsAutoRegisterGeneratedFunctionsExecutor) == ''">true</FunctionsAutoRegisterGeneratedFunctionsExecutor>
<FunctionsAutoRegisterGeneratedFunctionsExecutor Condition="$(FunctionsAutoRegisterGeneratedFunctionsExecutor)">true</FunctionsAutoRegisterGeneratedFunctionsExecutor>
<FunctionsGeneratedCodeNamespace Condition="$(FunctionsGeneratedCodeNamespace) == ''">$(RootNamespace.Replace("-", "_"))</FunctionsGeneratedCodeNamespace>
</PropertyGroup>

<UsingTask TaskName="GenerateFunctionMetadata"
Expand Down
9 changes: 7 additions & 2 deletions sdk/release_notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
- My change description (#PR/#issue)
-->

### Microsoft.Azure.Functions.Worker.Sdk 1.16.3 (meta package)
### Microsoft.Azure.Functions.Worker.Sdk 1.16.4 (meta package)


- Update Microsoft.Azure.Functions.Worker.Sdk.Generators dependency to 1.1.5

### Microsoft.Azure.Functions.Worker.Sdk.Generators 1.1.5
- Update worker.config generation to accurate worker executable name (#1053)
- Bug fix for scenarios with `$return` output binding and `HttpTrigger` breaking output-binding rules (#2098)
- Generate valid namespace when root namespace contains `-` (#2097)
- Bug fix for scenarios with `$return` output binding and `HttpTrigger` breaking output-binding rules (#2098)
5 changes: 3 additions & 2 deletions test/Sdk.Generator.Tests/TestHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ public static Task RunTestAsync<TSourceGenerator>(
string? expectedFileName,
string? expectedOutputSource,
List<DiagnosticResult>? expectedDiagnosticResults = null,
IDictionary<string, string>? buildPropertiesDictionary = null) where TSourceGenerator : ISourceGenerator, new()
IDictionary<string, string>? buildPropertiesDictionary = null,
string? generatedCodeNamespace = null) where TSourceGenerator : ISourceGenerator, new()
{
CSharpSourceGeneratorVerifier<TSourceGenerator>.Test test = new()
{
Expand All @@ -49,7 +50,7 @@ public static Task RunTestAsync<TSourceGenerator>(
var config = $@"is_global = true
build_property.FunctionsEnableExecutorSourceGen = {true}
build_property.FunctionsEnableMetadataSourceGen = {true}
build_property.RootNamespace = TestProject";
build_property.FunctionsGeneratedCodeNamespace = {generatedCodeNamespace ?? "TestProject"}";

// Add test specific MSBuild properties.
if (buildPropertiesDictionary is not null)
Expand Down