Upgrade Authoring source generator to use new Roslyn API. (#432)

microsoft · Sep 24, 2020 · 2fe4e76 · 2fe4e76
1 parent 3831edd
commit 2fe4e76
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Authoring/WinRT.SourceGenerator/Generator.cs b/Authoring/WinRT.SourceGenerator/Generator.cs
@@ -15,27 +15,27 @@ public class SourceGenerator : ISourceGenerator
  {
  private string _tempFolder;
 
- private string GetAssemblyName(SourceGeneratorContext context)
+ private string GetAssemblyName(GeneratorExecutionContext context)
  {
  context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.AssemblyName", out var assemblyName);
  return assemblyName;
  }
 
- private string GetAssemblyVersion(SourceGeneratorContext context)
+ private string GetAssemblyVersion(GeneratorExecutionContext context)
  {
  context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.AssemblyVersion", out var assemblyVersion);
  return assemblyVersion;
  }
 
- public static string GetGeneratedFilesDir(SourceGeneratorContext context)
+ public static string GetGeneratedFilesDir(GeneratorExecutionContext context)
  {
  // TODO: determine correct location to write to.
  context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.GeneratedFilesDir", out var generatedFilesDir);
  Directory.CreateDirectory(generatedFilesDir);
  return generatedFilesDir;
  }
 
- private static bool IsCsWinRTComponent(SourceGeneratorContext context)
+ private static bool IsCsWinRTComponent(GeneratorExecutionContext context)
  {
  if (context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.CsWinRTComponent", out var isCsWinRTComponentStr))
  {
@@ -45,7 +45,7 @@ private static bool IsCsWinRTComponent(SourceGeneratorContext context)
  return false;
  }
 
- private static string GetCsWinRTExe(SourceGeneratorContext context)
+ private static string GetCsWinRTExe(GeneratorExecutionContext context)
  {
  context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.CsWinRTExe", out var cswinrtExe);
  return cswinrtExe;
@@ -73,7 +73,7 @@ private string GetTempFolder(bool clearSourceFilesFromFolder = false)
  return _tempFolder;
  }
 
- private void GenerateSources(SourceGeneratorContext context)
+ private void GenerateSources(GeneratorExecutionContext context)
  {
  string cswinrtExe = GetCsWinRTExe(context);
  string assemblyName = GetAssemblyName(context);
@@ -110,7 +110,7 @@ private void GenerateSources(SourceGeneratorContext context)
  Directory.Delete(outputDir, true);
  }
 
- private string GetWinmdOutputFile(SourceGeneratorContext context)
+ private string GetWinmdOutputFile(GeneratorExecutionContext context)
  {
  return Path.Combine(GetGeneratedFilesDir(context), GetAssemblyName(context) + ".winmd");
  }
@@ -133,7 +133,7 @@ private void GenerateWinMD(MetadataBuilder metadataBuilder, string outputFile)
  peBlob.WriteContentTo(fs);
  }
 
- public void Execute(SourceGeneratorContext context)
+ public void Execute(GeneratorExecutionContext context)
  {
  if (!IsCsWinRTComponent(context))
  {
@@ -179,7 +179,7 @@ public void Execute(SourceGeneratorContext context)
  Logger.Close();
  }
 
- public void Initialize(InitializationContext context)
+ public void Initialize(GeneratorInitializationContext context)
  {
  }
  }

diff --git a/Authoring/WinRT.SourceGenerator/Logger.cs b/Authoring/WinRT.SourceGenerator/Logger.cs
@@ -5,7 +5,7 @@ namespace Generator
 {
  class Logger
  {
- public static void Initialize(SourceGeneratorContext context)
+ public static void Initialize(GeneratorExecutionContext context)
  {
  context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.CsWinRTEnableLogging", out var enableLoggingStr);
  if (enableLoggingStr != null && bool.TryParse(enableLoggingStr, out var enableLogging) && enableLogging)

diff --git a/Authoring/WinRT.SourceGenerator/WinRT.SourceGenerator.csproj b/Authoring/WinRT.SourceGenerator/WinRT.SourceGenerator.csproj
@@ -6,7 +6,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.7.0" PrivateAssets="all" />
+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0-4.20472.6" PrivateAssets="all" />
  <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0" PrivateAssets="all" /> 
  </ItemGroup>