From d8fade27dd01046bc521226e12811bf8eecb29b3 Mon Sep 17 00:00:00 2001
From: Alex S <olstakh@microsoft.com>
Date: Sat, 20 Sep 2025 12:00:27 -0700
Subject: [PATCH 1/4] Add analyzers and remove manual assembly attribute

---
 .../Core/Microsoft.Agents.Core/Microsoft.Agents.Core.csproj  | 2 +-
 .../Microsoft.Agents.Extensions.SharePoint/AssemblyInfo.cs   | 1 -
 .../Microsoft.Agents.Extensions.SharePoint.csproj            | 5 ++++-
 .../Serialization/SerializationInit.cs                       | 1 +
 .../Microsoft.Agents.Extensions.Teams/AssemblyInfo.cs        | 1 -
 .../Microsoft.Agents.Extensions.Teams.csproj                 | 3 +++
 .../Serialization/SerializationInit.cs                       | 1 +
 7 files changed, 10 insertions(+), 4 deletions(-)
 delete mode 100644 src/libraries/Extensions/Microsoft.Agents.Extensions.SharePoint/AssemblyInfo.cs

diff --git a/src/libraries/Core/Microsoft.Agents.Core/Microsoft.Agents.Core.csproj b/src/libraries/Core/Microsoft.Agents.Core/Microsoft.Agents.Core.csproj
index 9004e3a0f..47f28aa6f 100644
--- a/src/libraries/Core/Microsoft.Agents.Core/Microsoft.Agents.Core.csproj
+++ b/src/libraries/Core/Microsoft.Agents.Core/Microsoft.Agents.Core.csproj
@@ -48,7 +48,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\Microsoft.Agents.Core.Analyzers\Microsoft.Agents.Core.Analyzers.csproj"	ReferenceOutputAssembly="false" />
+	  <ProjectReference Include="..\Microsoft.Agents.Core.Analyzers\Microsoft.Agents.Core.Analyzers.csproj"	ReferenceOutputAssembly="false" PrivateAssets="all" />
 	</ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/libraries/Extensions/Microsoft.Agents.Extensions.SharePoint/AssemblyInfo.cs b/src/libraries/Extensions/Microsoft.Agents.Extensions.SharePoint/AssemblyInfo.cs
deleted file mode 100644
index 8215f4400..000000000
--- a/src/libraries/Extensions/Microsoft.Agents.Extensions.SharePoint/AssemblyInfo.cs
+++ /dev/null
@@ -1 +0,0 @@
-[assembly: Microsoft.Agents.Core.Serialization.SerializationInitAssembly(typeof(Microsoft.Agents.Extensions.SharePoint.Serialization.SerializationInit))]
diff --git a/src/libraries/Extensions/Microsoft.Agents.Extensions.SharePoint/Microsoft.Agents.Extensions.SharePoint.csproj b/src/libraries/Extensions/Microsoft.Agents.Extensions.SharePoint/Microsoft.Agents.Extensions.SharePoint.csproj
index 2d0ce8416..7d467c451 100644
--- a/src/libraries/Extensions/Microsoft.Agents.Extensions.SharePoint/Microsoft.Agents.Extensions.SharePoint.csproj
+++ b/src/libraries/Extensions/Microsoft.Agents.Extensions.SharePoint/Microsoft.Agents.Extensions.SharePoint.csproj
@@ -12,7 +12,9 @@
         <PackageId>Microsoft.Agents.Extensions.SharePoint</PackageId>
         <Description>Library for creating SharePoint agents using Microsoft Agent SDK</Description>
 		<Summary>Library for building SharePoint agents using Microsoft Agents SDK</Summary>
-    </PropertyGroup>
+		<!-- Set to true to see generated file in obj/Debug/.../Generated folder -->
+	    <EmitCompilerGeneratedFiles>false</EmitCompilerGeneratedFiles>    
+	</PropertyGroup>
 	
 	<PropertyGroup>
 		<Nullable>annotations</Nullable>
@@ -32,6 +34,7 @@
 	<ItemGroup>
 	  <ProjectReference Include="..\..\Builder\Microsoft.Agents.Builder\Microsoft.Agents.Builder.csproj" />
 	  <ProjectReference Include="..\..\Core\Microsoft.Agents.Core\Microsoft.Agents.Core.csproj" />
+	  <ProjectReference Include="..\..\Core\Microsoft.Agents.Core.Analyzers\Microsoft.Agents.Core.Analyzers.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" PrivateAssets="all" />
 	</ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/libraries/Extensions/Microsoft.Agents.Extensions.SharePoint/Serialization/SerializationInit.cs b/src/libraries/Extensions/Microsoft.Agents.Extensions.SharePoint/Serialization/SerializationInit.cs
