Projektdatei geändert

MergeCMInpro.csproj

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

config/Jenkinsfile

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