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

Compare commits

base: mkoebis:690626582e62d1b83db034b5e1375ffb56d99ab7
Branches Tags
mkoebis:main mkoebis:dev-mkoebis mkoebis:Standortänderung mkoebis:Refactored_Vererbung
...
compare: mkoebis:dev-mkoebis
Branches Tags
mkoebis:dev-mkoebis mkoebis:Standortänderung mkoebis:main mkoebis:Refactored_Vererbung

4 Commits
690626582e ... dev-mkoebi

Author SHA1 Message Date
dev-mkoebis
a75c853e79 Projektdatei geändert 2026-07-30 11:29:05 +02:00
dev-mkoebis
70dd3f0a3a Jenkinsfile Step korrigiert 2026-07-30 09:40:22 +02:00
dev-mkoebis
4eba0b5139 Build Step zur Anzeige der SDK's eingefügt 2026-07-30 08:56:30 +02:00
dev-mkoebis
7682bd2fd6 Nuget-Pakete aktualisiert 2026-06-28 15:22:09 +02:00
2 changed files with 33 additions and 46 deletions
Expand all files Collapse all files

76
MergeCMInpro.csproj
View File

@@ -1,54 +1,40 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<DebugType>embedded</DebugType> <DebugType>embedded</DebugType>
<Platforms>AnyCPU;x86</Platforms> <Platforms>AnyCPU;x86</Platforms>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Remove="NLog.config" /> <None Remove="NLog.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<<<<<<< HEAD <PackageReference Include="Microsoft.Office.Interop.Excel" Version="16.0.0.0" />
<PackageReference Include="Microsoft.Office.Interop.Excel" Version="16.0.18925.20022" /> <PackageReference Include="ODP.NetCore" Version="2.0.12" />
<PackageReference Include="NLog" Version="4.7.11" /> <PackageReference Include="System.Data.SqlClient" Version="4.9.1" />
<PackageReference Include="ODP.NetCore" Version="2.0.12" /> </ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.9.1" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="config\" /> <Folder Include="config\" />
======= </ItemGroup>
<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> <ItemGroup>
<Content Include="NLog.config"> <Content Include="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NLog" Version="6.1.3" /> <PackageReference Include="NLog" Version="6.1.3" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.26.200" /> <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.26.200" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="config.txt"> <None Update="config.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
</Project> </Project>

3
config/Jenkinsfile vendored
View File

@@ -12,7 +12,8 @@ pipeline
stage('Build') stage('Build')
{ {
steps steps
{ {
bat "dotnet --list-sdks"
bat "\"${tool 'MSBuild17'}\" ${WORKSPACE}\\MergeCMInpro.csproj /t:Restore /t:Rebuild /p:Configuration=Release" bat "\"${tool 'MSBuild17'}\" ${WORKSPACE}\\MergeCMInpro.csproj /t:Restore /t:Rebuild /p:Configuration=Release"
} }