Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/DiffEngine.sln
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiffEngineTray.Tests", "Dif
{2B054DB2-42A0-4F3E-87CC-30D6E926D0D9} = {2B054DB2-42A0-4F3E-87CC-30D6E926D0D9}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionTests", "VersionTests\VersionTests.csproj", "{B71AE158-C29F-49FB-B886-8343FD924788}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -65,6 +67,12 @@ Global
{E339AB28-21B2-47DB-B995-EB2C4CE8BA99}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E339AB28-21B2-47DB-B995-EB2C4CE8BA99}.Release|Any CPU.Build.0 = Release|Any CPU
{E339AB28-21B2-47DB-B995-EB2C4CE8BA99}.Release-NotWindows|Any CPU.ActiveCfg = Release|Any CPU
{B71AE158-C29F-49FB-B886-8343FD924788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B71AE158-C29F-49FB-B886-8343FD924788}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B71AE158-C29F-49FB-B886-8343FD924788}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B71AE158-C29F-49FB-B886-8343FD924788}.Release|Any CPU.Build.0 = Release|Any CPU
{B71AE158-C29F-49FB-B886-8343FD924788}.Release-NotWindows|Any CPU.ActiveCfg = Debug|Any CPU
{B71AE158-C29F-49FB-B886-8343FD924788}.Release-NotWindows|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
1 change: 1 addition & 0 deletions src/DiffEngine/InternalsVisibleTo.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[assembly: InternalsVisibleTo("DiffEngine.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000f0a8e4bf1639dce01be6592384e7dfc621915b7759fb5cee42ec5d351bcc43460432da1659ee618ca6cab6b8b8e56a5deb5d4ee1a49783d5c2690752502d31ccbfee9b2c697e20359b55ad100cc9370c8e983fd9496f01d761a060d0435bac7243b1832ba95757aa5adbb67df38c213d717b6751e1217cea9fa5c61e9b799dd")]
[assembly: InternalsVisibleTo("VersionTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000f0a8e4bf1639dce01be6592384e7dfc621915b7759fb5cee42ec5d351bcc43460432da1659ee618ca6cab6b8b8e56a5deb5d4ee1a49783d5c2690752502d31ccbfee9b2c697e20359b55ad100cc9370c8e983fd9496f01d761a060d0435bac7243b1832ba95757aa5adbb67df38c213d717b6751e1217cea9fa5c61e9b799dd")]
[assembly: InternalsVisibleTo("DiffEngineTray, PublicKey=00240000048000009400000006020000002400005253413100040000010001000f0a8e4bf1639dce01be6592384e7dfc621915b7759fb5cee42ec5d351bcc43460432da1659ee618ca6cab6b8b8e56a5deb5d4ee1a49783d5c2690752502d31ccbfee9b2c697e20359b55ad100cc9370c8e983fd9496f01d761a060d0435bac7243b1832ba95757aa5adbb67df38c213d717b6751e1217cea9fa5c61e9b799dd")]
[assembly: InternalsVisibleTo("DiffEngineTray.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000f0a8e4bf1639dce01be6592384e7dfc621915b7759fb5cee42ec5d351bcc43460432da1659ee618ca6cab6b8b8e56a5deb5d4ee1a49783d5c2690752502d31ccbfee9b2c697e20359b55ad100cc9370c8e983fd9496f01d761a060d0435bac7243b1832ba95757aa5adbb67df38c213d717b6751e1217cea9fa5c61e9b799dd")]
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>16.0.0</Version>
<Version>16.1.0</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
2 changes: 1 addition & 1 deletion src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
<PackageVersion Include="System.Globalization.Extensions" Version="4.3.0" />
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
<PackageVersion Include="System.Management" Version="9.0.2" />
<PackageVersion Include="System.Management" Version="8.0.0" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.3" />
Expand Down
2 changes: 2 additions & 0 deletions src/VersionTests/GlobalUsings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
global using System.Management;
global using System.Collections.Frozen;
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
#if NETFRAMEWORK
using System.Collections.Frozen;

public class VersionTests
{
// work around https://github.com/orgs/VerifyTests/discussions/1366
#if !NET9_0_OR_GREATER
[Fact]
public void Immutable()
{
var assemblyName = typeof(ImmutableDictionary).Assembly.GetName();
var assemblyName = typeof(FrozenSet).Assembly.GetName();
Assert.Equal(new(8, 0, 0, 0), assemblyName.Version);
}
#endif

[Fact]
public void Management()
{
var assemblyName = typeof(ManagementQuery).Assembly.GetName();
#if NETFRAMEWORK
Assert.Equal(new(4, 0, 0, 0), assemblyName.Version);
#else
Assert.Equal(new(8, 0, 0, 0), assemblyName.Version);
#endif
}
}

#endif
}
19 changes: 19 additions & 0 deletions src/VersionTests/VersionTests.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net472;net48;net9.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net8.0;net9.0</TargetFrameworks>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<NoWarn>$(NoWarn);SYSLIB0012</NoWarn>
</PropertyGroup>
<ItemGroup>
<Using Include="DiffEngine" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Argon" />
<PackageReference Include="Xunit" />
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />
<PackageReference Include="XunitContext" />
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
</ItemGroup>
</Project>