Skip to content

Commit

Permalink
Revert "Upgrade to net6.0"
Browse files Browse the repository at this point in the history
This reverts commit a2b07eb.
  • Loading branch information
Universal-Omega authored Feb 3, 2024
1 parent 6610492 commit 5e059d1
Show file tree
Hide file tree
Showing 3 changed files with 152 additions and 128 deletions.
3 changes: 3 additions & 0 deletions src/CVTBot.exe.release.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<configSections>
<section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<log4net>
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout" value="%date %-5level [%thread] %logger [%property{Nick}] %message%newline" />
Expand Down
105 changes: 63 additions & 42 deletions src/CVTBot/CVTBot.csproj
Original file line number Diff line number Diff line change
@@ -1,43 +1,64 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
<PackageReference Include="SmartIrc4net" Version="1.1.0">
<NoWarn>NU1701</NoWarn>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Content Include="Projects.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\Console.msgs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\CVTBot-sample.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>CVTBot.ini</Link>
</Content>
</ItemGroup>

<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
<Content Include="..\CVTBot.exe.debug.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>CVTBot.exe.config</Link>
</Content>
</ItemGroup>

<ItemGroup Condition=" '$(Configuration)' == 'Release' ">
<Content Include="..\CVTBot.exe.release.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>CVTBot.exe.config</Link>
</Content>
</ItemGroup>

<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="restore;Clean;Build">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net472</TargetFramework>
<PackageVersion>1.0.0.0</PackageVersion>
<!-- [Restore pre-2017 behaviour]
Output to "bin/Release", not "bin/Release/:TargetFramework". s-->
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<!-- [Restore pre-2017 behaviour] No NuGetpackaging -->
<IsPackable>false</IsPackable>
<!-- MSBuild 16+ overwrite our exe.config by default, which means
no more console or syslog logging. Keep MWBuild <= 15 behaviour.
https://github.com/nunit/nunit-console/pull/587 -->
<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
<StartAction>Project</StartAction>
<!-- [Restore pre-2017 behaviour] Send application output to a tab inside
the editor, not to an external console window. -->
<ExternalConsole>false</ExternalConsole>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=2.0.8, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\log4net.dll</HintPath>
</Reference>
<Reference Include="Meebey.SmartIrc4net, Version=1.1, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Meebey.SmartIrc4net.dll</HintPath>
</Reference>
<Reference Include="Mono.Data.Sqlite, Version=1.0.61.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Mono.Data.Sqlite.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Content Include="Projects.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\Console.msgs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\CVTBot-sample.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>CVTBot.ini</Link>
</Content>
</ItemGroup>
<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
<Content Include="..\CVTBot.exe.debug.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>CVTBot.exe.config</Link>
</Content>
</ItemGroup>
<ItemGroup Condition=" '$(Configuration)' == 'Release' ">
<Content Include="..\CVTBot.exe.release.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>CVTBot.exe.config</Link>
</Content>
</ItemGroup>
</Project>
Loading

0 comments on commit 5e059d1

Please sign in to comment.