Skip to content

Commit

Permalink
Target net7.0 for auxiliary projects
Browse files Browse the repository at this point in the history
  • Loading branch information
KirillOsenkov committed May 19, 2023
1 parent f19fe1e commit 260c84b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/BinlogTool/BinlogTool.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<Version>1.0.6</Version>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>latest</LangVersion>
<DebugType>embedded</DebugType>
<Prefer32Bit>false</Prefer32Bit>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RuntimeIdentifiers>win7-x64;ubuntu.14.04-x64;osx.10.12-x64;osx-arm64</RuntimeIdentifiers>
<ApplicationIcon>StructuredLogger.ico</ApplicationIcon>
<RestoreAdditionalProjectSources Condition="$(PublishNativeAot) == True">
Expand Down
4 changes: 2 additions & 2 deletions src/StructuredLogViewer/StructuredLogViewer.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
Expand Down Expand Up @@ -46,7 +46,7 @@

<Target Name="CopyTaskRunnerDll" BeforeTargets="GetCopyToOutputDirectoryItems" Condition="$(TargetFramework) == 'net472'">
<PropertyGroup>
<CoreTaskRunnerOutDir>$([System.IO.Path]::GetFullPath(`$(OutDir)\..\..\..\TaskRunner\$(Configuration)\net6.0`))\</CoreTaskRunnerOutDir>
<CoreTaskRunnerOutDir>$([System.IO.Path]::GetFullPath(`$(OutDir)\..\..\..\TaskRunner\$(Configuration)\net7.0`))\</CoreTaskRunnerOutDir>
</PropertyGroup>
<ItemGroup>
<TaskRunnerFile Include="$(CoreTaskRunnerOutDir)TaskRunner.dll" />
Expand Down
4 changes: 2 additions & 2 deletions src/TaskRunner/TaskRunner.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net7.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework) == 'net472'">
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework) == 'net6.0'">
<PropertyGroup Condition="$(TargetFramework) == 'net7.0'">
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
<RollForward>LatestMajor</RollForward>
<UseAppHost>false</UseAppHost>
Expand Down

0 comments on commit 260c84b

Please sign in to comment.