Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-31 02:08:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolving merge conflicts.

Browse Source
This commit is contained in:
BDisp
2024-07-11 14:12:23 +01:00
parent f974861395 9aee2d1ce6
commit d8d491a216
7 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CommunityToolkitExample/CommunityToolkitExample.csproj
View File

@@ -8,16 +8,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="[8.2.2,9)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[8,9)" />
<ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
</ItemGroup>
</Project>

4
Directory.Build.props
View File

@@ -1,6 +1,6 @@
<Project>
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="all" />
<PackageReference Include="JetBrains.ExternalAnnotations" Version="10.2.149" PrivateAssets="all" />
<PackageReference Include="JetBrains.Annotations" Version="[2024,)" PrivateAssets="all" />
<PackageReference Include="JetBrains.ExternalAnnotations" Version="[10.2.149,)" PrivateAssets="all" />
</ItemGroup>
</Project>

3
Example/Example.csproj
View File

@@ -13,7 +13,4 @@
<ItemGroup>
<ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
</ItemGroup>
</Project>

9
ReactiveExample/ReactiveExample.csproj
View File

@@ -11,14 +11,11 @@
<InformationalVersion>2.0</InformationalVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
<PackageReference Include="ReactiveUI" Version="20.1.1" />
<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" PrivateAssets="all" />
<PackageReference Include="ReactiveUI.Fody" Version="[19.5.41,21)" />
<PackageReference Include="ReactiveUI" Version="[20.1.1,21)" />
<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="[1.3.1,2)" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
</ItemGroup>
</Project>

25
Terminal.Gui/Terminal.Gui.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<!-- =================================================================== -->
<!-- Version numbers -->
<!-- Automatically updated by gitversion (run `dotnet-gitversion /updateprojectfiles`) -->
@@ -52,16 +52,21 @@
<!-- Dependencies -->
<!-- =================================================================== -->
<ItemGroup>
<PackageReference Include="ColorHelper" Version="1.8.1" />
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.10.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" PrivateAssets="all" />
<PackageReference Include="ColorHelper" Version="[1.8.1,2)" />
<PackageReference Include="JetBrains.Annotations" Version="[2024,)" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="[4.10,5)" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="[4.10,5)" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="[4.10,5)" PrivateAssets="all" />
<!-- Enable Nuget Source Link for github -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="System.IO.Abstractions" Version="21.0.22" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="Wcwidth" Version="2.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="[8,9)" PrivateAssets="all" />
<PackageReference Include="System.IO.Abstractions" Version="[21.0.22,22)" />
<PackageReference Include="System.Text.Json" Version="[8.0.4,9)" />
<PackageReference Include="Wcwidth" Version="[2,3)" />
<ProjectReference Include="..\Analyzers\Terminal.Gui.Analyzers.Internal\Terminal.Gui.Analyzers.Internal.csproj">
<PrivateAssets>all</PrivateAssets>
<OutputItemType>Analyzer</OutputItemType>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<!-- =================================================================== -->
<!-- Global Usings and Type Aliases -->

13
UICatalog/UICatalog.csproj
View File

@@ -29,11 +29,11 @@
<None Update="./Scenarios/Spinning_globe_dark_small.gif" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
<PackageReference Include="CsvHelper" Version="33.0.1" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="[1.21,2)" />
<PackageReference Include="SixLabors.ImageSharp" Version="[3.1.4,4)" />
<PackageReference Include="CsvHelper" Version="[33.0.1,34)" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="[3.1.6,4)" />
<PackageReference Include="System.CommandLine" Version="[2.0.0-beta4.22272.1,3)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
@@ -47,7 +47,4 @@
<Using Include="System.Drawing.SizeF" Alias="SizeF" />
<Using Include="Terminal.Gui.EnumExtensions" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
</ItemGroup>
</Project>

17
UnitTests/UnitTests.csproj
View File

@@ -29,16 +29,16 @@
<Optimize>true</Optimize>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="ReportGenerator" Version="5.3.7" />
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.0.22" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="Xunit.Combinatorial" Version="1.6.24" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="[17.10,18)" />
<PackageReference Include="ReportGenerator" Version="[5.3.7,6)" />
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="[21.0.22,22)" />
<PackageReference Include="xunit" Version="[2.9.0,3)" />
<PackageReference Include="Xunit.Combinatorial" Version="[1.6.24,2)" />
<PackageReference Include="xunit.runner.visualstudio" Version="[2.8.2,3)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector" Version="[6.0.2,7)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@@ -57,9 +57,6 @@
<Using Include="Terminal.Gui" />
<Using Include="Xunit" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
</ItemGroup>
<PropertyGroup Label="FineCodeCoverage">
<Enabled>
False