Update build scripts and projects to target .NET 8.0

Updated dotnet.yml to use latest GitHub Actions for .NET setup and removed MSBuild.exe setup. Updated build and test steps accordingly. Updated multiple .csproj files to target .NET 8.0 frameworks. Modified Directory.Build.props to remove net48 target framework and target only net8.0-windows. Updated build-release.ps1 script to: - Set configuration to "Release" and target framework to "net8.0-windows". - Use dotnet build instead of MSBuild paths. - Update output paths for new target framework. - Use 7za.exe with -tzip option for compression. - Remove net48 references in build and copy steps. - Ensure correct paths and configurations for copying and compressing build outputs for different platforms (PHP, Python, Ruby). GetVersions function in build-release.ps1 now reads version from Directory.Build.props instead of RdlEngine.csproj.
majorsilence · Dec 28, 2024 · 1870abd · 1870abd
1 parent 6b2cf5d
commit 1870abd
Show file tree

Hide file tree

Showing 22 changed files with 52 additions and 63 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -15,8 +15,6 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.x
-      - name: Setup MSBuild.exe
-        uses: microsoft/[email protected]
       - name: Build Release
         run: ./build-release.ps1
       - name: Test

diff --git a/DataProviders/DataProviders.csproj b/DataProviders/DataProviders.csproj
@@ -11,6 +11,7 @@
 		<DelaySign>false</DelaySign>
 		<PackageId>Majorsilence.Reporting.DataProviders</PackageId>
 		<Configurations>Debug;Release;Debug-DrawingCompat;Release-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System">

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
 	</PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Release' Or '$(Configuration)' == 'Debug'">
-		<TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
+		<TargetFrameworks>net8.0-windows</TargetFrameworks>
 	</PropertyGroup>
 
   <PropertyGroup>

diff --git a/EncryptionProvider/EncryptionProvider.csproj b/EncryptionProvider/EncryptionProvider.csproj
@@ -8,6 +8,7 @@
 		<Description></Description>
 		<PackageId>Majorsilence.Reporting.EncryptionProvider</PackageId>
 		<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0-windows</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="System.Data.DataSetExtensions" />

diff --git a/LibRdlWpfViewer/LibRdlWpfViewer.csproj b/LibRdlWpfViewer/LibRdlWpfViewer.csproj
@@ -10,6 +10,7 @@
 		<DelaySign>false</DelaySign>
 		<PackageId>Majorsilence.Reporting.LibRdlWpfViewer</PackageId>
 		<Configurations>Debug;Release;Debug-DrawingCompat;Release-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0-windows</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System.Core">

diff --git a/Majorsilence.Drawing.Common/Majorsilence.Drawing.Common.csproj b/Majorsilence.Drawing.Common/Majorsilence.Drawing.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net48</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>

diff --git a/RdlAsp.Mvc/RdlAsp.Mvc.csproj b/RdlAsp.Mvc/RdlAsp.Mvc.csproj
@@ -13,8 +13,8 @@
     </Description>
     <DelaySign>false</DelaySign>
     <PackageId>Majorsilence.Reporting.RdlAsp.Mvc</PackageId>
-	<TargetFrameworks>net8.0</TargetFrameworks>
 	<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>
+	<TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Update="System.Data">

diff --git a/RdlCmd/RdlCmd.csproj b/RdlCmd/RdlCmd.csproj
@@ -8,6 +8,7 @@
 		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
 		<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
 		<Configurations>Debug;Release;Debug-DrawingCompat;Release-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System">

diff --git a/RdlCreator.Tests/RdlCreator.Tests.csproj b/RdlCreator.Tests/RdlCreator.Tests.csproj
@@ -4,6 +4,7 @@
 		<RootNamespace>fyiReporting.RdlCreator.Tests</RootNamespace>
 		<AssemblyName>RdlCreator.Tests</AssemblyName>
 		<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/RdlCreator/RdlCreator.csproj b/RdlCreator/RdlCreator.csproj
@@ -6,6 +6,7 @@
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<PackageId>Majorsilence.Reporting.RdlCreator</PackageId>
 		<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\DataProviders\DataProviders.csproj" />

