Bring back DLL dependencies instead of nupkg.

Update Report Viewer DLL dependencies to 12.0.2402.15. Generate MSTSC dependency at build time. Signed-off-by: Tu Dinh <ngoc-tu.dinh@vates.tech>
xcp-ng · Nov 4, 2024 · ebfa83c · ebfa83c
1 parent c1ed446
commit ebfa83c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 22,712 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -90,8 +90,4 @@ internal partial class ThisAssembly
 		<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/Packages/MSTSCLib.1.0.0.nupkg b/Packages/MSTSCLib.1.0.0.nupkg
diff --git a/Packages/Microsoft.ReportViewer.9.0.0.nupkg b/Packages/Microsoft.ReportViewer.9.0.0.nupkg
diff --git a/XenAdmin/RDP/AxMSTSCLib.cs b/XenAdmin/RDP/AxMSTSCLib.cs
diff --git a/XenAdmin/ReportViewer/Microsoft.ReportViewer.Common.dll b/XenAdmin/ReportViewer/Microsoft.ReportViewer.Common.dll
diff --git a/XenAdmin/ReportViewer/Microsoft.ReportViewer.WinForms.DLL b/XenAdmin/ReportViewer/Microsoft.ReportViewer.WinForms.DLL
diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj
@@ -15,11 +15,15 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MSTSCLib" Version="1.0.0" />
-		<PackageReference Include="Microsoft.ReportViewer" Version="9.0.0" />
-	</ItemGroup>
-
-	<ItemGroup>
+		<Reference Include="AxMSTSCLib">
+		  <HintPath>RDP\AxMSTSCLib.dll</HintPath>
+		</Reference>
+		<Reference Include="Microsoft.ReportViewer.WinForms">
+		  <HintPath>ReportViewer\Microsoft.ReportViewer.WinForms.DLL</HintPath>
+		</Reference>
+		<Reference Include="MSTSCLib">
+		  <HintPath>RDP\MSTSCLib.dll</HintPath>
+		</Reference>
 		<Reference Include="System.Design" />
 		<Reference Include="System.Management" />
 		<Reference Include="System.Security" />
@@ -66,4 +70,8 @@
 	    <LastGenOutput>Settings.Designer.cs</LastGenOutput>
 	  </None>
 	</ItemGroup>
+
+  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+    <Exec Command="&quot;$(TargetFrameworkSDKToolsDirectory)aximp.exe&quot; $(WinDir)\System32\mstscax.dll" WorkingDirectory="$(ProjectDir)RDP" />
+  </Target>
 </Project>