From 7143cd385df4dbe84e199ecfefe18d596fe15097 Mon Sep 17 00:00:00 2001
From: Maggiekimani1 <maggiekim42@gmail.com>
Date: Wed, 4 Sep 2024 12:57:36 +0300
Subject: [PATCH 1/2] Disable VisualStudio.Threading analyzers to eliminate
 build failures for dependent projects

---
 .../Microsoft.OpenApi.Readers.csproj                     | 9 ++++++++-
 src/Microsoft.OpenApi/Microsoft.OpenApi.csproj           | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
index 0a517bbce..7768e3a89 100644
--- a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
+++ b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
@@ -3,7 +3,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>1.6.19</Version>
+        <Version>1.6.20</Version>
         <Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
         <SignAssembly>true</SignAssembly>
         <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
@@ -22,6 +22,13 @@
         <PackageReference Include="SharpYaml" Version="2.1.1" />
     </ItemGroup>
 
+    <!-- Workaround to disable Microsoft.VisualStudio.Threading.Analyzers -->
+    <Target Name="DisableVSAnalyzers" BeforeTargets="CoreCompile" Condition=" '$(RunStaticAnalysis)' == '' OR '$(RunStaticAnalysis)' == 'false' ">
+        <ItemGroup>
+            <Analyzer Remove="@(Analyzer)" Condition=" '%(Filename)' == 'Microsoft.VisualStudio.Threading.Analyzers' OR '%(Filename)' == 'Microsoft.VisualStudio.Threading.Analyzers.CSharp' " />
+        </ItemGroup>
+    </Target>
+
     <ItemGroup>
         <ProjectReference Include="..\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
     </ItemGroup>
diff --git a/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj b/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
index d889cc760..5db722570 100644
--- a/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
+++ b/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
@@ -3,7 +3,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>Latest</LangVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>1.6.19</Version>
+        <Version>1.6.20</Version>
         <Description>.NET models with JSON and YAML writers for OpenAPI specification</Description>
         <SignAssembly>true</SignAssembly>
         <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
@@ -39,4 +39,11 @@
     <ItemGroup>
       <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.11.20" />
     </ItemGroup>
+
+    <!-- Workaround to disable Microsoft.VisualStudio.Threading.Analyzers -->
+    <Target Name="DisableVSAnalyzers" BeforeTargets="CoreCompile" Condition=" '$(RunStaticAnalysis)' == '' OR '$(RunStaticAnalysis)' == 'false' ">
+        <ItemGroup>
+            <Analyzer Remove="@(Analyzer)" Condition=" '%(Filename)' == 'Microsoft.VisualStudio.Threading.Analyzers' OR '%(Filename)' == 'Microsoft.VisualStudio.Threading.Analyzers.CSharp' " />
+        </ItemGroup>
+    </Target>
 </Project>

From 693d3e389c3a942eb61621c64b27b3a64addcb45 Mon Sep 17 00:00:00 2001
From: Maggiekimani1 <maggiekim42@gmail.com>
Date: Wed, 4 Sep 2024 15:38:45 +0300
Subject: [PATCH 2/2] Use privateAssets setting to control dependency assets

---
 .../Microsoft.OpenApi.Readers.csproj                 | 12 ++++--------
 src/Microsoft.OpenApi/Microsoft.OpenApi.csproj       | 11 +++--------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
index 7768e3a89..83bc1be2e 100644
--- a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
+++ b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
@@ -18,17 +18,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.11.20" />
+        <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.11.20">
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+
         <PackageReference Include="SharpYaml" Version="2.1.1" />
     </ItemGroup>
 
-    <!-- Workaround to disable Microsoft.VisualStudio.Threading.Analyzers -->
-    <Target Name="DisableVSAnalyzers" BeforeTargets="CoreCompile" Condition=" '$(RunStaticAnalysis)' == '' OR '$(RunStaticAnalysis)' == 'false' ">
-        <ItemGroup>
-            <Analyzer Remove="@(Analyzer)" Condition=" '%(Filename)' == 'Microsoft.VisualStudio.Threading.Analyzers' OR '%(Filename)' == 'Microsoft.VisualStudio.Threading.Analyzers.CSharp' " />
-        </ItemGroup>
-    </Target>
-
     <ItemGroup>
         <ProjectReference Include="..\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
     </ItemGroup>
diff --git a/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj b/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
index 5db722570..61680a879 100644
--- a/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
+++ b/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
@@ -37,13 +37,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.11.20" />
+      <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.11.20" >
+          <PrivateAssets>all</PrivateAssets>
+      </PackageReference>
     </ItemGroup>
-
-    <!-- Workaround to disable Microsoft.VisualStudio.Threading.Analyzers -->
-    <Target Name="DisableVSAnalyzers" BeforeTargets="CoreCompile" Condition=" '$(RunStaticAnalysis)' == '' OR '$(RunStaticAnalysis)' == 'false' ">
-        <ItemGroup>
-            <Analyzer Remove="@(Analyzer)" Condition=" '%(Filename)' == 'Microsoft.VisualStudio.Threading.Analyzers' OR '%(Filename)' == 'Microsoft.VisualStudio.Threading.Analyzers.CSharp' " />
-        </ItemGroup>
-    </Target>
 </Project>