[mapguide-commits] r8283 - in branches/2.6/MgDev/Desktop: . DesktopUnmanagedApi/DotNet DesktopUnmanagedApi/JavaApiEx DotNetHarness DotNetHarness/Properties DotNetUnitTest MapViewer MapViewer/Properties MapViewer.Desktop MapViewerTest MapViewerTest/Properties MgAppLayout MgAppLayout/Properties
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jul 4 04:53:43 PDT 2014
Author: jng
Date: 2014-07-04 04:53:43 -0700 (Fri, 04 Jul 2014)
New Revision: 8283
Removed:
branches/2.6/MgDev/Desktop/DotNetHarness/DotNetHarness.Net40.csproj
branches/2.6/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.Net40.csproj
branches/2.6/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.Net40.csproj
branches/2.6/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj
branches/2.6/MgDev/Desktop/MapViewerTest/MapViewerTest.Net40.csproj
branches/2.6/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj.user
branches/2.6/MgDev/Desktop/MgAppLayout/MgAppLayout.Net40.csproj
Modified:
branches/2.6/MgDev/Desktop/
branches/2.6/MgDev/Desktop/DesktopUnmanagedApi/DotNet/
branches/2.6/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/
branches/2.6/MgDev/Desktop/DotNetHarness/DotNetHarness.csproj
branches/2.6/MgDev/Desktop/DotNetHarness/Properties/Resources.Designer.cs
branches/2.6/MgDev/Desktop/DotNetHarness/Properties/Settings.Designer.cs
branches/2.6/MgDev/Desktop/DotNetHarness/app.config
branches/2.6/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.csproj
branches/2.6/MgDev/Desktop/DotNetUnitTest/app.config
branches/2.6/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.csproj
branches/2.6/MgDev/Desktop/MapViewer/Debug.Designer.cs
branches/2.6/MgDev/Desktop/MapViewer/MapViewer.csproj
branches/2.6/MgDev/Desktop/MapViewer/Properties/Resources.Designer.cs
branches/2.6/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj
branches/2.6/MgDev/Desktop/MapViewerTest/Properties/Resources.Designer.cs
branches/2.6/MgDev/Desktop/MapViewerTest/Properties/Settings.Designer.cs
branches/2.6/MgDev/Desktop/MapViewerTest/app.config
branches/2.6/MgDev/Desktop/MgAppLayout/MgAppLayout.csproj
branches/2.6/MgDev/Desktop/MgAppLayout/Properties/Resources.Designer.cs
branches/2.6/MgDev/Desktop/MgAppLayout/Properties/Settings.Designer.cs
branches/2.6/MgDev/Desktop/MgDesktopDotNet.sln
Log:
mg-desktop updates:
- Have the viewer and MgAppLayout target .net framework 4.0 instead of 4.5. It was set to 4.5 as part of the VS2012 migration, but this is not necessary as the viewer (targeting 4.0) still compiles and runs against the .net MapGuide assemblies without issues when targeting 4.0. It should only target 4.5 if we're using 4.5-exclusive features, which we're not.
- Remove the Net40 from project names
- Update svn ignore lists
Property changes on: branches/2.6/MgDev/Desktop
___________________________________________________________________
Modified: svn:ignore
- bin
lib
obj
MgDesktopApi.ncb
MgDesktopApi.suo
MgDesktopApi_VS2010.sdf
MgDesktopApi_VS2010.suo
MgDesktopDotNet_VS2010.suo
MgDesktopDotNet.suo
+ bin
lib
obj
MgDesktopApi.ncb
MgDesktopApi.suo
MgDesktopApi_VS2010.sdf
MgDesktopApi_VS2010.suo
MgDesktopDotNet_VS2010.suo
MgDesktopDotNet.suo
*.sdf
*.suo
Property changes on: branches/2.6/MgDev/Desktop/DesktopUnmanagedApi/DotNet
___________________________________________________________________
Modified: svn:ignore
- *.user
DesktopCustom
*.cs
MapGuideDesktopApi.i
MgDesktopApi_wrap.cpp
x64
Backup
+ *.user
DesktopCustom
*.cs
MapGuideDesktopApi.i
MgDesktopApi_wrap.cpp
x64
Backup
MapGuideDesktopApi_Doc.i
Property changes on: branches/2.6/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx
___________________________________________________________________
Added: svn:ignore
+ MapGuideApi.i
MapGuideApi_Doc.i
MgApi_wrap.cpp
language.i
Deleted: branches/2.6/MgDev/Desktop/DotNetHarness/DotNetHarness.Net40.csproj
===================================================================
--- branches/2.6/MgDev/Desktop/DotNetHarness/DotNetHarness.Net40.csproj 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/DotNetHarness/DotNetHarness.Net40.csproj 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,502 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{A5881D59-BD24-4A3A-A707-F18A25724D29}</ProjectGuid>
- <OutputType>WinExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>DotNetHarness</RootNamespace>
- <AssemblyName>DotNetHarness</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>..\bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>..\bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x64\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
- <OutputPath>bin\x64\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <Private>False</Private>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Desktop.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <Private>False</Private>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <Private>False</Private>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <Private>False</Private>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="System.Xml.Linq">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="System.Data.DataSetExtensions">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="System.Data" />
- <Reference Include="System.Deployment" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Feature\CreateFeatureSourceCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\CreateFeatureSourceCtrl.Designer.cs">
- <DependentUpon>CreateFeatureSourceCtrl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\GetSchemaMappingCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\GetSchemaMappingCtrl.Designer.cs">
- <DependentUpon>GetSchemaMappingCtrl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\RegisterProviderCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\RegisterProviderCtrl.Designer.cs">
- <DependentUpon>RegisterProviderCtrl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\SelectAggregatesControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\SelectAggregatesControl.Designer.cs">
- <DependentUpon>SelectAggregatesControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\EnumerateDataStoresControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\EnumerateDataStoresControl.Designer.cs">
- <DependentUpon>EnumerateDataStoresControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\ExecuteSqlControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\ExecuteSqlControl.Designer.cs">
- <DependentUpon>ExecuteSqlControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\ExecuteSqlNonQueryControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\ExecuteSqlNonQueryControl.Designer.cs">
- <DependentUpon>ExecuteSqlNonQueryControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\GetCapabilitiesControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\GetCapabilitiesControl.Designer.cs">
- <DependentUpon>GetCapabilitiesControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\GetClassesControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\GetClassesControl.Designer.cs">
- <DependentUpon>GetClassesControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\GetFeatureProvidersControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\GetFeatureProvidersControl.Designer.cs">
- <DependentUpon>GetFeatureProvidersControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\GetSchemasControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\GetSchemasControl.Designer.cs">
- <DependentUpon>GetSchemasControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\GetSpatialContextsControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\GetSpatialContextsControl.Designer.cs">
- <DependentUpon>GetSpatialContextsControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\SelectFeaturesControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\SelectFeaturesControl.Designer.cs">
- <DependentUpon>SelectFeaturesControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Feature\TestConnectionControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Feature\TestConnectionControl.Designer.cs">
- <DependentUpon>TestConnectionControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Form1.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Form1.Designer.cs">
- <DependentUpon>Form1.cs</DependentUpon>
- </Compile>
- <Compile Include="ImageResponseDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="ImageResponseDialog.Designer.cs">
- <DependentUpon>ImageResponseDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <EmbeddedResource Include="Feature\CreateFeatureSourceCtrl.resx">
- <DependentUpon>CreateFeatureSourceCtrl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\GetSchemaMappingCtrl.resx">
- <DependentUpon>GetSchemaMappingCtrl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\RegisterProviderCtrl.resx">
- <DependentUpon>RegisterProviderCtrl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\SelectAggregatesControl.resx">
- <DependentUpon>SelectAggregatesControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\EnumerateDataStoresControl.resx">
- <DependentUpon>EnumerateDataStoresControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\ExecuteSqlControl.resx">
- <DependentUpon>ExecuteSqlControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\ExecuteSqlNonQueryControl.resx">
- <DependentUpon>ExecuteSqlNonQueryControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\GetCapabilitiesControl.resx">
- <DependentUpon>GetCapabilitiesControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\GetClassesControl.resx">
- <DependentUpon>GetClassesControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\GetFeatureProvidersControl.resx">
- <DependentUpon>GetFeatureProvidersControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\GetSchemasControl.resx">
- <DependentUpon>GetSchemasControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\GetSpatialContextsControl.resx">
- <DependentUpon>GetSpatialContextsControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\SelectFeaturesControl.resx">
- <DependentUpon>SelectFeaturesControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Feature\TestConnectionControl.resx">
- <DependentUpon>TestConnectionControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Form1.resx">
- <DependentUpon>Form1.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="ImageResponseDialog.resx">
- <DependentUpon>ImageResponseDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="ReaderResponseDialog.resx">
- <DependentUpon>ReaderResponseDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Rendering\RenderDynamicOverlayControl.resx">
- <DependentUpon>RenderDynamicOverlayControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Rendering\RenderMapControl.resx">
- <DependentUpon>RenderMapControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Rendering\RenderTileControl.resx">
- <DependentUpon>RenderTileControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\ApplyResourcePackageControl.resx">
- <DependentUpon>ApplyResourcePackageControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\CopyResourceControl.resx">
- <DependentUpon>CopyResourceControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\DeleteResourceControl.resx">
- <DependentUpon>DeleteResourceControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\DeleteResourceDataControl.resx">
- <DependentUpon>DeleteResourceDataControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\EnumerateResourceDataControl.resx">
- <DependentUpon>EnumerateResourceDataControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\EnumerateResourcesControl.resx">
- <DependentUpon>EnumerateResourcesControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\EnumerateUnmanagedDataControl.resx">
- <DependentUpon>EnumerateUnmanagedDataControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\GetResourceContentControl.resx">
- <DependentUpon>GetResourceContentControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\GetResourceDataControl.resx">
- <DependentUpon>GetResourceDataControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\MoveResourceControl.resx">
- <DependentUpon>MoveResourceControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\RenameResourceDataControl.resx">
- <DependentUpon>RenameResourceDataControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\ResourceExistsControl.resx">
- <DependentUpon>ResourceExistsControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\SetResourceControl.resx">
- <DependentUpon>SetResourceControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Resource\SetResourceDataControl.resx">
- <DependentUpon>SetResourceDataControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="SpatialContextResultDialog.resx">
- <DependentUpon>SpatialContextResultDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Tile\GetTileControl.resx">
- <DependentUpon>GetTileControl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="XmlResponseDialog.resx">
- <DependentUpon>XmlResponseDialog.cs</DependentUpon>
- </EmbeddedResource>
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DependentUpon>Resources.resx</DependentUpon>
- <DesignTime>True</DesignTime>
- </Compile>
- <None Include="..\MgDesktop\Platform.ini">
- <Link>Platform.ini</Link>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
- <None Include="app.config" />
- <None Include="Properties\Settings.settings">
- <Generator>SettingsSingleFileGenerator</Generator>
- <LastGenOutput>Settings.Designer.cs</LastGenOutput>
- </None>
- <Compile Include="Properties\Settings.Designer.cs">
- <AutoGen>True</AutoGen>
- <DependentUpon>Settings.settings</DependentUpon>
- <DesignTimeSharedInput>True</DesignTimeSharedInput>
- </Compile>
- <Compile Include="ReaderResponseDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="ReaderResponseDialog.Designer.cs">
- <DependentUpon>ReaderResponseDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Rendering\RenderDynamicOverlayControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Rendering\RenderDynamicOverlayControl.Designer.cs">
- <DependentUpon>RenderDynamicOverlayControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Rendering\RenderMapControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Rendering\RenderMapControl.Designer.cs">
- <DependentUpon>RenderMapControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Rendering\RenderTileControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Rendering\RenderTileControl.Designer.cs">
- <DependentUpon>RenderTileControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\ApplyResourcePackageControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\ApplyResourcePackageControl.Designer.cs">
- <DependentUpon>ApplyResourcePackageControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\CopyResourceControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\CopyResourceControl.Designer.cs">
- <DependentUpon>CopyResourceControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\DeleteResourceControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\DeleteResourceControl.Designer.cs">
- <DependentUpon>DeleteResourceControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\DeleteResourceDataControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\DeleteResourceDataControl.Designer.cs">
- <DependentUpon>DeleteResourceDataControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\EnumerateResourceDataControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\EnumerateResourceDataControl.Designer.cs">
- <DependentUpon>EnumerateResourceDataControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\EnumerateResourcesControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\EnumerateResourcesControl.Designer.cs">
- <DependentUpon>EnumerateResourcesControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\EnumerateUnmanagedDataControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\EnumerateUnmanagedDataControl.Designer.cs">
- <DependentUpon>EnumerateUnmanagedDataControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\GetResourceContentControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\GetResourceContentControl.Designer.cs">
- <DependentUpon>GetResourceContentControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\GetResourceDataControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\GetResourceDataControl.Designer.cs">
- <DependentUpon>GetResourceDataControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\MoveResourceControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\MoveResourceControl.Designer.cs">
- <DependentUpon>MoveResourceControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\MultiGetResourceContentControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\MultiGetResourceContentControl.Designer.cs">
- <DependentUpon>MultiGetResourceContentControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\RenameResourceDataControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\RenameResourceDataControl.Designer.cs">
- <DependentUpon>RenameResourceDataControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\ResourceExistsControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\ResourceExistsControl.Designer.cs">
- <DependentUpon>ResourceExistsControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\SetResourceControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\SetResourceControl.Designer.cs">
- <DependentUpon>SetResourceControl.cs</DependentUpon>
- </Compile>
- <Compile Include="Resource\SetResourceDataControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Resource\SetResourceDataControl.Designer.cs">
- <DependentUpon>SetResourceDataControl.cs</DependentUpon>
- </Compile>
- <Compile Include="SpatialContextResultDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="SpatialContextResultDialog.Designer.cs">
- <DependentUpon>SpatialContextResultDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Tile\GetTileControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Tile\GetTileControl.Designer.cs">
- <DependentUpon>GetTileControl.cs</DependentUpon>
- </Compile>
- <Compile Include="XmlResponseDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="XmlResponseDialog.Designer.cs">
- <DependentUpon>XmlResponseDialog.cs</DependentUpon>
- </Compile>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\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
Modified: branches/2.6/MgDev/Desktop/DotNetHarness/DotNetHarness.csproj
===================================================================
--- branches/2.6/MgDev/Desktop/DotNetHarness/DotNetHarness.csproj 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/DotNetHarness/DotNetHarness.csproj 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,8 +10,29 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DotNetHarness</RootNamespace>
<AssemblyName>DotNetHarness</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -20,6 +41,7 @@
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\bin\Release\</OutputPath>
@@ -28,6 +50,7 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
@@ -36,6 +59,7 @@
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\x64\Release\</OutputPath>
@@ -44,6 +68,7 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, processorArchitecture=x86">
@@ -300,11 +325,13 @@
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
+ <DesignTime>True</DesignTime>
</Compile>
<None Include="..\MgDesktop\Platform.ini">
<Link>Platform.ini</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
+ <None Include="app.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -447,6 +474,23 @@
<DependentUpon>XmlResponseDialog.cs</DependentUpon>
</Compile>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\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.
Modified: branches/2.6/MgDev/Desktop/DotNetHarness/Properties/Resources.Designer.cs
===================================================================
--- branches/2.6/MgDev/Desktop/DotNetHarness/Properties/Resources.Designer.cs 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/DotNetHarness/Properties/Resources.Designer.cs 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: branches/2.6/MgDev/Desktop/DotNetHarness/Properties/Settings.Designer.cs
===================================================================
--- branches/2.6/MgDev/Desktop/DotNetHarness/Properties/Settings.Designer.cs 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/DotNetHarness/Properties/Settings.Designer.cs 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: branches/2.6/MgDev/Desktop/DotNetHarness/app.config
===================================================================
--- branches/2.6/MgDev/Desktop/DotNetHarness/app.config 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/DotNetHarness/app.config 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
Deleted: branches/2.6/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.Net40.csproj
===================================================================
--- branches/2.6/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.Net40.csproj 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.Net40.csproj 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{FDA196F0-3C55-4360-B207-BA5EF6D746F8}</ProjectGuid>
- <OutputType>Exe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>DotNetUnitTest</RootNamespace>
- <AssemblyName>DotNetUnitTest</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <StartupObject>
- </StartupObject>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>..\bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>..\bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x64\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
- <OutputPath>bin\x64\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <Private>False</Private>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Desktop.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <Private>False</Private>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <Private>False</Private>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <Private>False</Private>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Assert.cs" />
- <Compile Include="FeatureServiceTests.cs" />
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="RenderingServiceTests.cs" />
- <Compile Include="ResourceServiceTests.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="app.config" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\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
Modified: branches/2.6/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.csproj
===================================================================
--- branches/2.6/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.csproj 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.csproj 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +10,31 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DotNetUnitTest</RootNamespace>
<AssemblyName>DotNetUnitTest</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -22,6 +43,7 @@
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\bin\Release\</OutputPath>
@@ -30,6 +52,7 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
@@ -38,6 +61,7 @@
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\x64\Release\</OutputPath>
@@ -46,6 +70,7 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
@@ -80,6 +105,26 @@
<Compile Include="RenderingServiceTests.cs" />
<Compile Include="ResourceServiceTests.cs" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\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.
Modified: branches/2.6/MgDev/Desktop/DotNetUnitTest/app.config
===================================================================
--- branches/2.6/MgDev/Desktop/DotNetUnitTest/app.config 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/DotNetUnitTest/app.config 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
Modified: branches/2.6/MgDev/Desktop/MapViewer/Debug.Designer.cs
===================================================================
--- branches/2.6/MgDev/Desktop/MapViewer/Debug.Designer.cs 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MapViewer/Debug.Designer.cs 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Deleted: branches/2.6/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj
===================================================================
--- branches/2.6/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,578 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{D46ED17B-329B-4D80-9181-FEF8307EFCBB}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>OSGeo.MapGuide.Viewer</RootNamespace>
- <AssemblyName>OSGeo.MapGuide.Viewer</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <SignAssembly>false</SignAssembly>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>
- </DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <DocumentationFile>bin\Release\OSGeo.MapGuide.Viewer.XML</DocumentationFile>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=1.0.0.1, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Foundation.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=1.0.0.1, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Geometry.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=1.0.0.1, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="AppLayoutEngine\AppLayout.cs" />
- <Compile Include="AppLayoutEngine\MgQuitComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="AppLayoutEngine\Shell.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="AppLayoutEngine\Shell.Designer.cs">
- <DependentUpon>Shell.cs</DependentUpon>
- </Compile>
- <Compile Include="BaseInteractionComponents.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="Debug.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Debug.resx</DependentUpon>
- </Compile>
- <Compile Include="IDefaultToolbar.cs" />
- <Compile Include="IMapLegend.cs" />
- <Compile Include="IMapViewer.cs" />
- <Compile Include="IMapViewerComponent.cs" />
- <Compile Include="IMapStatusBar.cs" />
- <Compile Include="IPropertyPane.cs" />
- <Compile Include="MgBufferComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgBufferControlImpl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="MgBufferControlImpl.Designer.cs">
- <DependentUpon>MgBufferControlImpl.cs</DependentUpon>
- </Compile>
- <Compile Include="MgComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgControlImpl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="MgDefaultToolbar.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgGenericInvokeComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgInvokeComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgLayerSelectionHandler.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgLegendControlPresenter.cs" />
- <Compile Include="MgLineMeasureControlImpl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="MgLineMeasureControlImpl.Designer.cs">
- <DependentUpon>MgLineMeasureControlImpl.cs</DependentUpon>
- </Compile>
- <Compile Include="MgLoadMapComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgLoadPackageComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgMapViewer.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MapViewerController.cs" />
- <Compile Include="MgLegend.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="MgLegend.Designer.cs">
- <DependentUpon>MgLegend.cs</DependentUpon>
- </Compile>
- <Compile Include="MgMapViewerProvider.cs" />
- <Compile Include="MgMeasureComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgPrintComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgPrintControlImpl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="MgPrintControlImpl.Designer.cs">
- <DependentUpon>MgPrintControlImpl.cs</DependentUpon>
- </Compile>
- <Compile Include="MgPropertyPane.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="MgPropertyPane.Designer.cs">
- <DependentUpon>MgPropertyPane.cs</DependentUpon>
- </Compile>
- <Compile Include="MgQueryComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgQueryControlImpl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="MgQueryControlImpl.Designer.cs">
- <DependentUpon>MgQueryControlImpl.cs</DependentUpon>
- </Compile>
- <Compile Include="MgQueryResultsDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="MgQueryResultsDialog.Designer.cs">
- <DependentUpon>MgQueryResultsDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="MgReadOnlyStream.cs" />
- <Compile Include="MgRedlineComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgRedlineComponent.Designer.cs">
- <DependentUpon>MgRedlineComponent.cs</DependentUpon>
- </Compile>
- <Compile Include="MgRedlineControlImpl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="MgRedlineControlImpl.Designer.cs">
- <DependentUpon>MgRedlineControlImpl.cs</DependentUpon>
- </Compile>
- <Compile Include="MgSearchComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgSearchControlImpl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="MgSearchControlImpl.Designer.cs">
- <DependentUpon>MgSearchControlImpl.cs</DependentUpon>
- </Compile>
- <Compile Include="MgTaskPane.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="MgTaskPane.Designer.cs">
- <DependentUpon>MgTaskPane.cs</DependentUpon>
- </Compile>
- <Compile Include="MgThemeComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgThemeControlImpl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="MgThemeControlImpl.Designer.cs">
- <DependentUpon>MgThemeControlImpl.cs</DependentUpon>
- </Compile>
- <Compile Include="MgTransientMapState.cs" />
- <Compile Include="MgViewerOptionsComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgViewerOptionsControlImpl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="MgViewerOptionsControlImpl.Designer.cs">
- <DependentUpon>MgViewerOptionsControlImpl.cs</DependentUpon>
- </Compile>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <Compile Include="Redlining\NewRedlineLayerDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Redlining\NewRedlineLayerDialog.Designer.cs">
- <DependentUpon>NewRedlineLayerDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Redlining\RedlineEditingCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Redlining\RedlineEditingCtrl.Designer.cs">
- <DependentUpon>RedlineEditingCtrl.cs</DependentUpon>
- </Compile>
- <Compile Include="Redlining\RedlineEditor.cs" />
- <Compile Include="Redlining\RedlineMainCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Redlining\RedlineMainCtrl.Designer.cs">
- <DependentUpon>RedlineMainCtrl.cs</DependentUpon>
- </Compile>
- <Compile Include="Redlining\RedlineManager.cs" />
- <Compile Include="Redlining\RedlineRegistry.cs" />
- <Compile Include="Redlining\RedlineSchemaFactory.cs" />
- <Compile Include="Redlining\RedlineStyleDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Redlining\RedlineStyleDialog.Designer.cs">
- <DependentUpon>RedlineStyleDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Redlining\TextPrompt.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Redlining\TextPrompt.Designer.cs">
- <DependentUpon>TextPrompt.cs</DependentUpon>
- </Compile>
- <Compile Include="Strings.Designer.cs" />
- <Compile Include="Tasks\MgTaskPaneStub.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Tasks\MgTaskPaneStub.Designer.cs">
- <DependentUpon>MgTaskPaneStub.cs</DependentUpon>
- </Compile>
- <Compile Include="Util.cs" />
- <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="AppLayoutEngine\Shell.resx">
- <DependentUpon>Shell.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Debug.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Debug.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- <EmbeddedResource Include="MgBufferControlImpl.resx">
- <DependentUpon>MgBufferControlImpl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="MgLegend.resx">
- <DependentUpon>MgLegend.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="MgLineMeasureControlImpl.resx">
- <DependentUpon>MgLineMeasureControlImpl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="MgPrintControlImpl.resx">
- <DependentUpon>MgPrintControlImpl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="MgPropertyPane.resx">
- <DependentUpon>MgPropertyPane.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="MgQueryControlImpl.resx">
- <DependentUpon>MgQueryControlImpl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="MgQueryResultsDialog.resx">
- <DependentUpon>MgQueryResultsDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="MgRedlineControlImpl.resx">
- <DependentUpon>MgRedlineControlImpl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="MgSearchControlImpl.resx">
- <DependentUpon>MgSearchControlImpl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="MgTaskPane.resx">
- <DependentUpon>MgTaskPane.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="MgThemeControlImpl.resx">
- <DependentUpon>MgThemeControlImpl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="MgViewerOptionsControlImpl.resx">
- <DependentUpon>MgViewerOptionsControlImpl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- <EmbeddedResource Include="Redlining\NewRedlineLayerDialog.resx">
- <DependentUpon>NewRedlineLayerDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Redlining\RedlineEditingCtrl.resx">
- <DependentUpon>RedlineEditingCtrl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Redlining\RedlineMainCtrl.resx">
- <DependentUpon>RedlineMainCtrl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Redlining\RedlineStyleDialog.resx">
- <DependentUpon>RedlineStyleDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Redlining\TextPrompt.resx">
- <DependentUpon>TextPrompt.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Strings.resx" />
- <EmbeddedResource Include="Tasks\MgTaskPaneStub.resx">
- <DependentUpon>MgTaskPaneStub.cs</DependentUpon>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\lc_broken.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\lc_dwf.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\lc_group.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\lc_raster.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\lc_select.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\lc_theme.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\lc_unselect.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\DebugLayer.txt" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\zoomin.cur" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\grab.cur" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_zoomselect.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\zoomout.cur" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\control.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\control-180.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_loading.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_pan.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_select.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\layer-shape.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\layer-shape-ellipse.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\layer-shape-line.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\layer-shape-polygon.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\layer-shape-polyline.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\layer-small.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\PoweredBy_en.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\ui-tooltip-balloon-bottom.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\buffer.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\select-clear.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\select-features.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\select-polygon.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\select-radius.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\select-zoom.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\view-refresh.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\zoom-in-fixed.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\measure.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\zoom-out-fixed.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\zoom-full.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\edit-copy.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\about.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\edit-cut.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\edit-duplicate.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\edit-paste.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\edit-xml.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\error.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\file-print.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\file-save.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\help.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\iconNavigator.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\info.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\initial-center.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\invoke-script.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\invoke-url.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\options.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\overview-map.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\preview.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\print.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\search.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\select-centre.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\view-back.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\view-forward.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\zoom-dynamic.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\zoom-in.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_etc.png" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\AreaLayerDef.txt" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Resources\icon_home.gif" />
- <Content Include="Resources\icon_tasks.gif" />
- <Content Include="Resources\load_package.gif" />
- <Content Include="Resources\monitor_status.gif" />
- <Content Include="Resources\view_log.gif" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\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
Modified: branches/2.6/MgDev/Desktop/MapViewer/MapViewer.csproj
===================================================================
--- branches/2.6/MgDev/Desktop/MapViewer/MapViewer.csproj 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MapViewer/MapViewer.csproj 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,11 +10,32 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OSGeo.MapGuide.Viewer</RootNamespace>
<AssemblyName>OSGeo.MapGuide.Viewer</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -24,6 +45,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -34,6 +56,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\OSGeo.MapGuide.Viewer.XML</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="OSGeo.MapGuide.Foundation, Version=1.0.0.1, Culture=neutral, processorArchitecture=x86">
@@ -53,9 +76,7 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
- <Reference Include="System.Design" />
<Reference Include="System.Drawing" />
- <Reference Include="System.Messaging" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
@@ -84,10 +105,6 @@
<Compile Include="IMapViewerComponent.cs" />
<Compile Include="IMapStatusBar.cs" />
<Compile Include="IPropertyPane.cs" />
- <Compile Include="MgLegendControlPresenter.cs" />
- <Compile Include="MgComponent.cs">
- <SubType>Component</SubType>
- </Compile>
<Compile Include="MgBufferComponent.cs">
<SubType>Component</SubType>
</Compile>
@@ -97,6 +114,9 @@
<Compile Include="MgBufferControlImpl.Designer.cs">
<DependentUpon>MgBufferControlImpl.cs</DependentUpon>
</Compile>
+ <Compile Include="MgComponent.cs">
+ <SubType>Component</SubType>
+ </Compile>
<Compile Include="MgControlImpl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -109,16 +129,20 @@
<Compile Include="MgInvokeComponent.cs">
<SubType>Component</SubType>
</Compile>
+ <Compile Include="MgLayerSelectionHandler.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="MgLegendControlPresenter.cs" />
<Compile Include="MgLineMeasureControlImpl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="MgLineMeasureControlImpl.Designer.cs">
<DependentUpon>MgLineMeasureControlImpl.cs</DependentUpon>
</Compile>
- <Compile Include="MgLoadPackageComponent.cs">
+ <Compile Include="MgLoadMapComponent.cs">
<SubType>Component</SubType>
</Compile>
- <Compile Include="MgLoadMapComponent.cs">
+ <Compile Include="MgLoadPackageComponent.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="MgMapViewer.cs">
@@ -166,9 +190,6 @@
<DependentUpon>MgQueryResultsDialog.cs</DependentUpon>
</Compile>
<Compile Include="MgReadOnlyStream.cs" />
- <Compile Include="MgLayerSelectionHandler.cs">
- <SubType>Component</SubType>
- </Compile>
<Compile Include="MgRedlineComponent.cs">
<SubType>Component</SubType>
</Compile>
@@ -255,11 +276,7 @@
<Compile Include="Redlining\TextPrompt.Designer.cs">
<DependentUpon>TextPrompt.cs</DependentUpon>
</Compile>
- <Compile Include="Strings.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Strings.resx</DependentUpon>
- </Compile>
+ <Compile Include="Strings.Designer.cs" />
<Compile Include="Tasks\MgTaskPaneStub.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -280,9 +297,6 @@
<EmbeddedResource Include="MgBufferControlImpl.resx">
<DependentUpon>MgBufferControlImpl.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="MgControlImpl.resx">
- <DependentUpon>MgControlImpl.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="MgLegend.resx">
<DependentUpon>MgLegend.cs</DependentUpon>
</EmbeddedResource>
@@ -335,10 +349,7 @@
<EmbeddedResource Include="Redlining\TextPrompt.resx">
<DependentUpon>TextPrompt.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Strings.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Strings.Designer.cs</LastGenOutput>
- </EmbeddedResource>
+ <EmbeddedResource Include="Strings.resx" />
<EmbeddedResource Include="Tasks\MgTaskPaneStub.resx">
<DependentUpon>MgTaskPaneStub.cs</DependentUpon>
</EmbeddedResource>
@@ -530,45 +541,32 @@
<None Include="Resources\icon_etc.png" />
</ItemGroup>
<ItemGroup>
- <Content Include="Resources\AreaLayerDef.txt" />
- <None Include="Resources\area_box.templ" />
- <None Include="Resources\area_cross.templ" />
- <None Include="Resources\area_dash.templ" />
- <None Include="Resources\area_dolmit.templ" />
- <None Include="Resources\area_hex.templ" />
- <None Include="Resources\area_line.templ" />
- <None Include="Resources\area_line_135.templ" />
- <None Include="Resources\area_line_45.templ" />
- <None Include="Resources\area_line_90.templ" />
- <None Include="Resources\area_net.templ" />
- <None Include="Resources\area_sacncr.templ" />
- <None Include="Resources\area_solid.templ" />
- <None Include="Resources\area_square.templ" />
- <None Include="Resources\area_steel.templ" />
- <None Include="Resources\line_border.templ" />
- <None Include="Resources\line_dash.templ" />
- <None Include="Resources\markuplayerdefinition_advanced.xml" />
- <None Include="Resources\markuplayerdefinition.xml" />
- <None Include="Resources\markupfeaturesource.xml" />
- <None Include="Resources\line_dashdot.templ" />
- <None Include="Resources\line_dashdotdot.templ" />
- <None Include="Resources\line_divide.templ" />
- <None Include="Resources\line_dot.templ" />
- <None Include="Resources\line_fenceline1.templ" />
- <None Include="Resources\line_rail.templ" />
- <None Include="Resources\line_solid.templ" />
- <None Include="Resources\redline.png" />
- <None Include="Resources\map--minus.png" />
- <None Include="Resources\map--plus.png" />
- <None Include="Resources\cross-script.png" />
- <None Include="Resources\plus.png" />
- <None Include="Resources\AreaRuleTemplate.txt" />
- <None Include="Resources\view_log.gif" />
- <None Include="Resources\monitor_status.gif" />
- <None Include="Resources\load_package.gif" />
- <None Include="Resources\icon_home.gif" />
- <None Include="Resources\icon_tasks.gif" />
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <None Include="Resources\AreaLayerDef.txt" />
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="Resources\icon_home.gif" />
+ <Content Include="Resources\icon_tasks.gif" />
+ <Content Include="Resources\load_package.gif" />
+ <Content Include="Resources\monitor_status.gif" />
+ <Content Include="Resources\view_log.gif" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\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.
Modified: branches/2.6/MgDev/Desktop/MapViewer/Properties/Resources.Designer.cs
===================================================================
--- branches/2.6/MgDev/Desktop/MapViewer/Properties/Resources.Designer.cs 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MapViewer/Properties/Resources.Designer.cs 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -148,6 +148,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap cross_script {
get {
object obj = ResourceManager.GetObject("cross-script", resourceCulture);
@@ -515,6 +518,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap map__minus {
get {
object obj = ResourceManager.GetObject("map--minus", resourceCulture);
@@ -522,6 +528,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap map__plus {
get {
object obj = ResourceManager.GetObject("map--plus", resourceCulture);
@@ -569,6 +578,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap plus {
get {
object obj = ResourceManager.GetObject("plus", resourceCulture);
@@ -606,6 +618,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap redline {
get {
object obj = ResourceManager.GetObject("redline", resourceCulture);
Deleted: branches/2.6/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.Net40.csproj
===================================================================
--- branches/2.6/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.Net40.csproj 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.Net40.csproj 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{E2001B46-F226-4F7B-911E-252B9644236E}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>OSGeo.MapGuide.Viewer.Desktop</RootNamespace>
- <AssemblyName>OSGeo.MapGuide.Viewer.Desktop</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=AMD64">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Desktop.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Foundation.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Geometry.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="MgDesktopMapViewerProvider.cs" />
- <Compile Include="MgdTransientMapState.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Strings.Designer.cs" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\MapViewer\MapViewer.Net40.csproj">
- <Project>{D46ED17B-329B-4D80-9181-FEF8307EFCBB}</Project>
- <Name>MapViewer.Net40</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Strings.resx" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\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
Modified: branches/2.6/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.csproj
===================================================================
--- branches/2.6/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.csproj 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.csproj 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,8 +10,29 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OSGeo.MapGuide.Viewer.Desktop</RootNamespace>
<AssemblyName>OSGeo.MapGuide.Viewer.Desktop</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +42,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -29,6 +51,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=AMD64">
@@ -59,23 +82,33 @@
<Compile Include="MgDesktopMapViewerProvider.cs" />
<Compile Include="MgdTransientMapState.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Strings.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Strings.resx</DependentUpon>
- </Compile>
+ <Compile Include="Strings.Designer.cs" />
</ItemGroup>
<ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
<ProjectReference Include="..\MapViewer\MapViewer.csproj">
<Project>{D46ED17B-329B-4D80-9181-FEF8307EFCBB}</Project>
- <Name>MapViewer</Name>
+ <Name>MapViewer.Net40</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Strings.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Strings.Designer.cs</LastGenOutput>
- </EmbeddedResource>
+ <EmbeddedResource Include="Strings.resx" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Deleted: branches/2.6/MgDev/Desktop/MapViewerTest/MapViewerTest.Net40.csproj
===================================================================
--- branches/2.6/MgDev/Desktop/MapViewerTest/MapViewerTest.Net40.csproj 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MapViewerTest/MapViewerTest.Net40.csproj 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{E2FC8B99-0638-4C01-86C4-1B625D966981}</ProjectGuid>
- <OutputType>WinExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>MapViewerTest</RootNamespace>
- <AssemblyName>MapViewerTest</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>..\bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>..\bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <ErrorReport>prompt</ErrorReport>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>..\bin\Debug64\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
- <OutputPath>..\bin\Release64\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <ErrorReport>prompt</ErrorReport>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=AMD64">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Desktop.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Foundation.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Geometry.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Deployment" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="CompactViewer.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="CompactViewer.Designer.cs">
- <DependentUpon>CompactViewer.cs</DependentUpon>
- </Compile>
- <Compile Include="MgAppWindow.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="MgAppWindow.Designer.cs">
- <DependentUpon>MgAppWindow.cs</DependentUpon>
- </Compile>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <EmbeddedResource Include="CompactViewer.resx">
- <DependentUpon>CompactViewer.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="MgAppWindow.resx">
- <DependentUpon>MgAppWindow.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="ResourceIdDialog.resx">
- <DependentUpon>ResourceIdDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="XmlResponseDialog.resx">
- <DependentUpon>XmlResponseDialog.cs</DependentUpon>
- </EmbeddedResource>
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DependentUpon>Resources.resx</DependentUpon>
- <DesignTime>True</DesignTime>
- </Compile>
- <None Include="app.config" />
- <None Include="Properties\Settings.settings">
- <Generator>SettingsSingleFileGenerator</Generator>
- <LastGenOutput>Settings.Designer.cs</LastGenOutput>
- </None>
- <Compile Include="Properties\Settings.Designer.cs">
- <AutoGen>True</AutoGen>
- <DependentUpon>Settings.settings</DependentUpon>
- <DesignTimeSharedInput>True</DesignTimeSharedInput>
- </Compile>
- <Compile Include="ResourceIdDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="ResourceIdDialog.Designer.cs">
- <DependentUpon>ResourceIdDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="XmlResponseDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="XmlResponseDialog.Designer.cs">
- <DependentUpon>XmlResponseDialog.cs</DependentUpon>
- </Compile>
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_refreshmap.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_pan.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_refreshmap1.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_zoomin.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_zoomout.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_fitwindow.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_loading.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_clearselect.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_select.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\PoweredBy_en.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\layer-shape.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\layer-shape-ellipse.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\layer-shape-line.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\layer-shape-polygon.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\layer-shape-polyline.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\layer-small.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\DebugLayer.txt" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\ui-tooltip-balloon-bottom.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\lc_dwf.gif" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\MapViewer.Desktop\MapViewer.Desktop.Net40.csproj">
- <Project>{E2001B46-F226-4F7B-911E-252B9644236E}</Project>
- <Name>MapViewer.Desktop.Net40</Name>
- </ProjectReference>
- <ProjectReference Include="..\MapViewer\MapViewer.Net40.csproj">
- <Project>{D46ED17B-329B-4D80-9181-FEF8307EFCBB}</Project>
- <Name>MapViewer.Net40</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Content Include="Resources\icon_home.gif" />
- <Content Include="Resources\icon_tasks.gif" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\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
Modified: branches/2.6/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj
===================================================================
--- branches/2.6/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,8 +10,29 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MapViewerTest</RootNamespace>
<AssemblyName>MapViewerTest</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -20,6 +41,7 @@
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\bin\Release\</OutputPath>
@@ -29,6 +51,7 @@
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
@@ -37,6 +60,7 @@
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>..\bin\Release64\</OutputPath>
@@ -46,6 +70,7 @@
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=AMD64">
@@ -112,6 +137,7 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
+ <None Include="app.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -135,16 +161,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\MapViewer.Desktop\MapViewer.Desktop.csproj">
- <Project>{E2001B46-F226-4F7B-911E-252B9644236E}</Project>
- <Name>MapViewer.Desktop</Name>
- </ProjectReference>
- <ProjectReference Include="..\MapViewer\MapViewer.csproj">
- <Project>{D46ED17B-329B-4D80-9181-FEF8307EFCBB}</Project>
- <Name>MapViewer</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<None Include="Resources\icon_refreshmap.gif" />
</ItemGroup>
<ItemGroup>
@@ -202,13 +218,35 @@
<None Include="Resources\lc_dwf.gif" />
</ItemGroup>
<ItemGroup>
- <None Include="Resources\icon_home.gif" />
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <None Include="Resources\icon_tasks.gif" />
+ <ProjectReference Include="..\MapViewer.Desktop\MapViewer.Desktop.csproj">
+ <Project>{E2001B46-F226-4F7B-911E-252B9644236E}</Project>
+ <Name>MapViewer.Desktop.Net40</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\MapViewer\MapViewer.csproj">
+ <Project>{D46ED17B-329B-4D80-9181-FEF8307EFCBB}</Project>
+ <Name>MapViewer.Net40</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
- <None Include="Resources\map--arrow.png" />
+ <Content Include="Resources\icon_home.gif" />
+ <Content Include="Resources\icon_tasks.gif" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Deleted: branches/2.6/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj.user
===================================================================
--- branches/2.6/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj.user 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj.user 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,10 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <StartArguments>Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition</StartArguments>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
- <StartArguments>Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition</StartArguments>
- <EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Modified: branches/2.6/MgDev/Desktop/MapViewerTest/Properties/Resources.Designer.cs
===================================================================
--- branches/2.6/MgDev/Desktop/MapViewerTest/Properties/Resources.Designer.cs 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MapViewerTest/Properties/Resources.Designer.cs 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: branches/2.6/MgDev/Desktop/MapViewerTest/Properties/Settings.Designer.cs
===================================================================
--- branches/2.6/MgDev/Desktop/MapViewerTest/Properties/Settings.Designer.cs 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MapViewerTest/Properties/Settings.Designer.cs 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: branches/2.6/MgDev/Desktop/MapViewerTest/app.config
===================================================================
--- branches/2.6/MgDev/Desktop/MapViewerTest/app.config 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MapViewerTest/app.config 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
</startup>
</configuration>
Deleted: branches/2.6/MgDev/Desktop/MgAppLayout/MgAppLayout.Net40.csproj
===================================================================
--- branches/2.6/MgDev/Desktop/MgAppLayout/MgAppLayout.Net40.csproj 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MgAppLayout/MgAppLayout.Net40.csproj 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
- <ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{F6054D81-E857-49FB-945F-AC2ECD9BB27A}</ProjectGuid>
- <OutputType>WinExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>MgAppLayout</RootNamespace>
- <AssemblyName>MgAppLayout</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <TargetFrameworkProfile>
- </TargetFrameworkProfile>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <PlatformTarget>x86</PlatformTarget>
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <PlatformTarget>x86</PlatformTarget>
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>..\bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x64\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- <Prefer32Bit>false</Prefer32Bit>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <OutputPath>..\bin\Release64\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- <Prefer32Bit>false</Prefer32Bit>
- <UseVSHostingProcess>false</UseVSHostingProcess>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop">
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Desktop.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\bin\Assemblies\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Deployment" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DependentUpon>Resources.resx</DependentUpon>
- <DesignTime>True</DesignTime>
- </Compile>
- <None Include="Properties\Settings.settings">
- <Generator>SettingsSingleFileGenerator</Generator>
- <LastGenOutput>Settings.Designer.cs</LastGenOutput>
- </None>
- <Compile Include="Properties\Settings.Designer.cs">
- <AutoGen>True</AutoGen>
- <DependentUpon>Settings.settings</DependentUpon>
- <DesignTimeSharedInput>True</DesignTimeSharedInput>
- </Compile>
- <None Include="Sheboygan.AppLayout">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- <SubType>Designer</SubType>
- </None>
- <None Include="SheboyganTiled.AppLayout">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\MapViewer.Desktop\MapViewer.Desktop.Net40.csproj">
- <Project>{E2001B46-F226-4F7B-911E-252B9644236E}</Project>
- <Name>MapViewer.Desktop.Net40</Name>
- </ProjectReference>
- <ProjectReference Include="..\MapViewer\MapViewer.Net40.csproj">
- <Project>{D46ED17B-329B-4D80-9181-FEF8307EFCBB}</Project>
- <Name>MapViewer.Net40</Name>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\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
Modified: branches/2.6/MgDev/Desktop/MgAppLayout/MgAppLayout.csproj
===================================================================
--- branches/2.6/MgDev/Desktop/MgAppLayout/MgAppLayout.csproj 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MgAppLayout/MgAppLayout.csproj 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,72 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{F7FCC5EB-FB46-41FE-AC4B-430DF52C4066}</ProjectGuid>
+ <ProjectGuid>{F6054D81-E857-49FB-945F-AC2ECD9BB27A}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MgAppLayout</RootNamespace>
<AssemblyName>MgAppLayout</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x64\Debug\</OutputPath>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
- <OutputPath>..\bin\Release64\</OutputPath>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>..\bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Debug\</OutputPath>
+ <OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
+ <PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+ <Prefer32Bit>false</Prefer32Bit>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>..\bin\Release\</OutputPath>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+ <OutputPath>..\bin\Release64\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
+ <PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+ <Prefer32Bit>false</Prefer32Bit>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="OSGeo.MapGuide.Desktop">
<HintPath>..\bin\Assemblies\OSGeo.MapGuide.Desktop.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="OSGeo.MapGuide.Foundation">
<HintPath>..\bin\Assemblies\OSGeo.MapGuide.Foundation.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="OSGeo.MapGuide.Geometry">
<HintPath>..\bin\Assemblies\OSGeo.MapGuide.Geometry.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="OSGeo.MapGuide.PlatformBase">
<HintPath>..\bin\Assemblies\OSGeo.MapGuide.PlatformBase.dll</HintPath>
</Reference>
<Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
@@ -84,31 +96,34 @@
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
+ <DesignTime>True</DesignTime>
</Compile>
- <None Include="SheboyganTiled.AppLayout">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
+ <None Include="app.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
- <None Include="Sheboygan.AppLayout">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
+ <None Include="Sheboygan.AppLayout">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="SheboyganTiled.AppLayout">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MapViewer.Desktop\MapViewer.Desktop.csproj">
<Project>{E2001B46-F226-4F7B-911E-252B9644236E}</Project>
- <Name>MapViewer.Desktop</Name>
+ <Name>MapViewer.Desktop.Net40</Name>
</ProjectReference>
<ProjectReference Include="..\MapViewer\MapViewer.csproj">
<Project>{D46ED17B-329B-4D80-9181-FEF8307EFCBB}</Project>
- <Name>MapViewer</Name>
+ <Name>MapViewer.Net40</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Modified: branches/2.6/MgDev/Desktop/MgAppLayout/Properties/Resources.Designer.cs
===================================================================
--- branches/2.6/MgDev/Desktop/MgAppLayout/Properties/Resources.Designer.cs 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MgAppLayout/Properties/Resources.Designer.cs 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: branches/2.6/MgDev/Desktop/MgAppLayout/Properties/Settings.Designer.cs
===================================================================
--- branches/2.6/MgDev/Desktop/MgAppLayout/Properties/Settings.Designer.cs 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MgAppLayout/Properties/Settings.Designer.cs 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: branches/2.6/MgDev/Desktop/MgDesktopDotNet.sln
===================================================================
--- branches/2.6/MgDev/Desktop/MgDesktopDotNet.sln 2014-07-04 11:38:43 UTC (rev 8282)
+++ branches/2.6/MgDev/Desktop/MgDesktopDotNet.sln 2014-07-04 11:53:43 UTC (rev 8283)
@@ -1,17 +1,17 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetHarness.Net40", "DotNetHarness\DotNetHarness.Net40.csproj", "{A5881D59-BD24-4A3A-A707-F18A25724D29}"
+# Visual Studio Express 2012 for Windows Desktop
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetHarness", "DotNetHarness\DotNetHarness.csproj", "{A5881D59-BD24-4A3A-A707-F18A25724D29}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetUnitTest.Net40", "DotNetUnitTest\DotNetUnitTest.Net40.csproj", "{FDA196F0-3C55-4360-B207-BA5EF6D746F8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetUnitTest", "DotNetUnitTest\DotNetUnitTest.csproj", "{FDA196F0-3C55-4360-B207-BA5EF6D746F8}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewer.Net40", "MapViewer\MapViewer.Net40.csproj", "{D46ED17B-329B-4D80-9181-FEF8307EFCBB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewer", "MapViewer\MapViewer.csproj", "{D46ED17B-329B-4D80-9181-FEF8307EFCBB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewer.Desktop.Net40", "MapViewer.Desktop\MapViewer.Desktop.Net40.csproj", "{E2001B46-F226-4F7B-911E-252B9644236E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewer.Desktop", "MapViewer.Desktop\MapViewer.Desktop.csproj", "{E2001B46-F226-4F7B-911E-252B9644236E}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewerTest.Net40", "MapViewerTest\MapViewerTest.Net40.csproj", "{E2FC8B99-0638-4C01-86C4-1B625D966981}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewerTest", "MapViewerTest\MapViewerTest.csproj", "{E2FC8B99-0638-4C01-86C4-1B625D966981}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MgAppLayout.Net40", "MgAppLayout\MgAppLayout.Net40.csproj", "{F6054D81-E857-49FB-945F-AC2ECD9BB27A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MgAppLayout", "MgAppLayout\MgAppLayout.csproj", "{F6054D81-E857-49FB-945F-AC2ECD9BB27A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
More information about the mapguide-commits
mailing list