From 10e5d347a5442eb4ceeb23b712678f993a31fb63 Mon Sep 17 00:00:00 2001 From: Chris Sienkiewicz Date: Mon, 14 Sep 2020 16:37:31 -0700 Subject: [PATCH] Update generator samples to latest version of the API --- eng/Versions.props | 2 +- .../SourceGeneratorSamples/AutoNotifyGenerator.cs | 6 +++--- .../SourceGenerators/SourceGeneratorSamples/CsvGenerator.cs | 6 +++--- .../SourceGeneratorSamples/HelloWorldGenerator.cs | 4 ++-- .../SourceGeneratorSamples/MustacheGenerator.cs | 6 +++--- .../SourceGeneratorSamples/SettingsXmlGenerator.cs | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 60cc828904..63bfe7e7a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ true true true - 3.7.0-4.20351.2 + 3.8.0-4.20464.1 16.1.1 diff --git a/samples/CSharp/SourceGenerators/SourceGeneratorSamples/AutoNotifyGenerator.cs b/samples/CSharp/SourceGenerators/SourceGeneratorSamples/AutoNotifyGenerator.cs index eae0965998..5ec21421a9 100644 --- a/samples/CSharp/SourceGenerators/SourceGeneratorSamples/AutoNotifyGenerator.cs +++ b/samples/CSharp/SourceGenerators/SourceGeneratorSamples/AutoNotifyGenerator.cs @@ -27,13 +27,13 @@ public AutoNotifyAttribute() } "; - public void Initialize(InitializationContext context) + public void Initialize(GeneratorInitializationContext context) { // Register a syntax receiver that will be created for each generation pass context.RegisterForSyntaxNotifications(() => new SyntaxReceiver()); } - public void Execute(SourceGeneratorContext context) + public void Execute(GeneratorExecutionContext context) { // add the attribute text context.AddSource("AutoNotifyAttribute", SourceText.From(attributeText, Encoding.UTF8)); @@ -75,7 +75,7 @@ public void Execute(SourceGeneratorContext context) } } - private string ProcessClass(INamedTypeSymbol classSymbol, List fields, ISymbol attributeSymbol, ISymbol notifySymbol, SourceGeneratorContext context) + private string ProcessClass(INamedTypeSymbol classSymbol, List fields, ISymbol attributeSymbol, ISymbol notifySymbol, GeneratorExecutionContext context) { if (!classSymbol.ContainingSymbol.Equals(classSymbol.ContainingNamespace, SymbolEqualityComparer.Default)) { diff --git a/samples/CSharp/SourceGenerators/SourceGeneratorSamples/CsvGenerator.cs b/samples/CSharp/SourceGenerators/SourceGeneratorSamples/CsvGenerator.cs index 35c2944f5a..d25b5111e1 100644 --- a/samples/CSharp/SourceGenerators/SourceGeneratorSamples/CsvGenerator.cs +++ b/samples/CSharp/SourceGenerators/SourceGeneratorSamples/CsvGenerator.cs @@ -151,7 +151,7 @@ static string StringToValidPropertyName(string s) static IEnumerable<(string, string)> SourceFilesFromAdditionalFiles(IEnumerable<(CsvLoadType loadTime, bool cacheObjects, AdditionalText file)> pathsData) => pathsData.SelectMany(d => SourceFilesFromAdditionalFile(d.loadTime, d.cacheObjects, d.file)); - static IEnumerable<(CsvLoadType, bool, AdditionalText)> GetLoadOptions(SourceGeneratorContext context) + static IEnumerable<(CsvLoadType, bool, AdditionalText)> GetLoadOptions(GeneratorExecutionContext context) { foreach (AdditionalText file in context.AdditionalFiles) { @@ -169,7 +169,7 @@ static string StringToValidPropertyName(string s) } } - public void Execute(SourceGeneratorContext context) + public void Execute(GeneratorExecutionContext context) { IEnumerable<(CsvLoadType, bool, AdditionalText)> options = GetLoadOptions(context); IEnumerable<(string, string)> nameCodeSequence = SourceFilesFromAdditionalFiles(options); @@ -177,7 +177,7 @@ public void Execute(SourceGeneratorContext context) context.AddSource($"Csv_{name}", SourceText.From(code, Encoding.UTF8)); } - public void Initialize(InitializationContext context) + public void Initialize(GeneratorInitializationContext context) { } } diff --git a/samples/CSharp/SourceGenerators/SourceGeneratorSamples/HelloWorldGenerator.cs b/samples/CSharp/SourceGenerators/SourceGeneratorSamples/HelloWorldGenerator.cs index 2beb0aebe4..d3f099527a 100644 --- a/samples/CSharp/SourceGenerators/SourceGeneratorSamples/HelloWorldGenerator.cs +++ b/samples/CSharp/SourceGenerators/SourceGeneratorSamples/HelloWorldGenerator.cs @@ -9,7 +9,7 @@ namespace SourceGeneratorSamples [Generator] public class HelloWorldGenerator : ISourceGenerator { - public void Execute(SourceGeneratorContext context) + public void Execute(GeneratorExecutionContext context) { // begin creating the source we'll inject into the users compilation StringBuilder sourceBuilder = new StringBuilder(@" @@ -43,7 +43,7 @@ public static void SayHello() context.AddSource("helloWorldGenerated", SourceText.From(sourceBuilder.ToString(), Encoding.UTF8)); } - public void Initialize(InitializationContext context) + public void Initialize(GeneratorInitializationContext context) { // No initialization required } diff --git a/samples/CSharp/SourceGenerators/SourceGeneratorSamples/MustacheGenerator.cs b/samples/CSharp/SourceGenerators/SourceGeneratorSamples/MustacheGenerator.cs index 72bd05776f..8a514cc781 100644 --- a/samples/CSharp/SourceGenerators/SourceGeneratorSamples/MustacheGenerator.cs +++ b/samples/CSharp/SourceGenerators/SourceGeneratorSamples/MustacheGenerator.cs @@ -15,7 +15,7 @@ namespace Mustache [Generator] public class MustacheGenerator : ISourceGenerator { - public void Execute(SourceGeneratorContext context) + public void Execute(GeneratorExecutionContext context) { string attributeSource = @" [System.AttributeUsage(System.AttributeTargets.Assembly, AllowMultiple=true)] @@ -64,7 +64,7 @@ public MustacheAttribute(string name, string template, string hash) ExpressionSyntax expr = arg.Expression; TypeInfo t = m.GetTypeInfo(expr); - Optional v = m.GetConstantValue(expr); + Optional v = m.GetConstantValue(expr); if (index == 0) { mustacheName = v.ToString(); @@ -116,7 +116,7 @@ public static partial class Constants {{ } - public void Initialize(InitializationContext context) + public void Initialize(GeneratorInitializationContext context) { // No initialization required } diff --git a/samples/CSharp/SourceGenerators/SourceGeneratorSamples/SettingsXmlGenerator.cs b/samples/CSharp/SourceGenerators/SourceGeneratorSamples/SettingsXmlGenerator.cs index e277d2cf84..bbb0a5aa1b 100644 --- a/samples/CSharp/SourceGenerators/SourceGeneratorSamples/SettingsXmlGenerator.cs +++ b/samples/CSharp/SourceGenerators/SourceGeneratorSamples/SettingsXmlGenerator.cs @@ -21,7 +21,7 @@ public partial class XmlSettings } } "; - public void Execute(SourceGeneratorContext context) + public void Execute(GeneratorExecutionContext context) { // Using the context, get any additional files that end in .xmlsettings IEnumerable settingsFiles = context.AdditionalFiles.Where(at => at.Path.EndsWith(".xmlsettings")); @@ -31,7 +31,7 @@ public void Execute(SourceGeneratorContext context) } } - private void ProcessSettingsFile(AdditionalText xmlFile, SourceGeneratorContext context) + private void ProcessSettingsFile(AdditionalText xmlFile, GeneratorExecutionContext context) { // try and load the settings file XmlDocument xmlDoc = new XmlDocument(); @@ -101,7 +101,7 @@ public class {name}Settings context.AddSource($"Settings_{name}", SourceText.From(sb.ToString(), Encoding.UTF8)); } - public void Initialize(InitializationContext context) + public void Initialize(GeneratorInitializationContext context) { } }