Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring back DLL dependencies instead of bundling NuGet packages. #237

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Bring back DLL dependencies instead of bundling NuGet packages. #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Binary file removed Packages/MSTSCLib.1.0.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed Packages/Microsoft.ReportViewer.9.0.0.nupkg
View file
Open in desktop
Binary file not shown.
22,703 changes: 0 additions & 22,703 deletions XenAdmin/RDP/AxMSTSCLib.cs
View file
Open in desktop

This file was deleted.

Binary file added XenAdmin/ReportViewer/Microsoft.ReportViewer.Common.dll
View file
Open in desktop
Binary file not shown.
Binary file added XenAdmin/ReportViewer/Microsoft.ReportViewer.WinForms.DLL
View file
Open in desktop
Binary file not shown.
18 changes: 13 additions & 5 deletions XenAdmin/XenAdmin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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>