Fixed issues with build script and project.

Author: AndyButland

build/Build.proj

@@ -47,30 +47,15 @@
 			This step will update the versions it finds in the packages.config in the Umbraco.Deploy.Contrib.Connectors project.
 			It is used to update the nuspec file.
 		-->
-		<XmlRead
-			XPath="/packages/package[@id='UmbracoCms.Core']/@version"
-			XmlFileName="..\src\Umbraco.Deploy.Contrib.Connectors\packages.config">
-			<Output TaskParameter="Value" PropertyName="CoreVersion" />
-		</XmlRead>
-		
-		<PropertyGroup>
-			<CoreBaseVersion>$(CoreVersion.Substring(0, 5))</CoreBaseVersion>
-		</PropertyGroup>
-
-		<FileUpdate
-			Files="NuSpecs\UmbracoDeploy.Contrib.nuspec"
-			Regex="dependency id=&quot;UmbracoCms.Core&quot; version=&quot;(.*)?&quot;"
-			ReplacementText="dependency id=&quot;UmbracoCms.Core&quot; version=&quot;$(CoreBaseVersion)&quot;"/>
-		
-		<XmlRead
-			XPath="/packages/package[@id='UmbracoDeploy']/@version"
-			XmlFileName="..\src\Umbraco.Deploy.Contrib.Connectors\packages.config">
-			<Output TaskParameter="Value" PropertyName="UmbracoDeployVersion" />
-		</XmlRead>
+        <XmlRead
+                XPath="/Project/ItemGroup/PackageReference[@Include='UmbracoDeploy.Core']/Version"
+                XmlFileName="..\src\Umbraco.Deploy.Contrib.Connectors\Umbraco.Deploy.Contrib.Connectors.csproj">
+            <Output TaskParameter="Value" PropertyName="CoreVersion" />
+        </XmlRead>
 		<FileUpdate
 			Files="NuSpecs\UmbracoDeploy.Contrib.nuspec"
-			Regex="dependency id=&quot;UmbracoDeploy&quot; version=&quot;(.*)?,"
-			ReplacementText="dependency id=&quot;UmbracoDeploy&quot; version=&quot;[$(UmbracoDeployVersion),"/>
+			Regex="dependency id=&quot;UmbracoDeploy.Core&quot; version=&quot;(.*)?,"
+			ReplacementText="dependency id=&quot;UmbracoDeploy.Core&quot; version=&quot;[$(UmbracoDeployVersion),"/>
 	</Target>
 
 	<Target Name="CompileSolution" DependsOnTargets="UpdateReferencedVersions">
@@ -101,4 +86,4 @@
 	<Target Name="Build" DependsOnTargets="Zip">
 		<Message Text="Build finished" />
 	</Target>
-</Project>
+</Project>

build/NuSpecs/UmbracoDeploy.Contrib.nuspec

@@ -17,11 +17,10 @@
 		<language>en-US</language>
 		<tags>umbraco</tags>
 		<dependencies>
-			<dependency id="UmbracoCms.Core" version="8.0.0" />
-			<dependency id="UmbracoDeploy" version="3.0.0" />
+			<dependency id="UmbracoDeploy.Core" version="4.1.2" />
 		</dependencies>
 	</metadata>
 	<files>
 		<file src="..\_BuildOutput\Deploy\bin\Umbraco.Deploy.Contrib.Connectors.dll" target="lib\net45\Umbraco.Deploy.Contrib.Connectors.dll" />
 	</files>
-</package>
+</package>

build/RunBuild.bat

@@ -33,14 +33,14 @@ for /f "usebackq delims=" %%i in (`tools\vswhere -latest -version "[15.0,17.0)"
 )
 SET MSBUILDPath="%programfiles(x86)%"\MSBuild\14.0\Bin\MsBuild.exe
 
-if exist "%programfiles(x86)%\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe" (
-  SET MSBUILDPath="%programfiles(x86)%\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe"
-)
-
 if exist "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (
   SET MSBUILDPath="%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe"
 )
 
+if exist "%InstallDir%\MSBuild\Current\Bin\MSBuild.exe" (
+  SET MSBUILDPath="%InstallDir%\MSBuild\Current\Bin\MSBuild.exe"
+)
+
 if exist "%programfiles(x86)%\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe" (
   SET MSBUILDPath="%programfiles(x86)%\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MsBuild.exe"
 )
@@ -55,4 +55,4 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 
 GOTO :EOF
 
-PAUSE
+PAUSE