From 83fbe24d3cd24d84ac131b599efb183cf148c4e3 Mon Sep 17 00:00:00 2001
From: Thomas Nind <TZNind@dundee.ac.uk>
Date: Tue, 1 Oct 2019 14:49:13 +0100
Subject: [PATCH] Changed publish to use msbuild

---
 TemplateBuilder/TemplateBuilder.csproj |  1 +
 rakefile.rb                            | 15 +++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/TemplateBuilder/TemplateBuilder.csproj b/TemplateBuilder/TemplateBuilder.csproj
index 50e1888..54ed48f 100644
--- a/TemplateBuilder/TemplateBuilder.csproj
+++ b/TemplateBuilder/TemplateBuilder.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net461</TargetFramework>
+    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <AssemblyTitle>TemplateBuilder</AssemblyTitle>
     <Product>TemplateBuilder</Product>
     <Copyright>Copyright ©  2018</Copyright>
diff --git a/rakefile.rb b/rakefile.rb
index 58ce664..2756953 100644
--- a/rakefile.rb
+++ b/rakefile.rb
@@ -5,7 +5,7 @@
 load 'rakeconfig.rb'
 $MSBUILD15CMD = MSBUILD15CMD.gsub(/\\/,"/")
 
-task :release => [:assemblyinfo, :build_release, :build_cli, :github]
+task :release => [:assemblyinfo, :build_release, :github]
 
 task :restorepackages do
     sh "nuget restore #{SOLUTION}"
@@ -15,19 +15,18 @@
 	sh "\"#{$MSBUILD15CMD}\" #{SOLUTION} \/t:Clean;Build \/p:Configuration=#{args.config}"
 end
 
-task :build_release => :restorepackages do
-	sh "\"#{$MSBUILD15CMD}\" #{SOLUTION} \/t:Clean;Build \/p:Configuration=Release"
-end
 
-task :build_cli => :restorepackages do
+task :build_release => :restorepackages do
 	Dir.chdir("TemplateBuilder/") do
-        sh "dotnet publish -r win-x64 -c Release -o Publish"
-		Dir.chdir("Publish/") do
+		sh "\"#{$MSBUILD15CMD}\" TemplateBuilder.csproj \/t:Publish \/p:Configuration=Release;RuntimeIdentifiers=win-x64"
+		
+		Dir.chdir("bin/Release/net461/publish/") do
 			sh "#{SQUIRREL}/signtool.exe sign /a /s MY /n \"University of Dundee\" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /v *.dll"
 			sh "#{SQUIRREL}/signtool.exe sign /a /s MY /n \"University of Dundee\" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /v *.exe"
 		end
+        
     end
-	sh "powershell.exe -nologo -noprofile -command \"& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::CreateFromDirectory('TemplateBuilder/Publish', 'TemplateBuilder/templatebuilder-win-x64.zip'); }\""
+	sh "powershell.exe -nologo -noprofile -command \"& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::CreateFromDirectory('TemplateBuilder/bin/Release/net461/publish', 'TemplateBuilder/templatebuilder-win-x64.zip'); }\""
 end
 
 desc "Sets the version number from SharedAssemblyInfo file"