Skip to content

Downgrading analyzer assembly version to fix workflow registration issues #1854

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
WhitWaldo merged 5 commits into from
Jun 15, 2026
+28 −22
Merged

Downgrading analyzer assembly version to fix workflow registration issues #1854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbc2d6d
Reverting package upgrade for analyzers from 5.3.0 to 5.0.0 because o…
WhitWaldo Jun 15, 2026
e6b95b6
Removed extraneous text from file
WhitWaldo Jun 15, 2026
e84e6b9
Reverting analyzer packages to 1.17 release versions
WhitWaldo Jun 15, 2026
becc6f3
Reverting to use SHA256 (for 5.0.0) instead of SHA1 (which was used i…
WhitWaldo Jun 15, 2026
79c78af
Merge branch 'master' into change-analyzer-assemblies
WhitWaldo Jun 15, 2026
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
10 changes: 5 additions & 5 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.24" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.13" Condition="'$(TargetFramework)' == 'net9.0'" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.3" Condition="'$(TargetFramework)' == 'net10.0'" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.2" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0" />
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.6.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
Expand Down
28 changes: 16 additions & 12 deletions src/Dapr.Actors.Generators/ActorClientGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@
// limitations under the License.
// ------------------------------------------------------------------------

using System.Collections.Immutable;
using Dapr.Actors.Generators.Diagnostics;
using Dapr.Actors.Generators.Extensions;
using Dapr.Actors.Generators.Helpers;
using Dapr.Actors.Generators.Models;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using System.Collections.Immutable;
using System.Text;
using Dapr.Actors.Generators.Diagnostics;
using Dapr.Actors.Generators.Extensions;
using Dapr.Actors.Generators.Helpers;
using Dapr.Actors.Generators.Models;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Text;

namespace Dapr.Actors.Generators;

Expand Down Expand Up @@ -191,10 +193,12 @@ private static void GenerateActorClientCode(SourceProductionContext context, Act
.NormalizeWhitespace()
.ToFullString();

context.AddSource($"{descriptor.FullyQualifiedTypeName}.g.cs", compilationOutput);
}
catch (DiagnosticsException e)
{
context.AddSource(
$"{descriptor.FullyQualifiedTypeName}.g.cs",
SourceText.From(compilationOutput, Encoding.UTF8, SourceHashAlgorithm.Sha256));
}
catch (DiagnosticsException e)
{
foreach (var diagnostic in e.Diagnostics)
{
context.ReportDiagnostic(diagnostic);
Expand Down
8 changes: 5 additions & 3 deletions src/Dapr.Actors.Generators/Templates.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ internal sealed class {Constants.ActorMethodAttributeTypeName} : Attribute
SyntaxFactory.ParseCompilationUnit(source)
.NormalizeWhitespace()
.ToFullString(),
Encoding.UTF8);
Encoding.UTF8,
SourceHashAlgorithm.Sha256);
}

/// <summary>
Expand Down Expand Up @@ -81,6 +82,7 @@ internal sealed class {Constants.GenerateActorClientAttributeTypeName} : Attribu
SyntaxFactory.ParseCompilationUnit(source)
.NormalizeWhitespace()
.ToFullString(),
Encoding.UTF8);
Encoding.UTF8,
SourceHashAlgorithm.Sha256);
}
}
}
4 changes: 2 additions & 2 deletions test/Dapr.Actors.Generators.Test/ActorClientGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ internal sealed class ActorMethodAttribute : Attribute

private static readonly (string, SourceText) ActorMethodAttributeSource = (
Path.Combine("Dapr.Actors.Generators", "Dapr.Actors.Generators.ActorClientGenerator", "Dapr.Actors.Generators.ActorMethodAttribute.g.cs"),
SourceText.From(ActorMethodAttributeText, Encoding.UTF8));
CreateGeneratedSourceText(ActorMethodAttributeText));

private const string GenerateActorClientAttributeText = $@"// <auto-generated/>
#nullable enable
Expand All @@ -54,7 +54,7 @@ internal sealed class GenerateActorClientAttribute : Attribute

private static readonly (string, SourceText) GenerateActorClientAttributeSource = (
Path.Combine("Dapr.Actors.Generators", "Dapr.Actors.Generators.ActorClientGenerator", "Dapr.Actors.Generators.GenerateActorClientAttribute.g.cs"),
SourceText.From(GenerateActorClientAttributeText, Encoding.UTF8));
CreateGeneratedSourceText(GenerateActorClientAttributeText));

private static SourceText CreateGeneratedSourceText(string text) =>
SourceText.From(text, Encoding.UTF8, SourceHashAlgorithm.Sha256);
Expand Down
Loading