Compare commits

..

No commits in common. "a8d19abc13c4eced4aa1ba221f915081f2787e26" and "37891877377e624f7138e6c6075bdf6cd8650a0e" have entirely different histories.

2 changed files with 3 additions and 14 deletions

View File

@ -1,11 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<<<<<<< HEAD
<OutputType>WinExe</OutputType>
=======
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
>>>>>>> 37891877377e624f7138e6c6075bdf6cd8650a0e
<TargetFramework>net9.0-windows</TargetFramework> <TargetFramework>net9.0-windows</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
@ -24,11 +20,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.4.10" /> <PackageReference Include="MahApps.Metro" Version="2.4.10" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="9.0.3" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="9.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Npgsql" Version="9.0.3" /> <PackageReference Include="Npgsql" Version="9.0.3" />
<PackageReference Include="PdfPig" Version="0.1.10" /> <PackageReference Include="PdfPig" Version="0.1.9" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" /> <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -1,7 +0,0 @@
<connectionStrings>
<add name="MyConnectionString"
providerName="Npgsql"
connectionString="Server=127.0.0.1;Port=7854;
Database=mydatabase;User Id=admin;Password=123456;" />
</connectionStrings>