Browse Source

Cleanup Dependencies slighty (#4178)

* Source link should be private

* Remove unnecessary System.Text.Json reference

* Use logging abstractions

* Use fixed logging version

* Remove unnecessary analysis references

---------

Co-authored-by: Daniel Marbach <[email protected]>
Daniel Marbach 2 months ago
parent
commit
43142dedc3

+ 2 - 2
Directory.Packages.props

@@ -11,9 +11,9 @@
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="[4.11,4.12)" />
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="[4.11,4.12)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="[4.11,4.12)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="[4.11,4.12)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="[9.0.2,10)" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.2,10)" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.6" />
     <PackageVersion Include="System.IO.Abstractions" Version="[22.0.11,23)" />
     <PackageVersion Include="System.IO.Abstractions" Version="[22.0.11,23)" />
-    <PackageVersion Include="System.Text.Json" Version="[8.0.5,9)" />
     <PackageVersion Include="Wcwidth" Version="[2,3)" />
     <PackageVersion Include="Wcwidth" Version="[2,3)" />
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="[1.21.2,2)" />
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="[1.21.2,2)" />
     <PackageVersion Include="Serilog" Version="4.2.0" />
     <PackageVersion Include="Serilog" Version="4.2.0" />

+ 1 - 4
Examples/UICatalog/Scenarios/Scrolling.cs

@@ -1,7 +1,4 @@
-using System;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-
-namespace UICatalog.Scenarios;
+namespace UICatalog.Scenarios;
 
 
 [ScenarioMetadata ("Scrolling", "Content scrolling, IScrollBars, etc...")]
 [ScenarioMetadata ("Scrolling", "Content scrolling, IScrollBars, etc...")]
 [ScenarioCategory ("Controls")]
 [ScenarioCategory ("Controls")]

+ 6 - 7
Terminal.Gui/Terminal.Gui.csproj

@@ -57,15 +57,14 @@
     <ItemGroup>
     <ItemGroup>
         <PackageReference Include="ColorHelper" />
         <PackageReference Include="ColorHelper" />
         <PackageReference Include="JetBrains.Annotations" />
         <PackageReference Include="JetBrains.Annotations" />
-        <PackageReference Include="Microsoft.CodeAnalysis" />
-        <PackageReference Include="Microsoft.CodeAnalysis.Common" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
-        <PackageReference Include="Microsoft.Extensions.Logging" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions " />
         <PackageReference Include="System.IO.Abstractions" />
         <PackageReference Include="System.IO.Abstractions" />
-        <PackageReference Include="System.Text.Json" />
         <PackageReference Include="Wcwidth" />
         <PackageReference Include="Wcwidth" />
-        <!-- Enable Nuget Source Link for github -->
-        <PackageReference Include="Microsoft.SourceLink.GitHub" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <!-- Enable Nuget Source Link for github -->
+      <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
     </ItemGroup>
     </ItemGroup>
     <!-- =================================================================== -->
     <!-- =================================================================== -->
     <!-- Global Usings and Type Aliases -->
     <!-- Global Usings and Type Aliases -->

+ 4 - 0
Tests/TerminalGuiFluentTesting/TerminalGuiFluentTesting.csproj

@@ -11,4 +11,8 @@
 		<ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
 		<ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
 	</ItemGroup>
 	</ItemGroup>
 
 
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Logging" />
+	</ItemGroup>
+
 </Project>
 </Project>