Skip to content

Update Make attributes internal to avoid conflicts #60

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
ChrisPulman merged 1 commit into from
Sep 25, 2024
Merged

Update Make attributes internal to avoid conflicts #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/ReactiveUI.SourceGenerators/Core/Helpers/AttributeDefinitions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace ReactiveUI.SourceGenerators;
/// <seealso cref="System.Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.IViewForGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
public sealed class ReactiveObjectAttribute : Attribute;
internal sealed class ReactiveObjectAttribute : Attribute;
#nullable restore
#pragma warning restore
""";
Expand All @@ -56,7 +56,7 @@ namespace ReactiveUI.SourceGenerators;
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ReactiveCommandGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
public sealed class ReactiveCommandAttribute : Attribute
internal sealed class ReactiveCommandAttribute : Attribute
{
/// <summary>
/// Gets the can execute method or property.
Expand Down Expand Up @@ -90,7 +90,7 @@ namespace ReactiveUI.SourceGenerators;
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ReactiveGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
public sealed class ReactiveAttribute : Attribute;
internal sealed class ReactiveAttribute : Attribute;
#nullable restore
#pragma warning restore
""";
Expand All @@ -115,7 +115,7 @@ namespace ReactiveUI.SourceGenerators;
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
public sealed class ObservableAsPropertyAttribute : Attribute
internal sealed class ObservableAsPropertyAttribute : Attribute
{
/// <summary>
/// Gets the name of the property.
Expand Down Expand Up @@ -153,7 +153,7 @@ namespace ReactiveUI.SourceGenerators;
/// <param name="viewModelType">Type of the view model.</param>
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.IViewForGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
public sealed class IViewForAttribute(string? viewModelType) : Attribute;
internal sealed class IViewForAttribute(string? viewModelType) : Attribute;
#nullable restore
#pragma warning restore
""";
Expand Down Expand Up @@ -182,7 +182,7 @@ namespace ReactiveUI.SourceGenerators.WinForms;
/// <param name="viewModelType">Type of the view model.</param>
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ViewModelControlHostGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
public sealed class ViewModelControlHostAttribute(string? baseType) : Attribute;
internal sealed class ViewModelControlHostAttribute(string? baseType) : Attribute;
#nullable restore
#pragma warning restore
""";
Expand Down Expand Up @@ -211,7 +211,7 @@ namespace ReactiveUI.SourceGenerators.WinForms;
/// <param name="viewModelType">Type of the view model.</param>
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.RoutedControlHostGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
public sealed class RoutedControlHostAttribute(string? baseType) : Attribute;
internal sealed class RoutedControlHostAttribute(string? baseType) : Attribute;
#nullable restore
#pragma warning restore
""";
Expand Down
6 changes: 3 additions & 3 deletions src/ReactiveUI.SourceGenerators/ReactiveUI.SourceGenerators.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>build; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
</ItemGroup>

<!-- This ensures the library will be packaged as a source generator when we use `dotnet pack` -->
Expand Down