From 142094d00c0a2865ecfce9ca71f2d5f68102f959 Mon Sep 17 00:00:00 2001
From: Chris Pulman <chris.pulman@yahoo.com>
Date: Wed, 25 Sep 2024 21:31:10 +0100
Subject: [PATCH] Make attributes internal to avoid conflicts

---
 .../Core/Helpers/AttributeDefinitions.cs           | 14 +++++++-------
 .../ReactiveUI.SourceGenerators.csproj             |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ReactiveUI.SourceGenerators/Core/Helpers/AttributeDefinitions.cs b/src/ReactiveUI.SourceGenerators/Core/Helpers/AttributeDefinitions.cs
index 68ed595..1813feb 100644
--- a/src/ReactiveUI.SourceGenerators/Core/Helpers/AttributeDefinitions.cs
+++ b/src/ReactiveUI.SourceGenerators/Core/Helpers/AttributeDefinitions.cs
@@ -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
 """;
@@ -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.
@@ -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
 """;
@@ -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.
@@ -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
 """;
@@ -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
 """;
@@ -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
 """;
diff --git a/src/ReactiveUI.SourceGenerators/ReactiveUI.SourceGenerators.csproj b/src/ReactiveUI.SourceGenerators/ReactiveUI.SourceGenerators.csproj
index e7e833a..85b821f 100644
--- a/src/ReactiveUI.SourceGenerators/ReactiveUI.SourceGenerators.csproj
+++ b/src/ReactiveUI.SourceGenerators/ReactiveUI.SourceGenerators.csproj
@@ -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` -->