merge commit, remote desktop services adjusted to new code structure

This commit is contained in:
robvde 2013-06-22 16:43:14 +04:00
parent 03e9c7f3b6
commit 09bd65878e
4 changed files with 2003 additions and 1891 deletions

View file

@ -123,7 +123,6 @@
<Compile Include="..\VersionInfo.cs">
<Link>VersionInfo.cs</Link>
</Compile>
<Compile Include="Code\RemoteDesktopServices\RemoteDesktopServicesController.cs" />
<Compile Include="esEnterpriseStorage.asmx.cs">
<DependentUpon>esEnterpriseStorage.asmx</DependentUpon>
<SubType>Component</SubType>
@ -291,6 +290,9 @@
<None Include="TaskEventHandlers.config" />
<None Include="WsePolicyCache.Config" />
</ItemGroup>
<ItemGroup>
<Folder Include="Code\" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>