mkoebis/MergeCMInpro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Standortänderung' into dev-mkoebis

Browse Source 
# Conflicts:
#	MergeCMInpro.csproj
This commit is contained in:
dev-mkoebis
2026-06-26 12:26:35 +02:00
parent e56cb114fa c401dae875
commit 690626582e
8 changed files with 170 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
MergeCMInpro.csproj
View File

@@ -1,17 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<DebugType>embedded</DebugType>
<Platforms>AnyCPU;x86</Platforms>
</PropertyGroup>
<ItemGroup>
<Compile Remove="x64\**" />
<EmbeddedResource Remove="x64\**" />
<None Remove="x64\**" />
<None Remove="NLog.config" />
</ItemGroup>
<ItemGroup>
<<<<<<< HEAD
<PackageReference Include="Microsoft.Office.Interop.Excel" Version="16.0.18925.20022" />
<PackageReference Include="NLog" Version="4.7.11" />
<PackageReference Include="ODP.NetCore" Version="2.0.12" />
@@ -20,6 +22,33 @@
<ItemGroup>
<Folder Include="config\" />
=======
<COMReference Include="Microsoft.Office.Interop.Excel">
<WrapperTool>tlbimp</WrapperTool>
<VersionMinor>8</VersionMinor>
<VersionMajor>1</VersionMajor>
<Guid>00020813-0000-0000-c000-000000000046</Guid>
<Lcid>0</Lcid>
<Isolated>false</Isolated>
<EmbedInteropTypes>true</EmbedInteropTypes>
</COMReference>
>>>>>>> Standortänderung
</ItemGroup>
<ItemGroup>
<Content Include="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="NLog" Version="6.1.3" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.26.200" />
</ItemGroup>
<ItemGroup>
<None Update="config.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>