[mapguide-commits] r8317 - in trunk/MgDev: . Desktop Desktop/Samples Desktop/Samples/AdvancedSample Desktop/Samples/BasicSample Desktop/Samples/FreeFormExample Desktop/Samples/SampleExtension

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri Aug 1 11:06:17 PDT 2014 

Author: jng
Date: 2014-08-01 11:06:17 -0700 (Fri, 01 Aug 2014)
New Revision: 8317

Modified:
   trunk/MgDev/
   trunk/MgDev/Desktop/
   trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.csproj
   trunk/MgDev/Desktop/Samples/AdvancedSample/app.config
   trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.csproj
   trunk/MgDev/Desktop/Samples/BasicSample/app.config
   trunk/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.csproj
   trunk/MgDev/Desktop/Samples/FreeFormExample/app.config
   trunk/MgDev/Desktop/Samples/MgDesktopSamples.sln
   trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.csproj
   trunk/MgDev/Desktop/Samples/samples_readme.txt
   trunk/MgDev/Desktop/samples_exclude.txt
Log:
Merged revision(s) 8314-8315 from branches/2.6/MgDev:
#2475: Fix mg-desktop sample VS projects for 64-bit
........
#2475: Update xcopy exclusion list for samples
........



Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163


Property changes on: trunk/MgDev/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
/branches/2.6/MgDev/Desktop:8276-8286
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/jng/v30/Desktop:8215-8216,8218-8219
/sandbox/rfc94/Desktop:5099-5163
   + /branches/2.4/MgDev/Desktop:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006,7152
/branches/2.5/MgDev/Desktop:7511
/branches/2.6/MgDev/Desktop:8276-8286,8314-8315
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/jng/v30/Desktop:8215-8216,8218-8219
/sandbox/rfc94/Desktop:5099-5163

Modified: trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.csproj	2014-08-01 16:52:13 UTC (rev 8316)
+++ trunk/MgDev/Desktop/Samples/AdvancedSample/AdvancedSample.csproj	2014-08-01 18:06:17 UTC (rev 8317)
@@ -20,7 +20,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AdvancedSample</RootNamespace>
     <AssemblyName>AdvancedSample</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -45,6 +45,17 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>

Modified: trunk/MgDev/Desktop/Samples/AdvancedSample/app.config
===================================================================
--- trunk/MgDev/Desktop/Samples/AdvancedSample/app.config	2014-08-01 16:52:13 UTC (rev 8316)
+++ trunk/MgDev/Desktop/Samples/AdvancedSample/app.config	2014-08-01 18:06:17 UTC (rev 8317)
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.csproj	2014-08-01 16:52:13 UTC (rev 8316)
+++ trunk/MgDev/Desktop/Samples/BasicSample/BasicSample.csproj	2014-08-01 18:06:17 UTC (rev 8317)
@@ -20,7 +20,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BasicSample</RootNamespace>
     <AssemblyName>BasicSample</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -45,6 +45,17 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.6964, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>

Modified: trunk/MgDev/Desktop/Samples/BasicSample/app.config
===================================================================
--- trunk/MgDev/Desktop/Samples/BasicSample/app.config	2014-08-01 16:52:13 UTC (rev 8316)
+++ trunk/MgDev/Desktop/Samples/BasicSample/app.config	2014-08-01 18:06:17 UTC (rev 8317)
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: trunk/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.csproj	2014-08-01 16:52:13 UTC (rev 8316)
+++ trunk/MgDev/Desktop/Samples/FreeFormExample/FreeFormExample.csproj	2014-08-01 18:06:17 UTC (rev 8317)
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FreeFormExample</RootNamespace>
     <AssemblyName>FreeFormExample</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -52,6 +52,24 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>

Modified: trunk/MgDev/Desktop/Samples/FreeFormExample/app.config
===================================================================
--- trunk/MgDev/Desktop/Samples/FreeFormExample/app.config	2014-08-01 16:52:13 UTC (rev 8316)
+++ trunk/MgDev/Desktop/Samples/FreeFormExample/app.config	2014-08-01 18:06:17 UTC (rev 8317)
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Modified: trunk/MgDev/Desktop/Samples/MgDesktopSamples.sln
===================================================================
--- trunk/MgDev/Desktop/Samples/MgDesktopSamples.sln	2014-08-01 16:52:13 UTC (rev 8316)
+++ trunk/MgDev/Desktop/Samples/MgDesktopSamples.sln	2014-08-01 18:06:17 UTC (rev 8317)
@@ -17,22 +17,28 @@
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Debug|x64.ActiveCfg = Debug|x86
+		{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Debug|x64.ActiveCfg = Debug|x64
+		{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Debug|x64.Build.0 = Debug|x64
 		{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|x64.ActiveCfg = Release|x64
+		{AB9B45B7-38BF-4FFD-B809-A23F74A6C505}.Release|x64.Build.0 = Release|x64
 		{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|x64.ActiveCfg = Debug|x64
+		{BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Debug|x64.Build.0 = Debug|x64
 		{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|x64.ActiveCfg = Release|x64
+		{BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Release|x64.Build.0 = Release|x64
 		{BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Release|x86.ActiveCfg = Release|x86
 		{BE473CB6-718D-4654-9B0F-F1F9A327BD07}.Release|x86.Build.0 = Release|x86
-		{41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Debug|x64.ActiveCfg = Debug|x86
+		{41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Debug|x64.ActiveCfg = Debug|x64
+		{41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Debug|x64.Build.0 = Debug|x64
 		{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|x64.ActiveCfg = Release|x64
+		{41EF1524-D186-4079-BAA9-1A99F0AC31CA}.Release|x64.Build.0 = Release|x64
 		{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

Modified: trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.csproj
===================================================================
--- trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.csproj	2014-08-01 16:52:13 UTC (rev 8316)
+++ trunk/MgDev/Desktop/Samples/SampleExtension/SampleExtension.csproj	2014-08-01 18:06:17 UTC (rev 8317)
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SampleExtension</RootNamespace>
     <AssemblyName>SampleExtension</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -42,7 +42,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>..\bin\Release64\</OutputPath>
+    <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>

Modified: trunk/MgDev/Desktop/Samples/samples_readme.txt
===================================================================
--- trunk/MgDev/Desktop/Samples/samples_readme.txt	2014-08-01 16:52:13 UTC (rev 8316)
+++ trunk/MgDev/Desktop/Samples/samples_readme.txt	2014-08-01 18:06:17 UTC (rev 8317)
@@ -3,7 +3,7 @@
 
 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 4.5, VC11 build
+ - MgDesktopSamples.sln: mg-desktop .net Framework 4.0, VC11 build
 
 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
 

Modified: trunk/MgDev/Desktop/samples_exclude.txt
===================================================================
--- trunk/MgDev/Desktop/samples_exclude.txt	2014-08-01 16:52:13 UTC (rev 8316)
+++ trunk/MgDev/Desktop/samples_exclude.txt	2014-08-01 18:06:17 UTC (rev 8317)
@@ -1,6 +1,5 @@
 bin
 obj
-Lib
 .svn
 _svn
 .suo
\ No newline at end of file

More information about the mapguide-commits mailing list