Skip to content

Commit

Permalink
EmptyFiles 4 and System.Text.Json 7 (#303)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp authored Nov 7, 2022
1 parent 2f70309 commit e60942d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/DiffEngine.Tests/DiffEngine.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<Using Include="DiffEngine" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="MarkdownSnippets.MsBuild" Version="24.5.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Argon" Version="0.1.0" />
<PackageReference Include="Xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
<PackageReference Include="ProjectDefaults" Version="1.0.80" PrivateAssets="all" />
<PackageReference Include="ProjectDefaults" Version="1.0.82" PrivateAssets="all" />
<PackageReference Include="XunitContext" Version="3.2.4" />
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/DiffEngine/DiffEngine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<Using Include="System.Net.Sockets" />
<Using Include="EmptyFiles" />
<PackageReference Include="Caseless.Fody" Version="1.9.1" PrivateAssets="All" />
<PackageReference Include="EmptyFiles" Version="3.0.0" PrivateAssets="None" />
<PackageReference Include="EmptyFiles" Version="4.0.0" PrivateAssets="None" />
<PackageReference Include="Fody" Version="6.6.4" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
<PackageReference Include="ProjectDefaults" Version="1.0.80" PrivateAssets="all" />
<PackageReference Include="ProjectDefaults" Version="1.0.82" PrivateAssets="all" />
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
<PackageReference Include="IndexRange" Version="1.0.2" PrivateAssets="All" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="$(TargetFramework) == 'net461'" />
Expand Down
6 changes: 3 additions & 3 deletions src/DiffEngineTray.Tests/DiffEngineTray.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<ItemGroup>
<Using Include="DiffEngine" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Argon" Version="0.1.0" />
<PackageReference Include="Verify.DiffPlex" Version="2.0.0" />
<PackageReference Include="Verify.WinForms" Version="3.0.0" />
<PackageReference Include="Verify.Xunit" Version="18.0.0" />
<PackageReference Include="Verify.Xunit" Version="18.4.0" />
<PackageReference Include="Verify.ImageMagick" Version="3.0.0" />
<PackageReference Include="Xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
<PackageReference Include="ProjectDefaults" Version="1.0.80" PrivateAssets="all" />
<PackageReference Include="ProjectDefaults" Version="1.0.82" PrivateAssets="all" />
<PackageReference Include="XunitContext" Version="3.2.4" />
<ProjectReference Include="..\DiffEngineTray\DiffEngineTray.csproj" />
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/DiffEngineTray/DiffEngineTray.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<PackageReference Include="Fody" Version="6.6.4" PrivateAssets="all" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="6.0.6" />
<PackageReference Include="ProjectDefaults" Version="1.0.80" PrivateAssets="all" />
<PackageReference Include="System.Text.Json" Version="7.0.0" />
<PackageReference Include="ProjectDefaults" Version="1.0.82" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
<!-- not sure why, but the below are needing so dotnet tool can resolve the assemblies -->
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<NoWarn>CS1591;CS0649</NoWarn>
<Version>10.4.3</Version>
<Version>10.4.4</Version>
<AssemblyVersion>1.0.0</AssemblyVersion>
<PackageTags>Testing, Snapshot, Diff, Compare</PackageTags>
<Description>Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.</Description>
Expand Down

0 comments on commit e60942d

Please sign in to comment.