Skip to content

Commit

Permalink
refs
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp committed Mar 21, 2022
1 parent 9a46908 commit de586cc
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 56 deletions.
22 changes: 11 additions & 11 deletions src/DiffEngine.Tests/DiffEngine.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
<NoWarn>SYSLIB0012</NoWarn>
</PropertyGroup>
<ItemGroup>
<Using Include="DiffEngine"/>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
<PackageReference Include="MarkdownSnippets.MsBuild" Version="24.3.0" PrivateAssets="all"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
<PackageReference Include="System.Drawing.Common" Version="5.0.0"/>
<PackageReference Include="Xunit" Version="2.4.1"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all"/>
<PackageReference Include="ProjectDefaults" Version="1.0.72" PrivateAssets="all"/>
<PackageReference Include="XunitContext" Version="3.2.1"/>
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj"/>
<Using Include="DiffEngine" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="MarkdownSnippets.MsBuild" Version="24.3.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="Xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
<PackageReference Include="ProjectDefaults" Version="1.0.78" PrivateAssets="all" />
<PackageReference Include="XunitContext" Version="3.2.2" />
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
</ItemGroup>
</Project>
22 changes: 11 additions & 11 deletions src/DiffEngine/DiffEngine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
<TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5;net6;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;netcoreapp2.0;net48</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Using Remove="System.Net.Http"/>
<Using Include="DiffEngine"/>
<PackageReference Include="Caseless.Fody" Version="1.9.1" PrivateAssets="All"/>
<PackageReference Include="EmptyFiles" Version="2.8.0" PrivateAssets="None"/>
<PackageReference Include="Fody" Version="6.6.0" PrivateAssets="all"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'"/>
<PackageReference Include="ProjectDefaults" Version="1.0.72" PrivateAssets="all"/>
<PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all"/>
<PackageReference Include="IndexRange" Version="1.0.0" PrivateAssets="All"/>
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="$(TargetFramework) == 'net461'"/>
<PackageReference Include="System.Management" Version="5.0.0"/>
<Using Remove="System.Net.Http" />
<Using Include="DiffEngine" />
<PackageReference Include="Caseless.Fody" Version="1.9.1" PrivateAssets="All" />
<PackageReference Include="EmptyFiles" Version="2.8.0" PrivateAssets="None" />
<PackageReference Include="Fody" Version="6.6.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
<PackageReference Include="ProjectDefaults" Version="1.0.78" PrivateAssets="all" />
<PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
<PackageReference Include="IndexRange" Version="1.0.1" PrivateAssets="All" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="$(TargetFramework) == 'net461'" />
<PackageReference Include="System.Management" Version="5.0.0" />
</ItemGroup>
</Project>
26 changes: 13 additions & 13 deletions src/DiffEngineTray.Tests/DiffEngineTray.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<NoWarn>CA1416</NoWarn>
</PropertyGroup>
<ItemGroup>
<Using Include="DiffEngine"/>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
<PackageReference Include="Verify.WinForms" Version="2.8.0"/>
<PackageReference Include="Verify.Xunit" Version="16.3.0"/>
<PackageReference Include="Verify.ImageMagick" Version="2.13.1"/>
<PackageReference Include="Xunit" Version="2.4.1"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all"/>
<PackageReference Include="ProjectDefaults" Version="1.0.72" PrivateAssets="all"/>
<PackageReference Include="XunitContext" Version="3.2.1"/>
<ProjectReference Include="..\DiffEngineTray\DiffEngineTray.csproj"/>
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj"/>
<Using Include="DiffEngine" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Verify.WinForms" Version="2.8.0" />
<PackageReference Include="Verify.Xunit" Version="16.4.2" />
<PackageReference Include="Verify.ImageMagick" Version="2.13.1" />
<PackageReference Include="Xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
<PackageReference Include="ProjectDefaults" Version="1.0.78" PrivateAssets="all" />
<PackageReference Include="XunitContext" Version="3.2.2" />
<ProjectReference Include="..\DiffEngineTray\DiffEngineTray.csproj" />
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
</ItemGroup>
</Project>
39 changes: 18 additions & 21 deletions src/DiffEngineTray/DiffEngineTray.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,28 +23,25 @@
</Target>

<ItemGroup>
<None Remove="**\*.ico"/>
<None Remove="**\*.png"/>
<Using Include="DiffEngine"/>
<EmbeddedResource Include="Images\*.ico"/>
<EmbeddedResource Include="Images\*.png"/>
<PackageReference Include="Resourcer.Fody" Version="1.8.0" PrivateAssets="all"/>
<PackageReference Include="Fody" Version="6.6.0" PrivateAssets="all"/>
<PackageReference Include="Serilog" Version="2.10.0"/>
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
<PackageReference Include="System.Text.Json" Version="6.0.2"/>
<PackageReference Include="ProjectDefaults" Version="1.0.72" PrivateAssets="all"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'"/>
<None Remove="**\*.ico" />
<None Remove="**\*.png" />
<Using Include="DiffEngine" />
<EmbeddedResource Include="Images\*.ico" />
<EmbeddedResource Include="Images\*.png" />
<PackageReference Include="Resourcer.Fody" Version="1.8.0" PrivateAssets="all" />
<PackageReference Include="Fody" Version="6.6.0" PrivateAssets="all" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="6.0.2" />
<PackageReference Include="ProjectDefaults" Version="1.0.78" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
<!-- not sure why, but the below are needing so dotnet tool can resolve the assemblies -->
<PackageReference Include="System.Globalization.Extensions" Version="4.3.0" PrivateAssets="none"/>
<PackageReference Include="System.IO.Compression" Version="4.3.0"/>
<PackageReference Include="System.Net.Http" Version="4.3.4"/>
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0"/>
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj"/>
<PackageReference Include="System.Globalization.Extensions" Version="4.3.0" PrivateAssets="none" />
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
<!--TODO: remove when fixed https://github.com/dotnet/core/issues/7176-->
<FrameworkReference
Condition="$(TargetFramework) == 'net6'"
Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms"
TargetingPackVersion="6.0.0"/>
<FrameworkReference Condition="$(TargetFramework) == 'net6'" Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms" TargetingPackVersion="6.0.0" />
</ItemGroup>
</Project>

0 comments on commit de586cc

Please sign in to comment.