diff --git a/Directory.Build.targets b/Directory.Build.targets
index c56361aaf..9eec3a5d4 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,38 +1,38 @@
 <Project>
-  <Target Name="SetSourceRevisionId" BeforeTargets="InitializeSourceControlInformation">
-    <Exec Command="git describe --long --always --dirty --exclude=* --abbrev=8" ConsoleToMSBuild="True"
-          IgnoreExitCode="False" ContinueOnError="True">
-      <Output PropertyName="SourceRevisionIdOutput" TaskParameter="ConsoleOutput" />
-      <Output PropertyName="SourceRevisionIdErrorCode" TaskParameter="ExitCode" />
-    </Exec>
-    <Exec Command="git rev-parse HEAD" ConsoleToMSBuild="True" IgnoreExitCode="False" ContinueOnError="True">
-      <Output PropertyName="SourceRevisionIdFullOutput" TaskParameter="ConsoleOutput" />
-      <Output PropertyName="SourceRevisionIdFullErrorCode" TaskParameter="ExitCode" />
-    </Exec>
-    <Exec Command="git rev-parse --abbrev-ref HEAD" ConsoleToMSBuild="True" IgnoreExitCode="False"
-          ContinueOnError="True">
-      <Output PropertyName="SourceBranchOutput" TaskParameter="ConsoleOutput" />
-      <Output PropertyName="SourceBranchErrorCode" TaskParameter="ExitCode" />
-    </Exec>
-    <PropertyGroup>
-      <GitRepo>false</GitRepo>
-      <SourceRevisionId></SourceRevisionId>
-      <SourceRevisionIdFull></SourceRevisionIdFull>
-      <SourceBranch></SourceBranch>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(SourceRevisionIdErrorCode)' == '0'">
-      <GitRepo>true</GitRepo>
-      <SourceRevisionId>$(SourceRevisionIdOutput)</SourceRevisionId>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(SourceRevisionIdFullErrorCode)' == '0'">
-      <SourceRevisionIdFull>$(SourceRevisionIdFullOutput)</SourceRevisionIdFull>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(SourceBranchErrorCode)' == '0'">
-      <SourceBranch>$(SourceBranchOutput)</SourceBranch>
-    </PropertyGroup>
-    <PropertyGroup>
-      <GitData>
-        <![CDATA[
+	<Target Name="SetSourceRevisionId" BeforeTargets="InitializeSourceControlInformation">
+		<Exec Command="git describe --long --always --dirty --exclude=* --abbrev=8" ConsoleToMSBuild="True"
+			  IgnoreExitCode="False" ContinueOnError="True">
+			<Output PropertyName="SourceRevisionIdOutput" TaskParameter="ConsoleOutput" />
+			<Output PropertyName="SourceRevisionIdErrorCode" TaskParameter="ExitCode" />
+		</Exec>
+		<Exec Command="git rev-parse HEAD" ConsoleToMSBuild="True" IgnoreExitCode="False" ContinueOnError="True">
+			<Output PropertyName="SourceRevisionIdFullOutput" TaskParameter="ConsoleOutput" />
+			<Output PropertyName="SourceRevisionIdFullErrorCode" TaskParameter="ExitCode" />
+		</Exec>
+		<Exec Command="git rev-parse --abbrev-ref HEAD" ConsoleToMSBuild="True" IgnoreExitCode="False"
+			  ContinueOnError="True">
+			<Output PropertyName="SourceBranchOutput" TaskParameter="ConsoleOutput" />
+			<Output PropertyName="SourceBranchErrorCode" TaskParameter="ExitCode" />
+		</Exec>
+		<PropertyGroup>
+			<GitRepo>false</GitRepo>
+			<SourceRevisionId></SourceRevisionId>
+			<SourceRevisionIdFull></SourceRevisionIdFull>
+			<SourceBranch></SourceBranch>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(SourceRevisionIdErrorCode)' == '0'">
+			<GitRepo>true</GitRepo>
+			<SourceRevisionId>$(SourceRevisionIdOutput)</SourceRevisionId>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(SourceRevisionIdFullErrorCode)' == '0'">
+			<SourceRevisionIdFull>$(SourceRevisionIdFullOutput)</SourceRevisionIdFull>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(SourceBranchErrorCode)' == '0'">
+			<SourceBranch>$(SourceBranchOutput)</SourceBranch>
+		</PropertyGroup>
+		<PropertyGroup>
+			<GitData>
+				<![CDATA[
 using System%3B
 internal partial class ThisAssembly
 {
@@ -44,9 +44,9 @@ internal partial class ThisAssembly
     }
 }
       ]]>
-      </GitData>
-      <InformationalData>
-        <![CDATA[
+			</GitData>
+			<InformationalData>
+				<![CDATA[
 using System%3B
 internal partial class ThisAssembly
 {
@@ -59,35 +59,39 @@ internal partial class ThisAssembly
     }
 }
       ]]>
-      </InformationalData>
-    </PropertyGroup>
-    <PropertyGroup>
-      <GitGeneratedFilePath>$(IntermediateOutputPath)GitAssemblyInformation.g.cs</GitGeneratedFilePath>
-      <InformationalGeneratedFilePath>$(IntermediateOutputPath)InformationalAssemblyInformation.g.cs</InformationalGeneratedFilePath>
-    </PropertyGroup>
-    <ItemGroup>
-      <Compile Include="$(GitGeneratedFilePath)" />
-      <FileWrites Include="$(GitGeneratedFilePath)" />
-      <Compile Include="$(InformationalGeneratedFilePath)" />
-      <FileWrites Include="$(InformationalGeneratedFilePath)" />
-    </ItemGroup>
-    <WriteLinesToFile Lines="$(GitData)" File="$(GitGeneratedFilePath)" WriteOnlyWhenDifferent="true" Overwrite="true" />
-    <WriteLinesToFile Lines="$(InformationalData)" File="$(InformationalGeneratedFilePath)"
-                      WriteOnlyWhenDifferent="true" Overwrite="true" />
-  </Target>
+			</InformationalData>
+		</PropertyGroup>
+		<PropertyGroup>
+			<GitGeneratedFilePath>$(IntermediateOutputPath)GitAssemblyInformation.g.cs</GitGeneratedFilePath>
+			<InformationalGeneratedFilePath>$(IntermediateOutputPath)InformationalAssemblyInformation.g.cs</InformationalGeneratedFilePath>
+		</PropertyGroup>
+		<ItemGroup>
+			<Compile Include="$(GitGeneratedFilePath)" />
+			<FileWrites Include="$(GitGeneratedFilePath)" />
+			<Compile Include="$(InformationalGeneratedFilePath)" />
+			<FileWrites Include="$(InformationalGeneratedFilePath)" />
+		</ItemGroup>
+		<WriteLinesToFile Lines="$(GitData)" File="$(GitGeneratedFilePath)" WriteOnlyWhenDifferent="true" Overwrite="true" />
+		<WriteLinesToFile Lines="$(InformationalData)" File="$(InformationalGeneratedFilePath)"
+						  WriteOnlyWhenDifferent="true" Overwrite="true" />
+	</Target>
 
-  <PropertyGroup>
-    <AssemblyTitle>$(Title)</AssemblyTitle>
-    <AssemblyDescription>$(Description)</AssemblyDescription>
-    <Copyright>Copyright © XCP-ng</Copyright>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/xcp-ng/xenadmin</RepositoryUrl>
-    <RevisionNumber>$([System.DateTime]::Now.ToString("yy"))$([System.DateTime]::Now.DayOfYear.ToString("D3"))</RevisionNumber>
-    <Authors>XCP-ng</Authors>
-    <Product>XCP-ng Center</Product>
-    <Version>0.0.0.$(RevisionNumber)</Version>
-    <FileVersion>0.0.0.$(RevisionNumber)</FileVersion>
-    <Codename>Medicine Hat</Codename>
-    <Lab>xcpngcenter_main</Lab>
-  </PropertyGroup>
+	<PropertyGroup>
+		<AssemblyTitle>$(Title)</AssemblyTitle>
+		<AssemblyDescription>$(Description)</AssemblyDescription>
+		<Copyright>Copyright © XCP-ng</Copyright>
+		<RepositoryType>git</RepositoryType>
+		<RepositoryUrl>https://github.com/xcp-ng/xenadmin</RepositoryUrl>
+		<RevisionNumber>$([System.DateTime]::Now.ToString("yy"))$([System.DateTime]::Now.DayOfYear.ToString("D3"))</RevisionNumber>
+		<Authors>XCP-ng</Authors>
+		<Product>XCP-ng Center</Product>
+		<Version>0.0.0.$(RevisionNumber)</Version>
+		<FileVersion>0.0.0.$(RevisionNumber)</FileVersion>
+		<Codename>Medicine Hat</Codename>
+		<Lab>xcpngcenter_main</Lab>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<RestoreSources>$(RestoreSources);./Packages;https://api.nuget.org/v3/index.json</RestoreSources>
+	</PropertyGroup>
 </Project>
diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj
index a4ecf9697..b30eb87ce 100755
--- a/XenAdmin/XenAdmin.csproj
+++ b/XenAdmin/XenAdmin.csproj
@@ -8,11 +8,13 @@
 		<ApplicationIcon>AppIcon.ico</ApplicationIcon>
 		<Title>XCP-ng Center</Title>
 		<Description>XCP-ng Center</Description>
-		<RestoreSources>$(RestoreSources);../Packages</RestoreSources>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\XenModel\XenModel.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
 		<PackageReference Include="MSTSCLib" Version="1.0.0" />
 		<PackageReference Include="Microsoft.ReportViewer" Version="9.0.0" />
 	</ItemGroup>