diff --git a/RdlCri/RdlCri.csproj b/RdlCri/RdlCri.csproj
@@ -8,6 +8,7 @@
         <DelaySign>false</DelaySign>
         <PackageId>Majorsilence.Reporting.RdlCri</PackageId>
         <Configurations>Debug;Release;Debug-DrawingCompat;Release-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\RdlEngine\RdlEngine.csproj" />

diff --git a/RdlDesign/ReportDesigner.csproj b/RdlDesign/ReportDesigner.csproj
@@ -16,6 +16,7 @@
 		<DelaySign>false</DelaySign>
 		<PackageId>Majorsilence.Reporting.ReportDesigner</PackageId>
 		<Configurations>Debug;Release;Debug-DrawingCompat;Release-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0-windows</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System">

diff --git a/RdlDesktop/RdlDesktop.csproj b/RdlDesktop/RdlDesktop.csproj
@@ -9,6 +9,7 @@
 		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
 		<StartupObject>fyiReporting.RdlDesktop.RdlDesktop</StartupObject>
 		<Configurations>Debug;Release;Debug-DrawingCompat;Release-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System">

diff --git a/RdlEngine/RdlEngine.csproj b/RdlEngine/RdlEngine.csproj
@@ -11,6 +11,7 @@
 		<DelaySign>false</DelaySign>
 		<PackageId>Majorsilence.Reporting.RdlEngine</PackageId>
 		<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System">

diff --git a/RdlGtk3/RdlGtk3.csproj b/RdlGtk3/RdlGtk3.csproj
@@ -6,6 +6,7 @@
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<PackageId>Majorsilence.Reporting.RdlGtk3</PackageId>
 		<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="GtkSharp" />

diff --git a/RdlGtk3Viewer/RdlGtk3Viewer.csproj b/RdlGtk3Viewer/RdlGtk3Viewer.csproj
@@ -4,6 +4,7 @@
 		<RootNamespace>fyiReporting.RdlGtk3Viewer</RootNamespace>
 		<AssemblyName>RdlGtk3Viewer</AssemblyName>
 		<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/RdlMapFile/RdlMapFile.csproj b/RdlMapFile/RdlMapFile.csproj
@@ -6,6 +6,7 @@
 		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
 		<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
 		<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0-windows</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<Compile Update="DesignXmlDraw.cs">

diff --git a/RdlReader/RdlReader.csproj b/RdlReader/RdlReader.csproj
@@ -10,6 +10,7 @@
 		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
 		<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
 		<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0-windows</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System">

diff --git a/RdlViewer.Tests/RdlViewer.Tests.csproj b/RdlViewer.Tests/RdlViewer.Tests.csproj
@@ -4,6 +4,7 @@
 		<UseWindowsForms>true</UseWindowsForms>
 		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
 		<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0-windows</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\RdlCri\RdlCri.csproj" />

diff --git a/RdlViewer/RdlViewer.csproj b/RdlViewer/RdlViewer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<ProjectType>Local</ProjectType>
 		<AssemblyKeyContainerName></AssemblyKeyContainerName>
@@ -15,6 +15,7 @@
 		<DelaySign>false</DelaySign>
 		<PackageId>Majorsilence.Reporting.RdlViewer</PackageId>
 		<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0-windows</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<Compile Remove="RdlReader\bin\**" />

diff --git a/ReportTests/ReportTests.csproj b/ReportTests/ReportTests.csproj
@@ -4,6 +4,7 @@
 		<UseWindowsForms>true</UseWindowsForms>
 		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
 		<Configurations>Debug;Release;Debug-DrawingCompat</Configurations>
+		<TargetFrameworks>net8.0-windows</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\DataProviders\DataProviders.csproj" />

diff --git a/build-release.ps1 b/build-release.ps1
@@ -2,23 +2,10 @@
 $ErrorActionPreference = "Stop"
 $CURRENTPATH=$pwd.Path
 
-# Platform options: "x86", "x64", "x64"
-# /p:Configuration="Debug" or "Release"
+# /p:Configuration="Debug", "Debug-DrawingCompat", "Release", "Release-DrawingCompat"
+$pConfiguration="Release"
+$pTargetFramework="net8.0-windows"
 