index 13dcaea2a..450879d30 100644
--- a/src/libraries/Extensions/Microsoft.Agents.Extensions.SharePoint/Serialization/SerializationInit.cs
+++ b/src/libraries/Extensions/Microsoft.Agents.Extensions.SharePoint/Serialization/SerializationInit.cs
@@ -5,6 +5,7 @@
 
 namespace Microsoft.Agents.Extensions.SharePoint.Serialization
 {
+    [SerializationInit]
     internal class SerializationInit
     {
         public static void Init()
diff --git a/src/libraries/Extensions/Microsoft.Agents.Extensions.Teams/AssemblyInfo.cs b/src/libraries/Extensions/Microsoft.Agents.Extensions.Teams/AssemblyInfo.cs
index 32fd02fd3..183ebd877 100644
--- a/src/libraries/Extensions/Microsoft.Agents.Extensions.Teams/AssemblyInfo.cs
+++ b/src/libraries/Extensions/Microsoft.Agents.Extensions.Teams/AssemblyInfo.cs
@@ -8,4 +8,3 @@
 // Allows us to access some internal methods from the Memory.Tests unit tests so we don't have to use reflection and we get compile checks.
 [assembly: InternalsVisibleTo("Microsoft.Agents.Connector.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 [assembly: InternalsVisibleTo("Microsoft.Agents.Extensions.Teams.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
-[assembly: Microsoft.Agents.Core.Serialization.SerializationInitAssembly(typeof(Microsoft.Agents.Extensions.Teams.Serialization.SerializationInit))]
diff --git a/src/libraries/Extensions/Microsoft.Agents.Extensions.Teams/Microsoft.Agents.Extensions.Teams.csproj b/src/libraries/Extensions/Microsoft.Agents.Extensions.Teams/Microsoft.Agents.Extensions.Teams.csproj
index c2beac66d..33fa48bd6 100644
--- a/src/libraries/Extensions/Microsoft.Agents.Extensions.Teams/Microsoft.Agents.Extensions.Teams.csproj
+++ b/src/libraries/Extensions/Microsoft.Agents.Extensions.Teams/Microsoft.Agents.Extensions.Teams.csproj
@@ -5,6 +5,8 @@
 		<ComponentAreaName>CplTeams</ComponentAreaName>
 		<SignAssembly>true</SignAssembly>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
+		<!-- Set to true to see generated file in obj/Debug/.../Generated folder -->
+	    <EmitCompilerGeneratedFiles>false</EmitCompilerGeneratedFiles>
 	</PropertyGroup>
 	<Import Project="..\..\..\Build.Common.core.props" />
 
@@ -33,6 +35,7 @@
 	  <ProjectReference Include="..\..\Builder\Microsoft.Agents.Builder\Microsoft.Agents.Builder.csproj" />
 	  <ProjectReference Include="..\..\Client\Microsoft.Agents.Connector\Microsoft.Agents.Connector.csproj" />
 	  <ProjectReference Include="..\..\Core\Microsoft.Agents.Core\Microsoft.Agents.Core.csproj" />
+	  <ProjectReference Include="..\..\Core\Microsoft.Agents.Core.Analyzers\Microsoft.Agents.Core.Analyzers.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" PrivateAssets="all" />
 	</ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/libraries/Extensions/Microsoft.Agents.Extensions.Teams/Serialization/SerializationInit.cs b/src/libraries/Extensions/Microsoft.Agents.Extensions.Teams/Serialization/SerializationInit.cs
index 2075fb1b9..0cd5030d6 100644
--- a/src/libraries/Extensions/Microsoft.Agents.Extensions.Teams/Serialization/SerializationInit.cs
+++ b/src/libraries/Extensions/Microsoft.Agents.Extensions.Teams/Serialization/SerializationInit.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Agents.Extensions.Teams.Serialization
 {
+    [SerializationInit]
     internal class SerializationInit
     {
         public static void Init()

From 013e07f5308a913b00ebefe133b943b1fe66cc4e Mon Sep 17 00:00:00 2001
From: Alex S <olstakh@microsoft.com>
Date: Sat, 20 Sep 2025 13:19:57 -0700
Subject: [PATCH 2/4] Lower code analysis package version to cover more
 consumers

---
 Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 570dc6c93..ff91d8e94 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -22,7 +22,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageVersion>
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />  
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />  
     <PackageVersion Include="PolySharp" Version="1.15.0" />
     <PackageVersion Include="CsvHelper" Version="33.0.1" />
     <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.1.0-preview.1.25064.3" />

From 7a117189f2e34c9780df5784c738318f827a6ac6 Mon Sep 17 00:00:00 2001
From: Alex S <olstakh@microsoft.com>
Date: Sun, 21 Sep 2025 13:30:36 -0700
Subject: [PATCH 3/4] Downgrade to lowest possible version

---
 Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index ff91d8e94..fdd5d4e9d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -22,7 +22,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageVersion>
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />  
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />  
     <PackageVersion Include="PolySharp" Version="1.15.0" />
     <PackageVersion Include="CsvHelper" Version="33.0.1" />
     <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.1.0-preview.1.25064.3" />

From b6a8d7700bb534c7eebdcefd68f32cf12ac16fce Mon Sep 17 00:00:00 2001
From: Alex S <olstakh@microsoft.com>
Date: Tue, 30 Sep 2025 13:48:30 -0700
Subject: [PATCH 4/4] Post merge

---
 .../Core/Microsoft.Agents.Core/Microsoft.Agents.Core.csproj     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/Core/Microsoft.Agents.Core/Microsoft.Agents.Core.csproj b/src/libraries/Core/Microsoft.Agents.Core/Microsoft.Agents.Core.csproj
index d8d119ef5..1d7fa1639 100644
--- a/src/libraries/Core/Microsoft.Agents.Core/Microsoft.Agents.Core.csproj
+++ b/src/libraries/Core/Microsoft.Agents.Core/Microsoft.Agents.Core.csproj
@@ -58,7 +58,7 @@
 		In order for packing targets to work correctly in this situation - analyzer project either should have <TargetFramework> (without 's'),
 		or be referenced with Condition on a single TargetFramework.
 	   -->
-	  <ProjectReference Include="..\Microsoft.Agents.Core.Analyzers\Microsoft.Agents.Core.Analyzers.csproj"	ReferenceOutputAssembly="false" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
+	  <ProjectReference Include="..\Microsoft.Agents.Core.Analyzers\Microsoft.Agents.Core.Analyzers.csproj"	ReferenceOutputAssembly="false" Condition="'$(TargetFramework)' == 'netstandard2.0'" PrivateAssets="all" />
 	</ItemGroup>
 
 </Project>
\ No newline at end of file