[mapguide-commits] r8293 - in trunk/MgDev: . Desktop Desktop/DesktopUnmanagedApi/DotNet Desktop/DesktopUnmanagedApi/JavaApiEx Desktop/DotNetHarness Desktop/DotNetHarness/Properties Desktop/DotNetUnitTest Desktop/MapViewer Desktop/MapViewer/Properties Desktop/MapViewer.Desktop Desktop/MapViewerTest Desktop/MapViewerTest/Properties Desktop/MgAppLayout Desktop/MgAppLayout/Properties Desktop/MgDesktop Desktop/MgDesktop/MapLayer Desktop/MgDesktop/Services Desktop/MgDesktop/Services/Feature/Commands Desktop/Samples Desktop/Samples/AdvancedSample Desktop/Samples/AdvancedSample/Properties Desktop/Samples/BasicSample Desktop/Samples/BasicSample/Properties Desktop/Samples/FreeFormExample Desktop/Samples/FreeFormExample/Properties Desktop/Samples/SampleExtension nuget nuget/MapGuideNuget/.nuget nuget/MapGuideNuget/CoordSysEnumTest nuget/MapGuideNuget/CoordSysEnumTest64 nuget/MapGuideNuget/DesktopConsoleTest nuget/MapGuideNuget/DesktopConsoleTest64 nuget/MapGuideNuget/DesktopViewerTest nuget/MapGu ideNuget/DesktopViewerTest64 nuget/MapGuideNuget/MapGuideNuget nuget/MapGuideNuget/MapGuideNuget64
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Jul 9 05:41:48 PDT 2014
Author: jng
Date: 2014-07-09 05:41:48 -0700 (Wed, 09 Jul 2014)
New Revision: 8293
Added:
trunk/MgDev/Desktop/MgAppLayout/app.config
trunk/MgDev/nuget/mg-desktop-viewer.nuspec.tpl
trunk/MgDev/nuget/mg-desktop.nuspec.tpl
Removed:
trunk/MgDev/Desktop/DotNetHarness/DotNetHarness.Net40.csproj
trunk/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.Net40.csproj
trunk/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.Net40.csproj
trunk/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj
trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.Net40.csproj
trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj.user
trunk/MgDev/Desktop/MgAppLayout/MgAppLayout.Net40.csproj
trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.Net40.csproj
trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.Nuget.Net40.csproj
trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.Net40.csproj
trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.Nuget.Net40.csproj
trunk/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.Net40.csproj
trunk/MgDev/Desktop/Samples/MgDesktopSamples_VS2010.sln
trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.Net40.csproj
trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.Nuget.Net40.csproj
trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/packages.config
trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/packages.config
trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/packages.config
trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/packages.config
trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest/packages.config
trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/packages.config
trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget/packages.config
trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64/packages.config
trunk/MgDev/nuget/mg-desktop-net40.nuspec.tpl
trunk/MgDev/nuget/mg-desktop-viewer-net40.nuspec.tpl
Modified:
trunk/MgDev/
trunk/MgDev/Desktop/
trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/
trunk/MgDev/Desktop/DotNetHarness/DotNetHarness.csproj
trunk/MgDev/Desktop/DotNetHarness/Properties/Resources.Designer.cs
trunk/MgDev/Desktop/DotNetHarness/Properties/Settings.Designer.cs
trunk/MgDev/Desktop/DotNetHarness/app.config
trunk/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.csproj
trunk/MgDev/Desktop/DotNetUnitTest/app.config
trunk/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.csproj
trunk/MgDev/Desktop/MapViewer/Debug.Designer.cs
trunk/MgDev/Desktop/MapViewer/MapViewer.csproj
trunk/MgDev/Desktop/MapViewer/Properties/Resources.Designer.cs
trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj
trunk/MgDev/Desktop/MapViewerTest/Properties/Resources.Designer.cs
trunk/MgDev/Desktop/MapViewerTest/Properties/Settings.Designer.cs
trunk/MgDev/Desktop/MapViewerTest/app.config
trunk/MgDev/Desktop/MgAppLayout/MgAppLayout.csproj
trunk/MgDev/Desktop/MgAppLayout/Properties/Resources.Designer.cs
trunk/MgDev/Desktop/MgAppLayout/Properties/Settings.Designer.cs
trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.h
trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj
trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj.filters
trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.h
trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp
trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.h
trunk/MgDev/Desktop/MgDesktopApi.sln
trunk/MgDev/Desktop/MgDesktopDotNet.sln
trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.csproj
trunk/MgDev/Desktop/Samples/AdvancedSample/Properties/Resources.Designer.cs
trunk/MgDev/Desktop/Samples/AdvancedSample/Properties/Settings.Designer.cs
trunk/MgDev/Desktop/Samples/AdvancedSample/app.config
trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.csproj
trunk/MgDev/Desktop/Samples/BasicSample/Properties/Resources.Designer.cs
trunk/MgDev/Desktop/Samples/BasicSample/Properties/Settings.Designer.cs
trunk/MgDev/Desktop/Samples/BasicSample/app.config
trunk/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.csproj
trunk/MgDev/Desktop/Samples/FreeFormExample/Properties/Resources.Designer.cs
trunk/MgDev/Desktop/Samples/FreeFormExample/Properties/Settings.Designer.cs
trunk/MgDev/Desktop/Samples/FreeFormExample/app.config
trunk/MgDev/Desktop/Samples/MgDesktopSamples.sln
trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.csproj
trunk/MgDev/Desktop/Samples/samples_readme.txt
trunk/MgDev/nuget/MapGuideNuget/.nuget/NuGet.exe
trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/CoordSysEnumTest.csproj
trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/CoordSysEnumTest.csproj
trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/DesktopConsoleTest.csproj
trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/DesktopConsoleTest.csproj
trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest/DesktopViewerTest.csproj
trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/DesktopViewerTest.csproj
trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget/MapGuideNuget.csproj
trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64/MapGuideNuget.csproj
trunk/MgDev/nuget/NuGet.exe
trunk/MgDev/nuget/api-desktop-readme.txt
trunk/MgDev/nuget/api-desktop-viewer-readme.txt
trunk/MgDev/nuget/cs-map-dict-readme.txt
trunk/MgDev/nuget/mapguide-api-base.nuspec.tpl
trunk/MgDev/nuget/mapguide-api-web.nuspec.tpl
trunk/MgDev/nuget_pack.bat
trunk/MgDev/nuget_prepare.bat
trunk/MgDev/run_tests.bat
Log:
Merged revision(s) 8276-8286 from branches/2.6/MgDev:
Update mg-desktop sample projects to match the new expected .net version (4.5) for mg-desktop in 2.6
........
Update mg-desktop samples readme
........
mg-desktop cleanups:
- Add missing Security project to solution
- Change int to INT32 in various public APIs
........
Update nuget test solution. The solution and its projects should be in a clean slate.
........
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
........
Fix missing app.config probably inadvertently deleted in a previous submission
........
NuGet package updates:
- Remove the net40 designation from the mg-desktop packages.
- Update nuget.exe to latest version.
- Update package readmes.
- Specify supported .net versions in the package description.
........
Update nuget package titles
........
Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212,8214,8217,8220-8221,8223-8225
/sandbox/rfc94:5099-5163
+ /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212,8214,8217,8220-8221,8223-8225
/sandbox/rfc94:5099-5163
Property changes on: trunk/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
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Desktop:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006,7152
/branches/2.5/MgDev/Desktop:7511
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/rfc94/Desktop:5099-5163
+ /branches/2.4/MgDev/Desktop:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006,7152
/branches/2.5/MgDev/Desktop:7511
/branches/2.6/MgDev/Desktop:8276-8286
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/rfc94/Desktop:5099-5163
Property changes on: trunk/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: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx
___________________________________________________________________
Added: svn:ignore
+ MapGuideApi.i
MapGuideApi_Doc.i
MgApi_wrap.cpp
language.i
Deleted: trunk/MgDev/Desktop/DotNetHarness/DotNetHarness.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/DotNetHarness/DotNetHarness.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/DotNetHarness/DotNetHarness.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/DotNetHarness/DotNetHarness.csproj
===================================================================
--- trunk/MgDev/Desktop/DotNetHarness/DotNetHarness.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/DotNetHarness/DotNetHarness.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/DotNetHarness/Properties/Resources.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/DotNetHarness/Properties/Resources.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/DotNetHarness/Properties/Resources.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/DotNetHarness/Properties/Settings.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/DotNetHarness/Properties/Settings.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/DotNetHarness/Properties/Settings.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/DotNetHarness/app.config
===================================================================
--- trunk/MgDev/Desktop/DotNetHarness/app.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/DotNetHarness/app.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.csproj
===================================================================
--- trunk/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/DotNetUnitTest/DotNetUnitTest.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/DotNetUnitTest/app.config
===================================================================
--- trunk/MgDev/Desktop/DotNetUnitTest/app.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/DotNetUnitTest/app.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MapViewer/Debug.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/MapViewer/Debug.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MapViewer/Debug.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MapViewer/MapViewer.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MapViewer/MapViewer.csproj
===================================================================
--- trunk/MgDev/Desktop/MapViewer/MapViewer.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MapViewer/MapViewer.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MapViewer/Properties/Resources.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/MapViewer/Properties/Resources.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MapViewer/Properties/Resources.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.csproj
===================================================================
--- trunk/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MapViewer.Desktop/MapViewer.Desktop.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj
===================================================================
--- trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj.user
===================================================================
--- trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj.user 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MapViewerTest/MapViewerTest.csproj.user 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MapViewerTest/Properties/Resources.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/MapViewerTest/Properties/Resources.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MapViewerTest/Properties/Resources.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MapViewerTest/Properties/Settings.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/MapViewerTest/Properties/Settings.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MapViewerTest/Properties/Settings.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MapViewerTest/app.config
===================================================================
--- trunk/MgDev/Desktop/MapViewerTest/app.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MapViewerTest/app.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MgAppLayout/MgAppLayout.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/MgAppLayout/MgAppLayout.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgAppLayout/MgAppLayout.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MgAppLayout/MgAppLayout.csproj
===================================================================
--- trunk/MgDev/Desktop/MgAppLayout/MgAppLayout.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgAppLayout/MgAppLayout.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MgAppLayout/Properties/Resources.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/MgAppLayout/Properties/Resources.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgAppLayout/Properties/Resources.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/MgAppLayout/Properties/Settings.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/MgAppLayout/Properties/Settings.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgAppLayout/Properties/Settings.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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.
Copied: trunk/MgDev/Desktop/MgAppLayout/app.config (from rev 8286, branches/2.6/MgDev/Desktop/MgAppLayout/app.config)
===================================================================
--- trunk/MgDev/Desktop/MgAppLayout/app.config (rev 0)
+++ trunk/MgDev/Desktop/MgAppLayout/app.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
Modified: trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.h 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.h 2014-07-09 12:41:48 UTC (rev 8293)
@@ -29,15 +29,15 @@
virtual MgFeatureReader* InsertFeatures(MgPropertyCollection* propertyValues);
- virtual int UpdateFeatures(MgPropertyCollection* propertyValues, CREFSTRING filter);
+ virtual INT32 UpdateFeatures(MgPropertyCollection* propertyValues, CREFSTRING filter);
- virtual int DeleteFeatures(CREFSTRING filter);
+ virtual INT32 DeleteFeatures(CREFSTRING filter);
virtual MgFeatureReader* InsertFeatures(MgPropertyCollection* propertyValues, MgTransaction* trans);
- virtual int UpdateFeatures(MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
+ virtual INT32 UpdateFeatures(MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
- virtual int DeleteFeatures(CREFSTRING filter, MgTransaction* trans);
+ virtual INT32 DeleteFeatures(CREFSTRING filter, MgTransaction* trans);
virtual bool IsPotentiallyVisibleAtScale(double scale, bool bConsiderParentGroupVisibility);
Modified: trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1137,7 +1137,6 @@
<ClInclude Include="System\TimerUtil.h" />
</ItemGroup>
<ItemGroup>
- <None Include="..\braindump.txt" />
<None Include="Platform.ini" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj.filters
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj.filters 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj.filters 2014-07-09 12:41:48 UTC (rev 8293)
@@ -853,7 +853,6 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="..\braindump.txt" />
<None Include="Platform.ini" />
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp 2014-07-09 12:41:48 UTC (rev 8293)
@@ -387,9 +387,9 @@
return ret.Detach();
}
-int MgdUpdateFeaturesCommand::ExecuteUpdate(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans)
+INT32 MgdUpdateFeaturesCommand::ExecuteUpdate(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans)
{
- int updated = 0;
+ INT32 updated = 0;
MG_FEATURE_SERVICE_TRY()
@@ -444,9 +444,9 @@
return updated;
}
-int MgdUpdateFeaturesCommand::ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans)
+INT32 MgdUpdateFeaturesCommand::ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans)
{
- int deleted = 0;
+ INT32 deleted = 0;
MG_FEATURE_SERVICE_TRY()
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.h 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.h 2014-07-09 12:41:48 UTC (rev 8293)
@@ -40,22 +40,14 @@
MgFeatureCommandCollection* commands,
MgTransaction* transaction);
- MgFeatureReader* ExecuteInsert(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues);
-
MgFeatureReader* ExecuteInsert(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, MgTransaction* trans);
- MgPropertyCollection* ExecuteInsert(MgResourceIdentifier* resource, CREFSTRING className, MgBatchPropertyCollection* batchPropertyValues);
-
MgPropertyCollection* ExecuteInsert(MgResourceIdentifier* resource, CREFSTRING className, MgBatchPropertyCollection* batchPropertyValues, MgTransaction* trans);
- int ExecuteUpdate(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter);
+ INT32 ExecuteUpdate(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
- int ExecuteUpdate(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
+ INT32 ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
- int ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter);
-
- int ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
-
private:
void Connect(MgResourceIdentifier* resource, MgTransaction* transaction);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1143,9 +1143,9 @@
return ret.Detach();
}
-int MgdFeatureService::UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter)
+INT32 MgdFeatureService::UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter)
{
- int ret = 0;
+ INT32 ret = 0;
MG_LOG_OPERATION_MESSAGE(L"UpdateFeatures");
MG_FEATURE_SERVICE_TRY()
@@ -1186,9 +1186,9 @@
return ret;
}
-int MgdFeatureService::UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* batchPropertyValues, CREFSTRING filter, MgTransaction* trans)
+INT32 MgdFeatureService::UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* batchPropertyValues, CREFSTRING filter, MgTransaction* trans)
{
- int updated = 0;
+ INT32 updated = 0;
MG_LOG_OPERATION_MESSAGE(L"UpdateFeatures");
MG_FEATURE_SERVICE_TRY()
@@ -1233,9 +1233,9 @@
return updated;
}
-int MgdFeatureService::DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter)
+INT32 MgdFeatureService::DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter)
{
- int deleted = 0;
+ INT32 deleted = 0;
MG_LOG_OPERATION_MESSAGE(L"DeleteFeatures");
MG_FEATURE_SERVICE_TRY()
@@ -1275,9 +1275,9 @@
return deleted;
}
-int MgdFeatureService::DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans)
+INT32 MgdFeatureService::DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans)
{
- int deleted = 0;
+ INT32 deleted = 0;
MG_LOG_OPERATION_MESSAGE(L"DeleteFeatures");
MG_FEATURE_SERVICE_TRY()
Modified: trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.h 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgDesktop/Services/FeatureService.h 2014-07-09 12:41:48 UTC (rev 8293)
@@ -189,13 +189,13 @@
MgPropertyCollection* InsertFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgBatchPropertyCollection* batchPropertyValues, MgTransaction* trans);
- int UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter);
+ INT32 UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter);
- int UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
+ INT32 UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
- int DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter);
+ INT32 DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter);
- int DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
+ INT32 DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
EXTERNAL_API:
void PurgeCache(MgResourceIdentifier* resource);
Modified: trunk/MgDev/Desktop/MgDesktopApi.sln
===================================================================
--- trunk/MgDev/Desktop/MgDesktopApi.sln 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgDesktopApi.sln 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "..\Common\Foundation\Foundation.vcxproj", "{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "..\Common\Geometry\Geometry.vcxproj", "{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}"
@@ -49,6 +49,7 @@
{341D5463-186E-49BA-B942-3D3BE28D65C0} = {341D5463-186E-49BA-B942-3D3BE28D65C0}
{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425} = {A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}
{38161685-88ED-415E-A545-CCC17BE069AE} = {38161685-88ED-415E-A545-CCC17BE069AE}
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B} = {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}
{8F654896-85DC-4F32-99B2-670D66B0FBF1} = {8F654896-85DC-4F32-99B2-670D66B0FBF1}
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0} = {D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}
{DB2CC2E3-4754-4932-B865-424A44E58FD0} = {DB2CC2E3-4754-4932-B865-424A44E58FD0}
@@ -74,6 +75,8 @@
{C50254F2-654A-48DE-AF5B-20605AEF8D10} = {C50254F2-654A-48DE-AF5B-20605AEF8D10}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Security", "..\Common\Security\Security.vcxproj", "{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -257,6 +260,14 @@
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|Win32.Build.0 = Release|Win32
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.ActiveCfg = Release|x64
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.Build.0 = Release|x64
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Win32.Build.0 = Debug|Win32
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|x64.ActiveCfg = Debug|x64
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|x64.Build.0 = Debug|x64
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Win32.ActiveCfg = Release|Win32
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Win32.Build.0 = Release|Win32
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x64.ActiveCfg = Release|x64
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/MgDev/Desktop/MgDesktopDotNet.sln
===================================================================
--- trunk/MgDev/Desktop/MgDesktopDotNet.sln 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/MgDesktopDotNet.sln 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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
Deleted: trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <PlatformTarget>x86</PlatformTarget>
- <OutputPath>bin\x86\Debug\</OutputPath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <PlatformTarget>x86</PlatformTarget>
- <OutputPath>bin\x86\Release\</OutputPath>
- </PropertyGroup>
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}</ProjectGuid>
- <OutputType>WinExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>AdvancedSample</RootNamespace>
- <AssemblyName>AdvancedSample</AssemblyName>
- <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>
- <ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Desktop.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=2.4.0.6962, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Foundation.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=2.4.0.6962, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Geometry.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.4.0.6962, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Viewer.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer.Desktop, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Viewer.Desktop.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="MainForm.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="MainForm.Designer.cs">
- <DependentUpon>MainForm.cs</DependentUpon>
- </Compile>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <EmbeddedResource Include="MainForm.resx">
- <DependentUpon>MainForm.cs</DependentUpon>
- </EmbeddedResource>
- <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="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>
- </ItemGroup>
- <ItemGroup>
- <Content Include="RedlineLayer.xml">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- </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>
- -->
- <PropertyGroup>
- <PostBuildEvent>if not exist "$(TargetDir)FDO" md "$(TargetDir)FDO"
-xcopy /s /y "$(SolutionDir)Lib\FDO" "$(TargetDir)FDO"
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)Lib\Dictionaries" "$(TargetDir)Dictionaries"
-if not exist "$(TargetDir)Resources" md "$(TargetDir)Resources"
-xcopy /s /y "$(SolutionDir)Lib\Resources" "$(TargetDir)Resources"
-if not exist "$(TargetDir)Schema" md "$(TargetDir)Schema"
-xcopy /s /y "$(SolutionDir)Lib\Schema" "$(TargetDir)Schema"
-copy /y "$(SolutionDir)Lib\*.dll" "$(TargetDir)"
-copy /y "$(SolutionDir)Lib\Platform.ini" "$(TargetDir)"</PostBuildEvent>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Deleted: trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.Nuget.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.Nuget.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.Nuget.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <PlatformTarget>x86</PlatformTarget>
- <OutputPath>bin\x86\Debug\</OutputPath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <PlatformTarget>x86</PlatformTarget>
- <OutputPath>bin\x86\Release\</OutputPath>
- </PropertyGroup>
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}</ProjectGuid>
- <OutputType>WinExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>AdvancedSample</RootNamespace>
- <AssemblyName>AdvancedSample</AssemblyName>
- <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>
- <ItemGroup>
- <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="MainForm.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="MainForm.Designer.cs">
- <DependentUpon>MainForm.cs</DependentUpon>
- </Compile>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <EmbeddedResource Include="MainForm.resx">
- <DependentUpon>MainForm.cs</DependentUpon>
- </EmbeddedResource>
- <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="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>
- </ItemGroup>
- <ItemGroup>
- <Content Include="RedlineLayer.xml">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- </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>
- -->
- <PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Modified: trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,12 +1,14 @@
<?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 Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Debug\</OutputPath>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Release\</OutputPath>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -18,8 +20,30 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AdvancedSample</RootNamespace>
<AssemblyName>AdvancedSample</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkProfile>
+ </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>
<ItemGroup>
<Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
@@ -81,6 +105,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>
@@ -96,6 +121,23 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</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: trunk/MgDev/Desktop/Samples/AdvancedSample/Properties/Resources.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/Samples/AdvancedSample/Properties/Resources.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/AdvancedSample/Properties/Resources.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.269
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/MgDev/Desktop/Samples/AdvancedSample/Properties/Settings.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/Samples/AdvancedSample/Properties/Settings.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/AdvancedSample/Properties/Settings.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.269
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/MgDev/Desktop/Samples/AdvancedSample/app.config
===================================================================
--- trunk/MgDev/Desktop/Samples/AdvancedSample/app.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/AdvancedSample/app.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Deleted: trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <PlatformTarget>x86</PlatformTarget>
- <OutputPath>bin\x86\Debug\</OutputPath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <PlatformTarget>x86</PlatformTarget>
- <OutputPath>bin\x86\Release\</OutputPath>
- </PropertyGroup>
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{BE473CB6-718D-4654-9B0F-F1F9A327BD07}</ProjectGuid>
- <OutputType>WinExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>BasicSample</RootNamespace>
- <AssemblyName>BasicSample</AssemblyName>
- <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>
- <ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Desktop.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=2.4.0.6962, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Foundation.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=2.4.0.6962, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Geometry.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.4.0.6962, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Viewer.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer.Desktop, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Viewer.Desktop.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="MainForm.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="MainForm.Designer.cs">
- <DependentUpon>MainForm.cs</DependentUpon>
- </Compile>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <EmbeddedResource Include="MainForm.resx">
- <DependentUpon>MainForm.cs</DependentUpon>
- </EmbeddedResource>
- <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="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>
- </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>
- -->
- <PropertyGroup>
- <PostBuildEvent>if not exist "$(TargetDir)FDO" md "$(TargetDir)FDO"
-xcopy /s /y "$(SolutionDir)Lib\FDO" "$(TargetDir)FDO"
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)Lib\Dictionaries" "$(TargetDir)Dictionaries"
-if not exist "$(TargetDir)Resources" md "$(TargetDir)Resources"
-xcopy /s /y "$(SolutionDir)Lib\Resources" "$(TargetDir)Resources"
-if not exist "$(TargetDir)Schema" md "$(TargetDir)Schema"
-xcopy /s /y "$(SolutionDir)Lib\Schema" "$(TargetDir)Schema"
-copy /y "$(SolutionDir)Lib\*.dll" "$(TargetDir)"
-copy /y "$(SolutionDir)Lib\Platform.ini" "$(TargetDir)"</PostBuildEvent>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Deleted: trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.Nuget.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.Nuget.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.Nuget.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <PlatformTarget>x86</PlatformTarget>
- <OutputPath>bin\x86\Debug\</OutputPath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <PlatformTarget>x86</PlatformTarget>
- <OutputPath>bin\x86\Release\</OutputPath>
- </PropertyGroup>
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{BE473CB6-718D-4654-9B0F-F1F9A327BD07}</ProjectGuid>
- <OutputType>WinExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>BasicSample</RootNamespace>
- <AssemblyName>BasicSample</AssemblyName>
- <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>
- <ItemGroup>
- <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="MainForm.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="MainForm.Designer.cs">
- <DependentUpon>MainForm.cs</DependentUpon>
- </Compile>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <EmbeddedResource Include="MainForm.resx">
- <DependentUpon>MainForm.cs</DependentUpon>
- </EmbeddedResource>
- <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="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>
- </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>
- -->
- <PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Modified: trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,12 +1,14 @@
<?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 Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Debug\</OutputPath>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Release\</OutputPath>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -18,8 +20,30 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BasicSample</RootNamespace>
<AssemblyName>BasicSample</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkProfile>
+ </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>
<ItemGroup>
<Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
@@ -79,7 +103,9 @@
<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>
@@ -90,6 +116,23 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</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: trunk/MgDev/Desktop/Samples/BasicSample/Properties/Resources.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/Samples/BasicSample/Properties/Resources.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/BasicSample/Properties/Resources.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.269
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/MgDev/Desktop/Samples/BasicSample/Properties/Settings.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/Samples/BasicSample/Properties/Settings.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/BasicSample/Properties/Settings.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.269
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/MgDev/Desktop/Samples/BasicSample/app.config
===================================================================
--- trunk/MgDev/Desktop/Samples/BasicSample/app.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/BasicSample/app.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Deleted: trunk/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,193 +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>{41EF1524-D186-4079-BAA9-1A99F0AC31CA}</ProjectGuid>
- <OutputType>WinExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>FreeFormExample</RootNamespace>
- <AssemblyName>FreeFormExample</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <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>
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\x86\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Desktop.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=2.4.0.7019, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Foundation.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=2.4.0.7019, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Geometry.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.4.0.7019, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Viewer.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Lib\OSGeo.MapGuide.Viewer.Desktop.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="MainForm.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="MainForm.Designer.cs">
- <DependentUpon>MainForm.cs</DependentUpon>
- </Compile>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <EmbeddedResource Include="MainForm.resx">
- <DependentUpon>MainForm.cs</DependentUpon>
- </EmbeddedResource>
- <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="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>
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\zoom-in-fixed.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\zoom-out-fixed.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\zoom-in.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\zoom-full.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\lc_select.gif" />
- </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-clear.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\view-refresh.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\icon_pan.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>
- <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>
- -->
- <PropertyGroup>
- <PostBuildEvent>if not exist "$(TargetDir)FDO" md "$(TargetDir)FDO"
-xcopy /s /y "$(SolutionDir)Lib\FDO" "$(TargetDir)FDO"
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)Lib\Dictionaries" "$(TargetDir)Dictionaries"
-if not exist "$(TargetDir)Resources" md "$(TargetDir)Resources"
-xcopy /s /y "$(SolutionDir)Lib\Resources" "$(TargetDir)Resources"
-if not exist "$(TargetDir)Schema" md "$(TargetDir)Schema"
-xcopy /s /y "$(SolutionDir)Lib\Schema" "$(TargetDir)Schema"
-copy /y "$(SolutionDir)Lib\*.dll" "$(TargetDir)"
-copy /y "$(SolutionDir)Lib\Platform.ini" "$(TargetDir)"</PostBuildEvent>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Modified: trunk/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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>FreeFormExample</RootNamespace>
<AssemblyName>FreeFormExample</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <TargetFrameworkProfile>
+ </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\x86\Release\</OutputPath>
@@ -28,6 +50,7 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</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">
@@ -89,6 +112,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>
@@ -132,6 +156,23 @@
<ItemGroup>
<None Include="Resources\icon_pan.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>
<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: trunk/MgDev/Desktop/Samples/FreeFormExample/Properties/Resources.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/Samples/FreeFormExample/Properties/Resources.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/FreeFormExample/Properties/Resources.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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: trunk/MgDev/Desktop/Samples/FreeFormExample/Properties/Settings.Designer.cs
===================================================================
--- trunk/MgDev/Desktop/Samples/FreeFormExample/Properties/Settings.Designer.cs 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/FreeFormExample/Properties/Settings.Designer.cs 2014-07-09 12:41:48 UTC (rev 8293)
@@ -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.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/MgDev/Desktop/Samples/FreeFormExample/app.config
===================================================================
--- trunk/MgDev/Desktop/Samples/FreeFormExample/app.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/FreeFormExample/app.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Modified: trunk/MgDev/Desktop/Samples/MgDesktopSamples.sln
===================================================================
--- trunk/MgDev/Desktop/Samples/MgDesktopSamples.sln 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/MgDesktopSamples.sln 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,36 +1,48 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleExtension", "SampleExtension\SampleExtension.csproj", "{B97E7D94-E693-4081-8229-2FE87E5502E4}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedSample", "AdvancedSample\AdvancedSample.csproj", "{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicSample", "BasicSample\BasicSample.csproj", "{BE473CB6-718D-4654-9B0F-F1F9A327BD07}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedSample", "AdvancedSample\AdvancedSample.csproj", "{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeFormExample", "FreeFormExample\FreeFormExample.csproj", "{41EF1524-D186-4079-BAA9-1A99F0AC31CA}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleExtension", "SampleExtension\SampleExtension.csproj", "{942C10FD-F7F5-4E68-806D-32EB23A1DD35}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
+ Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B97E7D94-E693-4081-8229-2FE87E5502E4}.Debug|x86.ActiveCfg = Debug|x86
- {B97E7D94-E693-4081-8229-2FE87E5502E4}.Debug|x86.Build.0 = Debug|x86
- {B97E7D94-E693-4081-8229-2FE87E5502E4}.Release|x86.ActiveCfg = Release|x86
- {B97E7D94-E693-4081-8229-2FE87E5502E4}.Release|x86.Build.0 = Release|x86
+ {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Debug|x64.ActiveCfg = Debug|x86
+ {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Debug|x86.ActiveCfg = Debug|x86
+ {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Debug|x86.Build.0 = Debug|x86
+ {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Release|x64.ActiveCfg = Release|x86
+ {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Release|x86.ActiveCfg = Release|x86
+ {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Release|x86.Build.0 = Release|x86
+ {BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Debug|x64.ActiveCfg = Debug|x86
{BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Debug|x86.ActiveCfg = Debug|x86
{BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Debug|x86.Build.0 = Debug|x86
+ {BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Release|x64.ActiveCfg = Release|x86
{BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Release|x86.ActiveCfg = Release|x86
{BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Release|x86.Build.0 = Release|x86
- {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Debug|x86.ActiveCfg = Debug|x86
- {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Debug|x86.Build.0 = Debug|x86
- {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Release|x86.ActiveCfg = Release|x86
- {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Release|x86.Build.0 = Release|x86
+ {41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Debug|x64.ActiveCfg = Debug|x86
{41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Debug|x86.ActiveCfg = Debug|x86
{41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Debug|x86.Build.0 = Debug|x86
+ {41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Release|x64.ActiveCfg = Release|x86
{41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Release|x86.ActiveCfg = Release|x86
{41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Release|x86.Build.0 = Release|x86
+ {942C10FD-F7F5-4E68-806D-32EB23A1DD35}.Debug|x64.ActiveCfg = Debug|x64
+ {942C10FD-F7F5-4E68-806D-32EB23A1DD35}.Debug|x64.Build.0 = Debug|x64
+ {942C10FD-F7F5-4E68-806D-32EB23A1DD35}.Debug|x86.ActiveCfg = Debug|x86
+ {942C10FD-F7F5-4E68-806D-32EB23A1DD35}.Debug|x86.Build.0 = Debug|x86
+ {942C10FD-F7F5-4E68-806D-32EB23A1DD35}.Release|x64.ActiveCfg = Release|x64
+ {942C10FD-F7F5-4E68-806D-32EB23A1DD35}.Release|x64.Build.0 = Release|x64
+ {942C10FD-F7F5-4E68-806D-32EB23A1DD35}.Release|x86.ActiveCfg = Release|x86
+ {942C10FD-F7F5-4E68-806D-32EB23A1DD35}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Deleted: trunk/MgDev/Desktop/Samples/MgDesktopSamples_VS2010.sln
===================================================================
--- trunk/MgDev/Desktop/Samples/MgDesktopSamples_VS2010.sln 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/MgDesktopSamples_VS2010.sln 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,38 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleExtension.Net40", "SampleExtension\SampleExtension.Net40.csproj", "{942C10FD-F7F5-4E68-806D-32EB23A1DD35}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicSample.Net40", "BasicSample\BasicSample.Net40.csproj", "{BE473CB6-718D-4654-9B0F-F1F9A327BD07}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedSample.Net40", "AdvancedSample\AdvancedSample.Net40.csproj", "{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeFormExample.Net40", "FreeFormExample\FreeFormExample.Net40.csproj", "{41EF1524-D186-4079-BAA9-1A99F0AC31CA}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {942C10FD-F7F5-4E68-806D-32EB23A1DD35}.Debug|x86.ActiveCfg = Debug|x86
- {942C10FD-F7F5-4E68-806D-32EB23A1DD35}.Debug|x86.Build.0 = Debug|x86
- {942C10FD-F7F5-4E68-806D-32EB23A1DD35}.Release|x86.ActiveCfg = Release|x86
- {942C10FD-F7F5-4E68-806D-32EB23A1DD35}.Release|x86.Build.0 = Release|x86
- {BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Debug|x86.ActiveCfg = Debug|x86
- {BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Debug|x86.Build.0 = Debug|x86
- {BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Release|x86.ActiveCfg = Release|x86
- {BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Release|x86.Build.0 = Release|x86
- {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Debug|x86.ActiveCfg = Debug|x86
- {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Debug|x86.Build.0 = Debug|x86
- {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Release|x86.ActiveCfg = Release|x86
- {AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Release|x86.Build.0 = Release|x86
- {41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Debug|x86.ActiveCfg = Debug|x86
- {41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Debug|x86.Build.0 = Debug|x86
- {41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Release|x86.ActiveCfg = Release|x86
- {41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Deleted: trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,329 +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>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{942C10FD-F7F5-4E68-806D-32EB23A1DD35}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>SampleExtension</RootNamespace>
- <AssemblyName>SampleExtension</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
- <FileAlignment>512</FileAlignment>
- <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|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>
- </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>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
- <OutputPath>bin\x86\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop">
- <HintPath>..\Lib\OSGeo.MapGuide.Desktop.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\Lib\OSGeo.MapGuide.Foundation.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\Lib\OSGeo.MapGuide.Geometry.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\Lib\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer">
- <HintPath>..\Lib\OSGeo.MapGuide.Viewer.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer.Desktop">
- <HintPath>..\Lib\OSGeo.MapGuide.Viewer.Desktop.dll</HintPath>
- <Private>False</Private>
- </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.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="AnalyzingFeatures.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="AnalyzingFeatures.Designer.cs">
- <DependentUpon>AnalyzingFeatures.cs</DependentUpon>
- </Compile>
- <Compile Include="BufferHelper.cs" />
- <Compile Include="CustomOutput.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="CustomOutput.Designer.cs">
- <DependentUpon>CustomOutput.cs</DependentUpon>
- </Compile>
- <Compile Include="DigitizingAndRedlining.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="DigitizingAndRedlining.Designer.cs">
- <DependentUpon>DigitizingAndRedlining.cs</DependentUpon>
- </Compile>
- <Compile Include="HelloMap.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="HelloMap.Designer.cs">
- <DependentUpon>HelloMap.cs</DependentUpon>
- </Compile>
- <Compile Include="HelloViewer.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="HelloViewer.Designer.cs">
- <DependentUpon>HelloViewer.cs</DependentUpon>
- </Compile>
- <Compile Include="InteractingWithLayers.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="InteractingWithLayers.Designer.cs">
- <DependentUpon>InteractingWithLayers.cs</DependentUpon>
- </Compile>
- <Compile Include="LayerDefinitionFactory.cs" />
- <Compile Include="Layers.Designer.cs" />
- <Compile Include="LayerVisibilityDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="LayerVisibilityDialog.Designer.cs">
- <DependentUpon>LayerVisibilityDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="MgPlotToDwfComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgProfileComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgSampleTaskPaneComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="MgStartupComponent.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="ModifyingMapsAndLayers.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="ModifyingMapsAndLayers.Designer.cs">
- <DependentUpon>ModifyingMapsAndLayers.cs</DependentUpon>
- </Compile>
- <Compile Include="ParcelQueryResultWindow.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="ParcelQueryResultWindow.Designer.cs">
- <DependentUpon>ParcelQueryResultWindow.cs</DependentUpon>
- </Compile>
- <Compile Include="PrePostRendering.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="PrePostRendering.Designer.cs">
- <DependentUpon>PrePostRendering.cs</DependentUpon>
- </Compile>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ResourceIdDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="ResourceIdDialog.Designer.cs">
- <DependentUpon>ResourceIdDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="SampleComponents.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="SamplesTaskPane.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="SamplesTaskPane.Designer.cs">
- <DependentUpon>SamplesTaskPane.cs</DependentUpon>
- </Compile>
- <Compile Include="SelectedFeaturesWindow.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="SelectedFeaturesWindow.Designer.cs">
- <DependentUpon>SelectedFeaturesWindow.cs</DependentUpon>
- </Compile>
- <Compile Include="WorkingWithFeatureData.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="WorkingWithFeatureData.Designer.cs">
- <DependentUpon>WorkingWithFeatureData.cs</DependentUpon>
- </Compile>
- <Compile Include="XmlResponseDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="XmlResponseDialog.Designer.cs">
- <DependentUpon>XmlResponseDialog.cs</DependentUpon>
- </Compile>
- <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="AnalyzingFeatures.resx">
- <DependentUpon>AnalyzingFeatures.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="CustomOutput.resx">
- <DependentUpon>CustomOutput.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DigitizingAndRedlining.resx">
- <DependentUpon>DigitizingAndRedlining.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="HelloMap.resx">
- <DependentUpon>HelloMap.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="HelloViewer.resx">
- <DependentUpon>HelloViewer.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="InteractingWithLayers.resx">
- <DependentUpon>InteractingWithLayers.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Layers.resx" />
- <EmbeddedResource Include="LayerVisibilityDialog.resx">
- <DependentUpon>LayerVisibilityDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="ModifyingMapsAndLayers.resx">
- <DependentUpon>ModifyingMapsAndLayers.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="ParcelQueryResultWindow.resx">
- <DependentUpon>ParcelQueryResultWindow.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="PrePostRendering.resx">
- <DependentUpon>PrePostRendering.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="ResourceIdDialog.resx">
- <DependentUpon>ResourceIdDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="SamplesTaskPane.resx">
- <DependentUpon>SamplesTaskPane.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="SelectedFeaturesWindow.resx">
- <DependentUpon>SelectedFeaturesWindow.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="WorkingWithFeatureData.resx">
- <DependentUpon>WorkingWithFeatureData.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="XmlResponseDialog.resx">
- <DependentUpon>XmlResponseDialog.cs</DependentUpon>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\arearule.templ" />
- <None Include="Resources\areatypestyle.templ" />
- <None Include="Resources\layerdefinition.templ" />
- <None Include="Resources\linerule.templ" />
- <None Include="Resources\linetypestyle.templ" />
- <None Include="Resources\marksymbol.templ" />
- <None Include="Resources\pointrule.templ" />
- <None Include="Resources\pointtypestyle.templ" />
- <None Include="Resources\scalerange.templ" />
- <None Include="Resources\textsymbol.templ" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Resources\BufferLayerDefinition.txt" />
- <Content Include="Resources\ParcelMarker.txt" />
- <Content Include="Resources\RecentlyBuilt.txt" />
- <Content Include="Resources\Redline.txt" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
- <Visible>False</Visible>
- <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <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>false</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" />
- <PropertyGroup>
- <PostBuildEvent>if not exist "$(TargetDir)FDO" md "$(TargetDir)FDO"
-xcopy /s /y "$(SolutionDir)Lib\FDO" "$(TargetDir)FDO"
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)Lib\Dictionaries" "$(TargetDir)Dictionaries"
-if not exist "$(TargetDir)Resources" md "$(TargetDir)Resources"
-xcopy /s /y "$(SolutionDir)Lib\Resources" "$(TargetDir)Resources"
-if not exist "$(TargetDir)Schema" md "$(TargetDir)Schema"
-xcopy /s /y "$(SolutionDir)Lib\Schema" "$(TargetDir)Schema"
-copy /y "$(SolutionDir)Lib\*.dll" "$(TargetDir)"
-copy /y "$(SolutionDir)Lib\Platform.ini" "$(TargetDir)"
-copy /y "$(SolutionDir)Lib\MgAppLayout.exe" "$(TargetDir)"
-copy /y "$(SolutionDir)Lib\Sheboygan.AppLayout" "$(TargetDir)"</PostBuildEvent>
- </PropertyGroup>
- <!-- 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
Deleted: trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.Nuget.Net40.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.Nuget.Net40.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.Nuget.Net40.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,228 +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>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{942C10FD-F7F5-4E68-806D-32EB23A1DD35}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>SampleExtension</RootNamespace>
- <AssemblyName>SampleExtension</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
- <FileAlignment>512</FileAlignment>
- </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>
- </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>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
- <OutputPath>bin\x86\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- </PropertyGroup>
- <ItemGroup>
- <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.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="AnalyzingFeatures.cs" />
- <Compile Include="AnalyzingFeatures.Designer.cs">
- <DependentUpon>AnalyzingFeatures.cs</DependentUpon>
- </Compile>
- <Compile Include="BufferHelper.cs" />
- <Compile Include="CustomOutput.cs" />
- <Compile Include="CustomOutput.Designer.cs">
- <DependentUpon>CustomOutput.cs</DependentUpon>
- </Compile>
- <Compile Include="DigitizingAndRedlining.cs" />
- <Compile Include="DigitizingAndRedlining.Designer.cs">
- <DependentUpon>DigitizingAndRedlining.cs</DependentUpon>
- </Compile>
- <Compile Include="HelloMap.cs" />
- <Compile Include="HelloMap.Designer.cs">
- <DependentUpon>HelloMap.cs</DependentUpon>
- </Compile>
- <Compile Include="HelloViewer.cs" />
- <Compile Include="HelloViewer.Designer.cs">
- <DependentUpon>HelloViewer.cs</DependentUpon>
- </Compile>
- <Compile Include="InteractingWithLayers.cs" />
- <Compile Include="InteractingWithLayers.Designer.cs">
- <DependentUpon>InteractingWithLayers.cs</DependentUpon>
- </Compile>
- <Compile Include="LayerDefinitionFactory.cs" />
- <Compile Include="Layers.Designer.cs" />
- <Compile Include="LayerVisibilityDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="LayerVisibilityDialog.Designer.cs">
- <DependentUpon>LayerVisibilityDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="MgPlotToDwfComponent.cs" />
- <Compile Include="MgProfileComponent.cs" />
- <Compile Include="MgSampleTaskPaneComponent.cs" />
- <Compile Include="MgStartupComponent.cs" />
- <Compile Include="ModifyingMapsAndLayers.cs" />
- <Compile Include="ModifyingMapsAndLayers.Designer.cs">
- <DependentUpon>ModifyingMapsAndLayers.cs</DependentUpon>
- </Compile>
- <Compile Include="ParcelQueryResultWindow.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="ParcelQueryResultWindow.Designer.cs">
- <DependentUpon>ParcelQueryResultWindow.cs</DependentUpon>
- </Compile>
- <Compile Include="PrePostRendering.cs" />
- <Compile Include="PrePostRendering.Designer.cs">
- <DependentUpon>PrePostRendering.cs</DependentUpon>
- </Compile>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ResourceIdDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="ResourceIdDialog.Designer.cs">
- <DependentUpon>ResourceIdDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="SampleComponents.cs" />
- <Compile Include="SamplesTaskPane.cs" />
- <Compile Include="SamplesTaskPane.Designer.cs">
- <DependentUpon>SamplesTaskPane.cs</DependentUpon>
- </Compile>
- <Compile Include="SelectedFeaturesWindow.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="SelectedFeaturesWindow.Designer.cs">
- <DependentUpon>SelectedFeaturesWindow.cs</DependentUpon>
- </Compile>
- <Compile Include="WorkingWithFeatureData.cs" />
- <Compile Include="WorkingWithFeatureData.Designer.cs">
- <DependentUpon>WorkingWithFeatureData.cs</DependentUpon>
- </Compile>
- <Compile Include="XmlResponseDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="XmlResponseDialog.Designer.cs">
- <DependentUpon>XmlResponseDialog.cs</DependentUpon>
- </Compile>
- <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="AnalyzingFeatures.resx">
- <DependentUpon>AnalyzingFeatures.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="CustomOutput.resx">
- <DependentUpon>CustomOutput.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DigitizingAndRedlining.resx">
- <DependentUpon>DigitizingAndRedlining.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="HelloMap.resx">
- <DependentUpon>HelloMap.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="HelloViewer.resx">
- <DependentUpon>HelloViewer.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="InteractingWithLayers.resx">
- <DependentUpon>InteractingWithLayers.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Layers.resx" />
- <EmbeddedResource Include="LayerVisibilityDialog.resx">
- <DependentUpon>LayerVisibilityDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="ModifyingMapsAndLayers.resx">
- <DependentUpon>ModifyingMapsAndLayers.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="ParcelQueryResultWindow.resx">
- <DependentUpon>ParcelQueryResultWindow.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="PrePostRendering.resx">
- <DependentUpon>PrePostRendering.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="ResourceIdDialog.resx">
- <DependentUpon>ResourceIdDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="SamplesTaskPane.resx">
- <DependentUpon>SamplesTaskPane.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="SelectedFeaturesWindow.resx">
- <DependentUpon>SelectedFeaturesWindow.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="WorkingWithFeatureData.resx">
- <DependentUpon>WorkingWithFeatureData.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="XmlResponseDialog.resx">
- <DependentUpon>XmlResponseDialog.cs</DependentUpon>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\arearule.templ" />
- <None Include="Resources\areatypestyle.templ" />
- <None Include="Resources\layerdefinition.templ" />
- <None Include="Resources\linerule.templ" />
- <None Include="Resources\linetypestyle.templ" />
- <None Include="Resources\marksymbol.templ" />
- <None Include="Resources\pointrule.templ" />
- <None Include="Resources\pointtypestyle.templ" />
- <None Include="Resources\scalerange.templ" />
- <None Include="Resources\textsymbol.templ" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Resources\BufferLayerDefinition.txt" />
- <Content Include="Resources\ParcelMarker.txt" />
- <Content Include="Resources\RecentlyBuilt.txt" />
- <Content Include="Resources\Redline.txt" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
- <!-- 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: trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,81 +1,109 @@
<?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>
+ <ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{B97E7D94-E693-4081-8229-2FE87E5502E4}</ProjectGuid>
+ <ProjectGuid>{942C10FD-F7F5-4E68-806D-32EB23A1DD35}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SampleExtension</RootNamespace>
<AssemblyName>SampleExtension</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
+ <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|x64' ">
+ <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>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+ <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>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="OSGeo.MapGuide.Desktop">
<HintPath>..\Lib\OSGeo.MapGuide.Desktop.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=2.4.0.6962, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="OSGeo.MapGuide.Foundation">
<HintPath>..\Lib\OSGeo.MapGuide.Foundation.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=2.4.0.6962, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="OSGeo.MapGuide.Geometry">
<HintPath>..\Lib\OSGeo.MapGuide.Geometry.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.4.0.6962, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="OSGeo.MapGuide.PlatformBase">
<HintPath>..\Lib\OSGeo.MapGuide.PlatformBase.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.Viewer, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="OSGeo.MapGuide.Viewer">
<HintPath>..\Lib\OSGeo.MapGuide.Viewer.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.Viewer.Desktop, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="OSGeo.MapGuide.Viewer.Desktop">
<HintPath>..\Lib\OSGeo.MapGuide.Viewer.Desktop.dll</HintPath>
+ <Private>False</Private>
</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.Drawing" />
<Reference Include="System.Windows.Forms" />
@@ -120,21 +148,20 @@
<DependentUpon>InteractingWithLayers.cs</DependentUpon>
</Compile>
<Compile Include="LayerDefinitionFactory.cs" />
- <Compile Include="Layers.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Layers.resx</DependentUpon>
- </Compile>
+ <Compile Include="Layers.Designer.cs" />
<Compile Include="LayerVisibilityDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="LayerVisibilityDialog.Designer.cs">
<DependentUpon>LayerVisibilityDialog.cs</DependentUpon>
</Compile>
+ <Compile Include="MgPlotToDwfComponent.cs">
+ <SubType>Component</SubType>
+ </Compile>
<Compile Include="MgProfileComponent.cs">
<SubType>Component</SubType>
</Compile>
- <Compile Include="MgPlotToDwfComponent.cs">
+ <Compile Include="MgSampleTaskPaneComponent.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="MgStartupComponent.cs">
@@ -146,6 +173,12 @@
<Compile Include="ModifyingMapsAndLayers.Designer.cs">
<DependentUpon>ModifyingMapsAndLayers.cs</DependentUpon>
</Compile>
+ <Compile Include="ParcelQueryResultWindow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="ParcelQueryResultWindow.Designer.cs">
+ <DependentUpon>ParcelQueryResultWindow.cs</DependentUpon>
+ </Compile>
<Compile Include="PrePostRendering.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -153,12 +186,6 @@
<DependentUpon>PrePostRendering.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ParcelQueryResultWindow.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="ParcelQueryResultWindow.Designer.cs">
- <DependentUpon>ParcelQueryResultWindow.cs</DependentUpon>
- </Compile>
<Compile Include="ResourceIdDialog.cs">
<SubType>Form</SubType>
</Compile>
@@ -174,9 +201,6 @@
<Compile Include="SamplesTaskPane.Designer.cs">
<DependentUpon>SamplesTaskPane.cs</DependentUpon>
</Compile>
- <Compile Include="MgSampleTaskPaneComponent.cs">
- <SubType>Component</SubType>
- </Compile>
<Compile Include="SelectedFeaturesWindow.cs">
<SubType>Form</SubType>
</Compile>
@@ -216,10 +240,7 @@
<EmbeddedResource Include="InteractingWithLayers.resx">
<DependentUpon>InteractingWithLayers.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Layers.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Layers.Designer.cs</LastGenOutput>
- </EmbeddedResource>
+ <EmbeddedResource Include="Layers.resx" />
<EmbeddedResource Include="LayerVisibilityDialog.resx">
<DependentUpon>LayerVisibilityDialog.cs</DependentUpon>
</EmbeddedResource>
@@ -257,27 +278,38 @@
<None Include="Resources\marksymbol.templ" />
<None Include="Resources\pointrule.templ" />
<None Include="Resources\pointtypestyle.templ" />
- <None Include="Resources\RecentlyBuilt.txt" />
<None Include="Resources\scalerange.templ" />
<None Include="Resources\textsymbol.templ" />
</ItemGroup>
<ItemGroup>
- <None Include="Resources\BufferLayerDefinition.txt" />
+ <Content Include="Resources\BufferLayerDefinition.txt" />
+ <Content Include="Resources\ParcelMarker.txt" />
+ <Content Include="Resources\RecentlyBuilt.txt" />
+ <Content Include="Resources\Redline.txt" />
</ItemGroup>
<ItemGroup>
- <None Include="Resources\ParcelMarker.txt" />
+ <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
+ <Visible>False</Visible>
+ <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <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>false</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\Redline.txt" />
- </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>
- -->
<PropertyGroup>
<PostBuildEvent>if not exist "$(TargetDir)FDO" md "$(TargetDir)FDO"
xcopy /s /y "$(SolutionDir)Lib\FDO" "$(TargetDir)FDO"
@@ -290,6 +322,13 @@
copy /y "$(SolutionDir)Lib\*.dll" "$(TargetDir)"
copy /y "$(SolutionDir)Lib\Platform.ini" "$(TargetDir)"
copy /y "$(SolutionDir)Lib\MgAppLayout.exe" "$(TargetDir)"
-copy /y "$(SolutionDir)Lib\SheboyganSample.AppLayout" "$(TargetDir)"</PostBuildEvent>
+copy /y "$(SolutionDir)Lib\Sheboygan.AppLayout" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
+ <!-- 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: trunk/MgDev/Desktop/Samples/samples_readme.txt
===================================================================
--- trunk/MgDev/Desktop/Samples/samples_readme.txt 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/Desktop/Samples/samples_readme.txt 2014-07-09 12:41:48 UTC (rev 8293)
@@ -3,11 +3,8 @@
The following samples all require the Sheboygan sample dataset. For these samples to build, copy your mg-desktop files (and its subfolders) into the Lib directory, you must use the correct build of mg-desktop for the version of VS you are using to open this solution file:
- - MgDesktopSamples.sln: mg-desktop .net Framework 2.0, VC9 build
- - MgDesktopSamples_VS2010.sln: mg-desktop .net Framework 4.0, VC10 build
+ - MgDesktopSamples.sln: mg-desktop .net Framework 4.5, VC11 build
-Basically, you can't use a .net 4.0 build of mg-desktop on a VS2008 solution
-
Note that in order to use mg-desktop, your main executable must have CPU architecture set to x86 (because these are .net wrappers to 32-bit unmanaged dlls). All the executable projects in this solution have their CPU architecture set to x86
BasicSample
Modified: trunk/MgDev/nuget/MapGuideNuget/.nuget/NuGet.exe
===================================================================
(Binary files differ)
Modified: trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/CoordSysEnumTest.csproj
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/CoordSysEnumTest.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/CoordSysEnumTest.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -13,6 +13,8 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -35,15 +37,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -76,7 +69,6 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -90,10 +82,15 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\cs-map-dictionaries.2.4.0.7093\dictionaries\*.*" "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- 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">
Deleted: trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/packages.config
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/packages.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/packages.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="cs-map-dictionaries" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mapguide-api-base-x86" version="2.4.0.7093" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
Modified: trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/CoordSysEnumTest.csproj
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/CoordSysEnumTest.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/CoordSysEnumTest.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -36,15 +36,6 @@
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -77,7 +68,6 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -91,9 +81,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\cs-map-dictionaries.2.4.0.7093\dictionaries\*.*" "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x64.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Deleted: trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/packages.config
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/packages.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/packages.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="cs-map-dictionaries" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mapguide-api-base-x64" version="2.4.0.7093" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
Modified: trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/DesktopConsoleTest.csproj
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/DesktopConsoleTest.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/DesktopConsoleTest.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -13,6 +13,8 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -34,22 +36,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=AMD64">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mg-desktop-net40-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
@@ -64,17 +50,18 @@
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
- <ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\cs-map-dictionaries.2.4.0.7093\dictionaries\*.*" "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-net40-x86.2.4.0.7093\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- 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">
Deleted: trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/packages.config
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/packages.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/packages.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="cs-map-dictionaries" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mapguide-api-base-x86" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mg-desktop-net40-x86" version="2.4.0.7093" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
Modified: trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/DesktopConsoleTest.csproj
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/DesktopConsoleTest.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/DesktopConsoleTest.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -35,18 +35,6 @@
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop">
- <HintPath>..\packages\mg-desktop-net40-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
@@ -61,16 +49,10 @@
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
- <ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\cs-map-dictionaries.2.4.0.7093\dictionaries\*.*" "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x64.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-net40-x64.2.4.0.7093\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Deleted: trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/packages.config
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/packages.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/packages.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="cs-map-dictionaries" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mapguide-api-base-x64" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mg-desktop-net40-x64" version="2.4.0.7093" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
Modified: trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest/DesktopViewerTest.csproj
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest/DesktopViewerTest.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest/DesktopViewerTest.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -13,6 +13,8 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -34,30 +36,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=AMD64">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mg-desktop-net40-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mg-desktop-viewer-net40-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Viewer.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer.Desktop, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mg-desktop-viewer-net40-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Viewer.Desktop.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -90,7 +68,6 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -104,11 +81,15 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\cs-map-dictionaries.2.4.0.7093\dictionaries\*.*" "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-net40-x86.2.4.0.7093\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- 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">
Deleted: trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest/packages.config
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest/packages.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest/packages.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="cs-map-dictionaries" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mapguide-api-base-x86" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mg-desktop-net40-x86" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mg-desktop-viewer-net40-x86" version="2.4.0.7093" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
Modified: trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/DesktopViewerTest.csproj
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/DesktopViewerTest.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/DesktopViewerTest.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -35,24 +35,6 @@
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop">
- <HintPath>..\packages\mg-desktop-net40-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer">
- <HintPath>..\packages\mg-desktop-viewer-net40-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Viewer.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer.Desktop">
- <HintPath>..\packages\mg-desktop-viewer-net40-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Viewer.Desktop.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -82,7 +64,6 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -96,10 +77,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\cs-map-dictionaries.2.4.0.7093\dictionaries\*.*" "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x64.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-net40-x64.2.4.0.7093\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Deleted: trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/packages.config
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/packages.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/packages.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="cs-map-dictionaries" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mapguide-api-base-x64" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mg-desktop-net40-x64" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mg-desktop-viewer-net40-x64" version="2.4.0.7093" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
Modified: trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget/MapGuideNuget.csproj
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget/MapGuideNuget.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget/MapGuideNuget.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -19,24 +19,11 @@
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.MapGuideCommon">
- <HintPath>..\packages\mapguide-api-web-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.MapGuideCommon.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Web">
- <HintPath>..\packages\mapguide-api-web-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Web.dll</HintPath>
- </Reference>
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
@@ -73,7 +60,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <Content Include="packages.config" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -127,9 +113,15 @@
</ProjectExtensions>
<PropertyGroup>
<PostBuildEvent>
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-web-x86.2.4.0.7093\mapguide-api-web\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- 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">
Deleted: trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget/packages.config
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget/packages.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget/packages.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="mapguide-api-base-x86" version="2.4.0.7093" targetFramework="net40" />
- <package id="mapguide-api-web-x86" version="2.4.0.7093" targetFramework="net40" />
-</packages>
\ No newline at end of file
Modified: trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64/MapGuideNuget.csproj
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64/MapGuideNuget.csproj 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64/MapGuideNuget.csproj 2014-07-09 12:41:48 UTC (rev 8293)
@@ -24,21 +24,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.MapGuideCommon">
- <HintPath>..\packages\mapguide-api-web-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.MapGuideCommon.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Web">
- <HintPath>..\packages\mapguide-api-web-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Web.dll</HintPath>
- </Reference>
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
@@ -75,7 +60,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <Content Include="packages.config" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -129,8 +113,7 @@
</ProjectExtensions>
<PropertyGroup>
<PostBuildEvent>
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x64.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-web-x64.2.4.0.7093\mapguide-api-web\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Deleted: trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64/packages.config
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64/packages.config 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64/packages.config 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="mapguide-api-base-x64" version="2.4.0.7093" targetFramework="net40" />
- <package id="mapguide-api-web-x64" version="2.4.0.7093" targetFramework="net40" />
-</packages>
\ No newline at end of file
Modified: trunk/MgDev/nuget/NuGet.exe
===================================================================
(Binary files differ)
Modified: trunk/MgDev/nuget/api-desktop-readme.txt
===================================================================
--- trunk/MgDev/nuget/api-desktop-readme.txt 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/api-desktop-readme.txt 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,8 +1,10 @@
-mg-desktop-net40 README
-=======================
+mg-desktop README
+=================
-This is the NuGet package for the mg-desktop API. This does not include the WinForms-based map viewer control. Install the mg-desktop-viewer-net40 package if you require this component.
+This is the NuGet package for the mg-desktop API. This does not include the WinForms-based map viewer control. Install the mg-desktop-viewer package if you require this component.
+This package was formerly known as mg-desktop-net40. That package still exists on NuGet and should be considered a legacy package
+
Dependencies
============
Modified: trunk/MgDev/nuget/api-desktop-viewer-readme.txt
===================================================================
--- trunk/MgDev/nuget/api-desktop-viewer-readme.txt 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/api-desktop-viewer-readme.txt 2014-07-09 12:41:48 UTC (rev 8293)
@@ -1,13 +1,15 @@
-mg-desktop-viewer-net40 README
-==============================
+mg-desktop-viewer README
+========================
This is the NuGet package for the mg-desktop viewer API.
+This package was formerly known as mg-desktop-viewer-net40. That package still exists on NuGet and should be considered a legacy package
+
Dependencies
============
- mapguide-api-base
-- mg-desktop-net40
+- mg-desktop
Optional Dependencies
=====================
Modified: trunk/MgDev/nuget/cs-map-dict-readme.txt
===================================================================
--- trunk/MgDev/nuget/cs-map-dict-readme.txt 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget/cs-map-dict-readme.txt 2014-07-09 12:41:48 UTC (rev 8293)
@@ -9,13 +9,13 @@
If you are building normal web applications with the MapGuide Web API, this package is not necessary as your application will use the dictionary files specified in webconfig.ini (which normally point to dictionary files that come with your MapGuide Open Source installation)
-This package is only required if you are building a mg-desktop application (you installed the mg-desktop-net40 package), or you are building a non-standard application that uses the MgCoordinateSystem* classes in the MapGuide API.
+This package is only required if you are building a mg-desktop application (you installed the mg-desktop package), or you are building a non-standard application that uses the MgCoordinateSystem* classes in the MapGuide API.
Installation Notes
==================
This package will add a post-build step to copy the dictionary files to a "Dictionaries" subdirectory in the project's output directory.
-If you installed the mg-desktop-net40 package, it's Platform.ini expects the dictionary files to be copied to this location and thus does not require any further action on your part if you installed both packages.
+If you installed the mg-desktop package, it's Platform.ini expects the dictionary files to be copied to this location and thus does not require any further action on your part if you installed both packages.
For non-standard applications that use the MgCoordinateSystem* classes, you must set the MENTOR_DICTIONARY_PATH environment variable to indicate the directory containing these dictionary files. You must do this before you access the MgCoordinateSystemFactory class.
\ No newline at end of file
Modified: trunk/MgDev/nuget/mapguide-api-base.nuspec.tpl
===================================================================
(Binary files differ)
Modified: trunk/MgDev/nuget/mapguide-api-web.nuspec.tpl
===================================================================
(Binary files differ)
Deleted: trunk/MgDev/nuget/mg-desktop-net40.nuspec.tpl
===================================================================
(Binary files differ)
Deleted: trunk/MgDev/nuget/mg-desktop-viewer-net40.nuspec.tpl
===================================================================
(Binary files differ)
Copied: trunk/MgDev/nuget/mg-desktop-viewer.nuspec.tpl (from rev 8286, branches/2.6/MgDev/nuget/mg-desktop-viewer.nuspec.tpl)
===================================================================
(Binary files differ)
Copied: trunk/MgDev/nuget/mg-desktop.nuspec.tpl (from rev 8286, branches/2.6/MgDev/nuget/mg-desktop.nuspec.tpl)
===================================================================
(Binary files differ)
Modified: trunk/MgDev/nuget_pack.bat
===================================================================
--- trunk/MgDev/nuget_pack.bat 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget_pack.bat 2014-07-09 12:41:48 UTC (rev 8293)
@@ -3,8 +3,8 @@
IF NOT "%1" == "" SET MG_CPU=%1
pushd nuget
nuget pack mapguide-api-base-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-base
-nuget pack mg-desktop-net40-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-desktop
-nuget pack mg-desktop-viewer-net40-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-desktop-viewer
+nuget pack mg-desktop-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-desktop
+nuget pack mg-desktop-viewer-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-desktop-viewer
nuget pack mapguide-api-web-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-web
nuget pack cs-map-dictionaries.nuspec -BasePath cs-map-dicts
popd
\ No newline at end of file
Modified: trunk/MgDev/nuget_prepare.bat
===================================================================
--- trunk/MgDev/nuget_prepare.bat 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/nuget_prepare.bat 2014-07-09 12:41:48 UTC (rev 8293)
@@ -119,12 +119,12 @@
echo [prepare]: mapguide-api-web
call BatchSubstitute.bat MG_CPU %MG_CPU% mapguide-api-web.nuspec.tpl > temp.txt
call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mapguide-api-web-%MG_CPU%.nuspec
-echo [prepare]: mg-desktop-net40
-call BatchSubstitute.bat MG_CPU %MG_CPU% mg-desktop-net40.nuspec.tpl > temp.txt
-call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mg-desktop-net40-%MG_CPU%.nuspec
-echo [prepare]: mg-desktop-viewer-net40
-call BatchSubstitute.bat MG_CPU %MG_CPU% mg-desktop-viewer-net40.nuspec.tpl > temp.txt
-call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mg-desktop-viewer-net40-%MG_CPU%.nuspec
+echo [prepare]: mg-desktop
+call BatchSubstitute.bat MG_CPU %MG_CPU% mg-desktop.nuspec.tpl > temp.txt
+call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mg-desktop-%MG_CPU%.nuspec
+echo [prepare]: mg-desktop-viewer
+call BatchSubstitute.bat MG_CPU %MG_CPU% mg-desktop-viewer.nuspec.tpl > temp.txt
+call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mg-desktop-viewer-%MG_CPU%.nuspec
echo [prepare]: cs-map-dictionaries
call BatchSubstitute.bat MG_CPU %MG_CPU% cs-map-dictionaries.nuspec.tpl > temp.txt
call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > cs-map-dictionaries.nuspec
Modified: trunk/MgDev/run_tests.bat
===================================================================
--- trunk/MgDev/run_tests.bat 2014-07-09 12:36:10 UTC (rev 8292)
+++ trunk/MgDev/run_tests.bat 2014-07-09 12:41:48 UTC (rev 8293)
@@ -17,9 +17,9 @@
SET PHP_EXT_DIR=C:\Program Files\OSGeo\MapGuide\Web\Php\ext
SET START_MGSERVER=1
-SET START_WEBSERVER=1
-SET RUN_SERVER_TESTS=1
-SET RUN_PHP_TESTS=1
+SET START_WEBSERVER=0
+SET RUN_SERVER_TESTS=0
+SET RUN_PHP_TESTS=0
SET RUN_DOTNET_TESTS=1
SET RETURN_CODE=0
More information about the mapguide-commits
mailing list