-# set msbuildpath="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe"
-$msbuildpath="C:\BuildTools\MSBuild\Current\Bin\MSBuild.exe"
-If (Test-Path "C:\BuildTools\MSBuild\Current\Bin\MSBuild.exe"){
-	$msbuildpath="C:\BuildTools\MSBuild\Current\Bin\MSBuild.exe"
-}
-ElseIf (Test-Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Current\Bin\MSBuild.exe"){
-	$msbuildpath="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Current\Bin\MSBuild.exe"
-}
-ElseIf (Test-Path "C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe"){
-	$msbuildpath="C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe"
-}
-Else {
-	$msbuildpath="msbuild"
-}
 
 function delete_files([string]$path)
 {
@@ -30,7 +17,7 @@ function delete_files([string]$path)
 
 function GetVersions([ref]$theVersion)
 {
-	$csprojPath = Join-Path $CURRENTPATH ".\RdlEngine\RdlEngine.csproj"
+	$csprojPath = Join-Path $CURRENTPATH ".\Directory.Build.props"
 	$xml = [xml](Get-Content $csprojPath)
 	$theVersion.Value = $xml.Project.PropertyGroup.Version
 }
@@ -41,18 +28,16 @@ $Version=""
 GetVersions([ref]$Version)
 Write-Host  $Version
 dotnet restore "./MajorsilenceReporting.sln"
-dotnet restore "./MajorsilenceReporting-ReportServer.sln"
 
-# ************* Begin net48 anycpu *********************************************
+# ************* Begin anycpu *********************************************
 
-& "$msbuildpath" "$CURRENTPATH\MajorsilenceReporting.sln" /verbosity:minimal /p:Configuration="Release" /property:Platform="Any CPU" /target:clean /target:rebuild
+dotnet build "$CURRENTPATH\MajorsilenceReporting.sln" --configuration $pConfiguration --verbosity minimal
 
-$buildoutputpath_designer="$CURRENTPATH\Release-Builds\build-output\majorsilence-reporting-designer-net48-anycpu"
-$buildoutputpath_desktop="$CURRENTPATH\Release-Builds\build-output\majorsilence-reporting-desktop-net48-anycpu"
-$buildoutputpath_rdlcmd="$CURRENTPATH\Release-Builds\build-output\majorsilence-reporting-rdlcmd-net48-anycpu"
-$buildoutputpath_viewer="$CURRENTPATH\Release-Builds\build-output\majorsilence-reporting-viewer-net48-anycpu"
-$buildoutputpath_mapfile="$CURRENTPATH\Release-Builds\build-output\majorsilence-reporting-mapfile-net48-anycpu"
-$buildoutputpath_reportserver="$CURRENTPATH\Release-Builds\build-output\majorsilence-reporting-reportserver-net48-anycpu"
+$buildoutputpath_designer="$CURRENTPATH\Release-Builds\build-output\majorsilence-reporting-designer-$pTargetFramework-anycpu"
+$buildoutputpath_desktop="$CURRENTPATH\Release-Builds\build-output\majorsilence-reporting-desktop-$pTargetFramework-anycpu"
+$buildoutputpath_rdlcmd="$CURRENTPATH\Release-Builds\build-output\majorsilence-reporting-rdlcmd-$pTargetFramework-anycpu"
+$buildoutputpath_viewer="$CURRENTPATH\Release-Builds\build-output\majorsilence-reporting-viewer-$pTargetFramework-anycpu"
+$buildoutputpath_mapfile="$CURRENTPATH\Release-Builds\build-output\majorsilence-reporting-mapfile-$pTargetFramework-anycpu"
 
 Remove-Item "$buildoutputpath_designer" -Recurse -ErrorAction Ignore
 mkdir "$buildoutputpath_designer"
@@ -64,51 +49,40 @@ Remove-Item "$buildoutputpath_viewer" -Recurse -ErrorAction Ignore
 mkdir "$buildoutputpath_viewer"
 Remove-Item "$buildoutputpath_mapfile" -Recurse -ErrorAction Ignore
 mkdir "$buildoutputpath_mapfile"
-Remove-Item "$buildoutputpath_reportserver" -Recurse -ErrorAction Ignore
-mkdir "$buildoutputpath_reportserver"
 
-Copy-Item .\RdlDesign\bin\Release\net48\ -Destination "$buildoutputpath_designer\" -Recurse
-Copy-Item .\RdlDesktop\bin\Release\net48\ -Destination "$buildoutputpath_desktop\" -Recurse
-Copy-Item .\RdlCmd\bin\Release\net48\ -Destination "$buildoutputpath_rdlcmd\" -Recurse
-Copy-Item .\RdlViewer\bin\Release\net48\ -Destination "$buildoutputpath_viewer\" -Recurse
-Copy-Item .\RdlMapFile\bin\Release\net48\ -Destination "$buildoutputpath_mapfile\" -Recurse
+Copy-Item .\RdlDesign\bin\$pConfiguration\$pTargetFramework\ -Destination "$buildoutputpath_designer\" -Recurse
+Copy-Item .\RdlDesktop\bin\$pConfiguration\$pTargetFramework\ -Destination "$buildoutputpath_desktop\" -Recurse
+Copy-Item .\RdlCmd\bin\$pConfiguration\$pTargetFramework\ -Destination "$buildoutputpath_rdlcmd\" -Recurse
+Copy-Item .\RdlViewer\bin\$pConfiguration\$pTargetFramework\ -Destination "$buildoutputpath_viewer\" -Recurse
+Copy-Item .\RdlMapFile\bin\$pConfiguration\$pTargetFramework\ -Destination "$buildoutputpath_mapfile\" -Recurse
 
 cd Release-Builds
 cd build-output	
-..\7za.exe a $Version-majorsilence-reporting-designer-net48-anycpu.zip majorsilence-reporting-designer-net48-anycpu\
-..\7za.exe a $Version-majorsilence-reporting-desktop-net48-anycpu.zip majorsilence-reporting-desktop-net48-anycpu\
-..\7za.exe a $Version-majorsilence-reporting-rdlcmd-net48-anycpu.zip majorsilence-reporting-rdlcmd-net48-anycpu\
-..\7za.exe a $Version-majorsilence-reporting-viewer-net48-anycpu.zip majorsilence-reporting-viewer-net48-anycpu\
-..\7za.exe a $Version-majorsilence-reporting-mapfile-net48-anycpu.zip majorsilence-reporting-mapfile-net48-anycpu\
+..\7za.exe a -tzip $Version-majorsilence-reporting-designer-$pTargetFramework-anycpu.zip majorsilence-reporting-designer-$pTargetFramework-anycpu\
+..\7za.exe a -tzip $Version-majorsilence-reporting-desktop-$pTargetFramework-anycpu.zip majorsilence-reporting-desktop-$pTargetFramework-anycpu\
+..\7za.exe a -tzip $Version-majorsilence-reporting-rdlcmd-$pTargetFramework-anycpu.zip majorsilence-reporting-rdlcmd-$pTargetFramework-anycpu\
+..\7za.exe a -tzip $Version-majorsilence-reporting-viewer-$pTargetFramework-anycpu.zip majorsilence-reporting-viewer-$pTargetFramework-anycpu\
+..\7za.exe a -tzip $Version-majorsilence-reporting-mapfile-$pTargetFramework-anycpu.zip majorsilence-reporting-mapfile-$pTargetFramework-anycpu\
 cd "$CURRENTPATH"
 
 
-& "$msbuildpath" "$CURRENTPATH\MajorsilenceReporting-ReportServer.sln" /verbosity:minimal /p:Configuration="Release" /property:Platform="Any CPU"
-& "$msbuildpath" "$CURRENTPATH\MajorsilenceReporting-ReportServer.sln" /verbosity:minimal /p:Configuration="Release" /property:Platform="Any CPU" /property:DeployOnBuild=true /property:PublishProfile='FolderProfile'
-
-Copy-Item .\ReportServer\bin\app.publish\ -Destination "$buildoutputpath_reportserver\" -Recurse
-cd Release-Builds
-cd build-output	
-..\7za.exe a $Version-majorsilence-reporting-reportserver-net48-anycpu.zip majorsilence-reporting-reportserver-net48-anycpu\
-cd "$CURRENTPATH"
-
-# ************* End net48 *********************************************
+# ************* End anycpu *********************************************
 
 
 # ************* Begin PHP *********************************************
 $buildoutputpath_php="$CURRENTPATH\Release-Builds\build-output\majorsilence-reporting-php"
 delete_files "$buildoutputpath_php"
 mkdir "$buildoutputpath_php"
 
-Copy-Item .\RdlDesktop\bin\Release\net48\config.xml "$buildoutputpath_php\config.xml"
-Copy-Item .\RdlCmd\bin\Release\net48\ -Destination "$buildoutputpath_php\" -Recurse
+Copy-Item .\RdlDesktop\bin\$pConfiguration\$pTargetFramework\config.xml "$buildoutputpath_php\config.xml"
+Copy-Item .\RdlCmd\bin\$pConfiguration\$pTargetFramework\ -Destination "$buildoutputpath_php\" -Recurse
 
 Copy-Item ".\LanguageWrappers\php\config.php" "$buildoutputpath_php\config.php"
 Copy-Item ".\LanguageWrappers\php\report.php" "$buildoutputpath_php\report.php"
 
 cd Release-Builds
 cd build-output	
-..\7za.exe a $Version-majorsilence-reporting-build-php.zip majorsilence-reporting-php\
+..\7za.exe a -tzip $Version-majorsilence-reporting-build-php.zip majorsilence-reporting-php\
 cd "$CURRENTPATH"
 
 # ************* End PHP *********************************************
@@ -120,14 +94,14 @@ $buildoutputpath_python="$CURRENTPATH\Release-Builds\build-output\majorsilence-r
 delete_files "$buildoutputpath_python"
 mkdir "$buildoutputpath_python"
 
-Copy-Item .\RdlDesktop\bin\Release\net48\config.xml "$buildoutputpath_python\config.xml"
-Copy-Item .\RdlCmd\bin\Release\net48\ -Destination "$buildoutputpath_python\" -Recurse
+Copy-Item .\RdlDesktop\bin\$pConfiguration\$pTargetFramework\config.xml "$buildoutputpath_python\config.xml"
+Copy-Item .\RdlCmd\bin\$pConfiguration\$pTargetFramework\ -Destination "$buildoutputpath_python\" -Recurse
 Copy-Item ".\LanguageWrappers\python\config.py" "$buildoutputpath_python\config.py"
 Copy-Item ".\LanguageWrappers\python\report.py" "$buildoutputpath_python\report.py"
 
 cd Release-Builds
 cd build-output	
-..\7za.exe a $Version-majorsilence-reporting-python.zip majorsilence-reporting-python\
+..\7za.exe a -tzip $Version-majorsilence-reporting-python.zip majorsilence-reporting-python\
 cd "$CURRENTPATH"
 # ************* End Python *********************************************
 
@@ -137,15 +111,15 @@ $buildoutputpath_ruby="$CURRENTPATH\Release-Builds\build-output\majorsilence-rep
 delete_files "$buildoutputpath_ruby"
 mkdir "$buildoutputpath_ruby"
 
-Copy-Item .\RdlDesktop\bin\Release\net48\config.xml "$buildoutputpath_ruby\config.xml"
-Copy-Item .\RdlCmd\bin\Release\net48\ -Destination "$buildoutputpath_ruby\" -Recurse
+Copy-Item .\RdlDesktop\bin\$pConfiguration\$pTargetFramework\config.xml "$buildoutputpath_ruby\config.xml"
+Copy-Item .\RdlCmd\bin\$pConfiguration\$pTargetFramework\ -Destination "$buildoutputpath_ruby\" -Recurse
 
 Copy-Item ".\LanguageWrappers\ruby\config.rb" "$buildoutputpath_ruby\config.rb"
 Copy-Item ".\LanguageWrappers\ruby\report.rb" "$buildoutputpath_ruby\report.rb"
 
 cd Release-Builds
 cd build-output	
-..\7za.exe a $Version-majorsilence-reporting-ruby.zip majorsilence-reporting-ruby\
+..\7za.exe a -tzip $Version-majorsilence-reporting-ruby.zip majorsilence-reporting-ruby\
 cd "$CURRENTPATH"
 
 # ************* End Ruby *********************************************