[mapguide-commits] r8024 - in trunk/Tools/MgInstantSetup: . InstantSetup InstantSetup/Properties InstantSetup.Core InstantSetup.Core/Properties
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Apr 9 08:40:32 PDT 2014
Author: jng
Date: 2014-04-09 08:40:32 -0700 (Wed, 09 Apr 2014)
New Revision: 8024
Modified:
trunk/Tools/MgInstantSetup/InstantSetup.Core/ApacheSetupConfigurationProcess.cs
trunk/Tools/MgInstantSetup/InstantSetup.Core/InstantSetup.Core.csproj
trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/Resources.Designer.cs
trunk/Tools/MgInstantSetup/InstantSetup.Core/app.config
trunk/Tools/MgInstantSetup/InstantSetup/InstantSetup.csproj
trunk/Tools/MgInstantSetup/InstantSetup/Properties/Resources.Designer.cs
trunk/Tools/MgInstantSetup/InstantSetup/Properties/Settings.Designer.cs
trunk/Tools/MgInstantSetup/InstantSetup/app.config
trunk/Tools/MgInstantSetup/MgInstantSetup.sln
Log:
MgInstantSetup update:
- Move to VS2012 / .net 4.0
- Default Apache dir name to "Apache24"
Modified: trunk/Tools/MgInstantSetup/InstantSetup/InstantSetup.csproj
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup/InstantSetup.csproj 2014-04-09 15:39:35 UTC (rev 8023)
+++ trunk/Tools/MgInstantSetup/InstantSetup/InstantSetup.csproj 2014-04-09 15:40:32 UTC (rev 8024)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,11 +10,14 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>InstantSetup</RootNamespace>
<AssemblyName>InstantSetup</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkSubset>
- </TargetFrameworkSubset>
<ApplicationManifest>app.manifest</ApplicationManifest>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/Tools/MgInstantSetup/InstantSetup/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup/Properties/Resources.Designer.cs 2014-04-09 15:39:35 UTC (rev 8023)
+++ trunk/Tools/MgInstantSetup/InstantSetup/Properties/Resources.Designer.cs 2014-04-09 15:40:32 UTC (rev 8024)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4952
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/Tools/MgInstantSetup/InstantSetup/Properties/Settings.Designer.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup/Properties/Settings.Designer.cs 2014-04-09 15:39:35 UTC (rev 8023)
+++ trunk/Tools/MgInstantSetup/InstantSetup/Properties/Settings.Designer.cs 2014-04-09 15:40:32 UTC (rev 8024)
@@ -1,28 +1,24 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4952
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
-namespace InstantSetup.Properties
-{
-
-
+namespace InstantSetup.Properties {
+
+
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
- {
-
+ [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())));
-
- public static Settings Default
- {
- get
- {
+
+ public static Settings Default {
+ get {
return defaultInstance;
}
}
Modified: trunk/Tools/MgInstantSetup/InstantSetup/app.config
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup/app.config 2014-04-09 15:39:35 UTC (rev 8023)
+++ trunk/Tools/MgInstantSetup/InstantSetup/app.config 2014-04-09 15:40:32 UTC (rev 8024)
@@ -1,3 +1,3 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<configuration>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+ <startup/></configuration>
Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/ApacheSetupConfigurationProcess.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/ApacheSetupConfigurationProcess.cs 2014-04-09 15:39:35 UTC (rev 8023)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/ApacheSetupConfigurationProcess.cs 2014-04-09 15:40:32 UTC (rev 8024)
@@ -35,7 +35,7 @@
this.VirtualDirectoryName = "mapguide";
this.HttpdServiceName = "ApacheMapGuide";
- this.ApacheDirName = "Apache2";
+ this.ApacheDirName = "Apache24";
}
public bool EnableJava { get; set; }
Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/InstantSetup.Core.csproj
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/InstantSetup.Core.csproj 2014-04-09 15:39:35 UTC (rev 8023)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/InstantSetup.Core.csproj 2014-04-09 15:40:32 UTC (rev 8024)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +10,13 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>InstantSetup.Core</RootNamespace>
<AssemblyName>InstantSetup.Core</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkSubset>
- </TargetFrameworkSubset>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/Resources.Designer.cs 2014-04-09 15:39:35 UTC (rev 8023)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/Resources.Designer.cs 2014-04-09 15:40:32 UTC (rev 8024)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.5420
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/app.config
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/app.config 2014-04-09 15:39:35 UTC (rev 8023)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/app.config 2014-04-09 15:40:32 UTC (rev 8024)
@@ -1,3 +1,3 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<configuration>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+ <startup/></configuration>
Modified: trunk/Tools/MgInstantSetup/MgInstantSetup.sln
===================================================================
--- trunk/Tools/MgInstantSetup/MgInstantSetup.sln 2014-04-09 15:39:35 UTC (rev 8023)
+++ trunk/Tools/MgInstantSetup/MgInstantSetup.sln 2014-04-09 15:40:32 UTC (rev 8024)
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstantSetup.Core", "InstantSetup.Core\InstantSetup.Core.csproj", "{70F74850-DC74-431E-993D-8200E13B026A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstantSetup", "InstantSetup\InstantSetup.csproj", "{72CDEB87-1ED2-4177-8C00-962E79F36CA6}"
More information about the mapguide-commits
mailing list