brought zircon branch into trunk

1 files changed, 4 insertions, 10 deletions

diff --git a/ogs/gridserver/src/OGS-GridServer.csproj b/OGS/gridserver/src/OGS-GridServer.csproj
index d984e9a..b957d40 100644
--- a/ogs/gridserver/src/OGS-GridServer.csproj
+++ b/OGS/gridserver/src/OGS-GridServer.csproj
@@ -40,9 +40,6 @@
     <Compile Include="..\..\common\src\OGS-Console.cs">

       <Link>OGS-Console.cs</Link>

     </Compile>

-    <Compile Include="..\..\common\src\Util.cs">

-      <Link>Util.cs</Link>

-    </Compile>

     <Compile Include="..\..\common\VersionInfo\VersionInfo.cs">

       <Link>VersionInfo.cs</Link>

     </Compile>

@@ -53,17 +50,14 @@
     <Compile Include="SimProfiles.cs" />

   </ItemGroup>

   <ItemGroup>

+    <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj">

+      <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project>

+      <Name>OpenSim.Framework</Name>

+    </ProjectReference>

     <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj">

       <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project>

       <Name>ServerConsole</Name>

     </ProjectReference>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

 </Project>
\ No newline at end of file