Merge branch 'Standortänderung' into dev-mkoebis

# Conflicts:
#	MergeCMInpro.csproj

MergeCMInpro.csproj

@@ -1,3 +1,4 @@
+<Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
@@ -12,6 +13,16 @@
   </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>
+    <Folder Include="config\" />
+=======
     <COMReference Include="Microsoft.Office.Interop.Excel">
       <WrapperTool>tlbimp</WrapperTool>
       <VersionMinor>8</VersionMinor>
@@ -21,6 +32,7 @@
       <Isolated>false</Isolated>
       <EmbedInteropTypes>true</EmbedInteropTypes>
     </COMReference>
+>>>>>>> Standortänderung
   </ItemGroup>
 
   <ItemGroup>

config/Jenkinsfile

@@ -0,0 +1,37 @@
+pipeline 
+{
+   	 agent 
+	{
+       	node 
+		{
+       		label 'Jenkins_Homer'
+       	}
+    }  
+    stages 
+	{
+       	stage('Build') 
+		{
+       		steps 
+			{                                 
+               		bat "\"${tool 'MSBuild17'}\" ${WORKSPACE}\\MergeCMInpro.csproj /t:Restore /t:Rebuild /p:Configuration=Release"
+           	}
+						
+		}        	
+       	stage('SonarQube') 
+		{
+       		environment 
+			{
+           		scannerHome = tool 'sonar-scanner4.4'
+           		project = 'mergecminpro'
+				token = 'sqa_07d4e3802cf6283fc38a002e75bd0a5eb158af87'
+            }
+       		steps 
+			{
+           		withSonarQubeEnv('SonarQube_Homer') 
+				{
+           			bat "${scannerHome}/bin/sonar-scanner -Dsonar.projectKey=${project} -Dsonar.login=${token}"
+           		}                
+       		}      
+       	}       
+    }
+}