Skip to content

Target net472 instead of net462 #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
borland merged 1 commit into from
Oct 27, 2026
Merged

Target net472 instead of net462 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions source/Octodiff.Tests/Octodiff.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<PropertyGroup Condition="!$([MSBuild]::IsOSUnixLike())">
<TargetFrameworks>net10.0;net462</TargetFrameworks>
<TargetFrameworks>net10.0;net472</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOSUnixLike())">
<TargetFramework>net10.0</TargetFramework>
Expand All @@ -24,11 +24,11 @@
<PackageReference Include="NUnit3TestAdapter" Version="6.3.0" />
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net462'">
<PropertyGroup Condition="'$(TargetFramework)'=='net472'">
<OutputType>Exe</OutputType>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net462'">
<ItemGroup Condition="'$(TargetFramework)'=='net472'">
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
6 changes: 3 additions & 3 deletions source/Octodiff.Tests/Util/CommandLineFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public void Run(string args)
var stdOutBuilder = new StringBuilder();
var outputBuilder = new StringBuilder();
var path = GetExePath();
#if !NET462
#if !NET472
args = $"{path} {args}";
path = "dotnet";
#endif
Expand Down Expand Up @@ -49,7 +49,7 @@ public void Run(string args)

string GetExePath()
{
#if NET462
#if NET472
return new Uri(typeof(DeltaBuilder).Assembly.CodeBase).LocalPath;
#else
return Path.Combine(Path.GetDirectoryName(new Uri(typeof(CommandLineFixture).GetTypeInfo().Assembly.CodeBase).LocalPath), "Octodiff.Tests.dll");
Expand All @@ -58,7 +58,7 @@ string GetExePath()

string GetCurrentDirectory()
{
#if NET462
#if NET472
return Environment.CurrentDirectory;
#else
return System.IO.Directory.GetCurrentDirectory();
Expand Down
4 changes: 2 additions & 2 deletions source/Octodiff/Octodiff.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AssemblyName>Octodiff</AssemblyName>
<PackageId>Octopus.Octodiff</PackageId>
Expand All @@ -22,7 +22,7 @@
</ItemGroup>


<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<OutputType>Exe</OutputType>
<PlatformTarget>anycpu</PlatformTarget>
</PropertyGroup>
Expand Down
Loading