[mapguide-commits] r8279 - in sandbox/jng/convenience_apis: . Desktop Desktop/MgDesktop 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
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jul 4 01:45:30 PDT 2014
Author: jng
Date: 2014-07-04 01:45:30 -0700 (Fri, 04 Jul 2014)
New Revision: 8279
Removed:
sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/AdvancedSample.Net40.csproj
sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/AdvancedSample.Nuget.Net40.csproj
sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/BasicSample.Net40.csproj
sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/BasicSample.Nuget.Net40.csproj
sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/FreeFormExample.Net40.csproj
sandbox/jng/convenience_apis/Desktop/Samples/MgDesktopSamples_VS2010.sln
sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/SampleExtension.Net40.csproj
sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/SampleExtension.Nuget.Net40.csproj
Modified:
sandbox/jng/convenience_apis/
sandbox/jng/convenience_apis/Desktop/
sandbox/jng/convenience_apis/Desktop/MgDesktop/MgDesktop.vcxproj
sandbox/jng/convenience_apis/Desktop/MgDesktop/MgDesktop.vcxproj.filters
sandbox/jng/convenience_apis/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp
sandbox/jng/convenience_apis/Desktop/MgDesktop/Services/FeatureService.cpp
sandbox/jng/convenience_apis/Desktop/MgDesktopApi.sln
sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/AdvancedSample.csproj
sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/Properties/Resources.Designer.cs
sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/Properties/Settings.Designer.cs
sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/app.config
sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/BasicSample.csproj
sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/Properties/Resources.Designer.cs
sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/Properties/Settings.Designer.cs
sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/app.config
sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/FreeFormExample.csproj
sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/Properties/Resources.Designer.cs
sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/Properties/Settings.Designer.cs
sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/app.config
sandbox/jng/convenience_apis/Desktop/Samples/MgDesktopSamples.sln
sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/ModifyingMapsAndLayers.cs
sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/SampleExtension.csproj
sandbox/jng/convenience_apis/Desktop/Samples/samples_readme.txt
Log:
Fix broken code in samples as a result of convenience API changes.
Also ...
Merged revision(s) 8276-8278 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
........
Property changes on: sandbox/jng/convenience_apis
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/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-8278
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212,8214,8217,8220-8221,8223-8225
/sandbox/rfc94:5099-5163
Property changes on: sandbox/jng/convenience_apis/Desktop
___________________________________________________________________
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-8278
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/rfc94/Desktop:5099-5163
Modified: sandbox/jng/convenience_apis/Desktop/MgDesktop/MgDesktop.vcxproj
===================================================================
--- sandbox/jng/convenience_apis/Desktop/MgDesktop/MgDesktop.vcxproj 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/MgDesktop/MgDesktop.vcxproj 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/MgDesktop/MgDesktop.vcxproj.filters
===================================================================
--- sandbox/jng/convenience_apis/Desktop/MgDesktop/MgDesktop.vcxproj.filters 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/MgDesktop/MgDesktop.vcxproj.filters 2014-07-04 08:45:30 UTC (rev 8279)
@@ -853,7 +853,6 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="..\braindump.txt" />
<None Include="Platform.ini" />
</ItemGroup>
</Project>
\ No newline at end of file
Modified: sandbox/jng/convenience_apis/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp
===================================================================
--- sandbox/jng/convenience_apis/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp 2014-07-04 08:45:30 UTC (rev 8279)
@@ -279,7 +279,7 @@
INT32 MgdUpdateFeaturesCommand::ExecuteUpdate(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans)
{
- int updated = 0;
+ INT32 updated = 0;
MG_FEATURE_SERVICE_TRY()
@@ -336,7 +336,7 @@
INT32 MgdUpdateFeaturesCommand::ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans)
{
- int deleted = 0;
+ INT32 deleted = 0;
MG_FEATURE_SERVICE_TRY()
Modified: sandbox/jng/convenience_apis/Desktop/MgDesktop/Services/FeatureService.cpp
===================================================================
--- sandbox/jng/convenience_apis/Desktop/MgDesktop/Services/FeatureService.cpp 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/MgDesktop/Services/FeatureService.cpp 2014-07-04 08:45:30 UTC (rev 8279)
@@ -1185,7 +1185,7 @@
INT32 MgdFeatureService::UpdateMatchingFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter)
{
- int ret = 0;
+ INT32 ret = 0;
MG_LOG_OPERATION_MESSAGE(L"UpdateMatchingFeatures");
MG_FEATURE_SERVICE_TRY()
@@ -1228,7 +1228,7 @@
INT32 MgdFeatureService::UpdateMatchingFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* batchPropertyValues, CREFSTRING filter, MgTransaction* trans)
{
- int updated = 0;
+ INT32 updated = 0;
MG_LOG_OPERATION_MESSAGE(L"UpdateMatchingFeatures");
MG_FEATURE_SERVICE_TRY()
@@ -1275,7 +1275,7 @@
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()
@@ -1317,7 +1317,7 @@
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: sandbox/jng/convenience_apis/Desktop/MgDesktopApi.sln
===================================================================
--- sandbox/jng/convenience_apis/Desktop/MgDesktopApi.sln 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/MgDesktopApi.sln 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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}
Deleted: sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/AdvancedSample.Net40.csproj
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/AdvancedSample.Net40.csproj 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/AdvancedSample.Net40.csproj 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/AdvancedSample.Nuget.Net40.csproj
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/AdvancedSample.Nuget.Net40.csproj 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/AdvancedSample.Nuget.Net40.csproj 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/AdvancedSample.csproj
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/AdvancedSample.csproj 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/AdvancedSample.csproj 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/Properties/Resources.Designer.cs
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/Properties/Resources.Designer.cs 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/Properties/Resources.Designer.cs 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/Properties/Settings.Designer.cs
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/Properties/Settings.Designer.cs 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/Properties/Settings.Designer.cs 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/app.config
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/app.config 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/AdvancedSample/app.config 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/BasicSample.Net40.csproj
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/BasicSample.Net40.csproj 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/BasicSample.Net40.csproj 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/BasicSample.Nuget.Net40.csproj
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/BasicSample.Nuget.Net40.csproj 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/BasicSample.Nuget.Net40.csproj 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/BasicSample.csproj
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/BasicSample.csproj 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/BasicSample.csproj 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/Properties/Resources.Designer.cs
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/Properties/Resources.Designer.cs 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/Properties/Resources.Designer.cs 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/Properties/Settings.Designer.cs
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/Properties/Settings.Designer.cs 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/Properties/Settings.Designer.cs 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/app.config
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/app.config 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/BasicSample/app.config 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/FreeFormExample.Net40.csproj
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/FreeFormExample.Net40.csproj 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/FreeFormExample.Net40.csproj 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/FreeFormExample.csproj
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/FreeFormExample.csproj 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/FreeFormExample.csproj 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/Properties/Resources.Designer.cs
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/Properties/Resources.Designer.cs 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/Properties/Resources.Designer.cs 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/Properties/Settings.Designer.cs
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/Properties/Settings.Designer.cs 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/Properties/Settings.Designer.cs 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/app.config
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/app.config 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/FreeFormExample/app.config 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/MgDesktopSamples.sln
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/MgDesktopSamples.sln 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/MgDesktopSamples.sln 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/MgDesktopSamples_VS2010.sln
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/MgDesktopSamples_VS2010.sln 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/MgDesktopSamples_VS2010.sln 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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
Modified: sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/ModifyingMapsAndLayers.cs
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/ModifyingMapsAndLayers.cs 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/ModifyingMapsAndLayers.cs 2014-07-04 08:45:30 UTC (rev 8279)
@@ -431,16 +431,8 @@
*/
// Here's the mg-desktop way
- MgPropertyCollection insertResult = featureService.InsertFeatures(resourceIdentifier, "Points", batchPropertyCollection);
- for (int i = 0; i < insertResult.GetCount(); i++)
- {
- MgFeatureProperty fp = insertResult.GetItem(i) as MgFeatureProperty;
- if (fp != null)
- {
- MgFeatureReader fr = fp.GetValue();
- fr.Close();
- }
- }
+ MgFeatureReader insertResult = featureService.InsertFeatures(resourceIdentifier, "Points", batchPropertyCollection);
+ insertResult.Close();
// ...
//---------------------------------------------------//
Deleted: sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/SampleExtension.Net40.csproj
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/SampleExtension.Net40.csproj 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/SampleExtension.Net40.csproj 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/SampleExtension.Nuget.Net40.csproj
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/SampleExtension.Nuget.Net40.csproj 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/SampleExtension.Nuget.Net40.csproj 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/SampleExtension.csproj
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/SampleExtension.csproj 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/SampleExtension/SampleExtension.csproj 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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: sandbox/jng/convenience_apis/Desktop/Samples/samples_readme.txt
===================================================================
--- sandbox/jng/convenience_apis/Desktop/Samples/samples_readme.txt 2014-07-04 08:18:40 UTC (rev 8278)
+++ sandbox/jng/convenience_apis/Desktop/Samples/samples_readme.txt 2014-07-04 08:45:30 UTC (rev 8279)
@@ -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
More information about the mapguide-commits
mailing list