[mapguide-commits] r8502 - in trunk/Tools/Maestro: LocalConfigure LocalConfigure/Properties Maestro Maestro/Properties Maestro/packages Maestro.AddIn.ExtendedObjectModels Maestro.AddIn.ExtendedObjectModels/Properties Maestro.AddIn.FdoToolbox Maestro.AddIn.FdoToolbox/Properties Maestro.AddIn.Local Maestro.AddIn.Local/Properties Maestro.AddIn.Scripting Maestro.AddIn.Scripting/Properties Maestro.AddInManager Maestro.Base Maestro.Base/Properties Maestro.Editors Maestro.Editors/Properties Maestro.LiveMapEditor Maestro.LiveMapEditor/Properties Maestro.Login Maestro.MapViewer Maestro.MapViewer/Properties Maestro.Packaging Maestro.Packaging/Properties Maestro.Shared.UI Maestro.Shared.UI/Properties MaestroAPITestRunner MaestroAPITests MaestroAPITests/Properties MaestroFsPreview MaestroFsPreview/Properties MgCooker MgCooker/Properties MgCooker.Cmd MpuCalc OSGeo.MapGuide.MaestroAPI OSGeo.MapGuide.MaestroAPI/Properties OSGeo.MapGuide.MaestroAPI.Http OSGeo.MapGuide.MaestroAPI.Local OSGeo.MapGuide.M aestroAPI.Native OSGeo.MapGuide.MaestroAPI.Tests OSGeo.MapGuide.MaestroAPI.Tests/Properties OSGeo.MapGuide.ObjectModel.Tests OSGeo.MapGuide.ObjectModel.Tests/Properties OSGeo.MapGuide.ObjectModels ProviderTemplate ProviderTemplate/Properties RtMapInspector RtMapInspector/Properties SignMapGuideApi Thirdparty/SharpDevelop/ICSharpCode.Core Thirdparty/SharpDevelop/ICSharpCode.Core.WinForms Thirdparty/SharpDevelop/ICSharpCode.TextEditor
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Jan 18 04:21:15 PST 2015
Author: jng
Date: 2015-01-18 04:21:15 -0800 (Sun, 18 Jan 2015)
New Revision: 8502
Modified:
trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj
trunk/Tools/Maestro/LocalConfigure/Properties/Resources.Designer.cs
trunk/Tools/Maestro/LocalConfigure/app.config
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config
trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Maestro.AddIn.FdoToolbox.csproj
trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config
trunk/Tools/Maestro/Maestro.AddIn.Local/
trunk/Tools/Maestro/Maestro.AddIn.Local/CS_Comp.exe
trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/app.config
trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config
trunk/Tools/Maestro/Maestro.AddIn.Scripting/
trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj
trunk/Tools/Maestro/Maestro.AddIn.Scripting/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config
trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config
trunk/Tools/Maestro/Maestro.AddInManager/Maestro.AddInManager.csproj
trunk/Tools/Maestro/Maestro.AddInManager/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.AddInManager/packages.config
trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.Base/app.config
trunk/Tools/Maestro/Maestro.Base/packages.config
trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/packages.config
trunk/Tools/Maestro/Maestro.LiveMapEditor/Maestro.LiveMapEditor.csproj
trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/Settings.Designer.cs
trunk/Tools/Maestro/Maestro.LiveMapEditor/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.LiveMapEditor/app.config
trunk/Tools/Maestro/Maestro.Login/Maestro.Login.csproj
trunk/Tools/Maestro/Maestro.Login/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.MapViewer/Maestro.MapViewer.csproj
trunk/Tools/Maestro/Maestro.MapViewer/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj
trunk/Tools/Maestro/Maestro.Packaging/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Packaging/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.Packaging/packages.config
trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj
trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Shared.UI/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.Shared.UI/packages.config
trunk/Tools/Maestro/Maestro/App.config
trunk/Tools/Maestro/Maestro/Maestro.csproj
trunk/Tools/Maestro/Maestro/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro/Properties/Settings.Designer.cs
trunk/Tools/Maestro/Maestro/Strings.Designer.cs
trunk/Tools/Maestro/Maestro/packages.config
trunk/Tools/Maestro/Maestro/packages/
trunk/Tools/Maestro/Maestro/packages/repositories.config
trunk/Tools/Maestro/MaestroAPITestRunner/App.config
trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj
trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj
trunk/Tools/Maestro/MaestroAPITestRunner/packages.config
trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
trunk/Tools/Maestro/MaestroAPITests/Properties/Resources.Designer.cs
trunk/Tools/Maestro/MaestroAPITests/packages.config
trunk/Tools/Maestro/MaestroFsPreview/MaestroFsPreview.csproj
trunk/Tools/Maestro/MaestroFsPreview/Properties/Resources.Designer.cs
trunk/Tools/Maestro/MaestroFsPreview/Properties/Settings.Designer.cs
trunk/Tools/Maestro/MaestroFsPreview/app.config
trunk/Tools/Maestro/MgCooker.Cmd/MgCooker.Cmd.csproj
trunk/Tools/Maestro/MgCooker.Cmd/app.config
trunk/Tools/Maestro/MgCooker/MgCooker.csproj
trunk/Tools/Maestro/MgCooker/Properties/Resources.Designer.cs
trunk/Tools/Maestro/MgCooker/Properties/Settings.Designer.cs
trunk/Tools/Maestro/MgCooker/Strings.Designer.cs
trunk/Tools/Maestro/MgCooker/app.config
trunk/Tools/Maestro/MpuCalc/App.config
trunk/Tools/Maestro/MpuCalc/MpuCalc.csproj
trunk/Tools/Maestro/MpuCalc/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Files.Designer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Strings.Designer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Properties/Resources.Designer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Strings.Designer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/OSGeo.MapGuide.ObjectModels.Tests.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/Properties/Resources.Designer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/OSGeo.MapGuide.ObjectModels.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Strings.Designer.cs
trunk/Tools/Maestro/ProviderTemplate/Properties/Resources.Designer.cs
trunk/Tools/Maestro/ProviderTemplate/Properties/Settings.Designer.cs
trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj
trunk/Tools/Maestro/RtMapInspector/Properties/Resources.Designer.cs
trunk/Tools/Maestro/RtMapInspector/Properties/Settings.Designer.cs
trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj
trunk/Tools/Maestro/RtMapInspector/Strings.Designer.cs
trunk/Tools/Maestro/RtMapInspector/app.config
trunk/Tools/Maestro/SignMapGuideApi/SignMapGuideApi.csproj
trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj
trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core/ICSharpCode.Core.csproj
trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.TextEditor/ICSharpCode.TextEditor.csproj
Log:
#2522: Update projects to .net Framework 4.5
Modified: trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,14 +10,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LocalConfigure</RootNamespace>
<AssemblyName>LocalConfigure</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -42,6 +43,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -50,6 +52,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Tools/Maestro/LocalConfigure/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/LocalConfigure/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -62,7 +62,7 @@
/// <summary>
/// Looks up a localized string similar to # *****************************************************************************
- ///# MapGuide Server Configuration File
+ ///# MapGuide Desktop Platform Configuration File
///#
///# The following configuration is based on a single CPU with a single core.
///#
@@ -74,7 +74,7 @@
///# *****************************************************************************
///# COMMON VALIDATION INFORMATION
///#
- ///# (Unless otherwise noted und [rest of string was truncated]";.
+ ///# (Unless otherwise [rest of string was truncated]";.
/// </summary>
internal static string Platform {
get {
Modified: trunk/Tools/Maestro/LocalConfigure/app.config
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/app.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/LocalConfigure/app.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: trunk/Tools/Maestro/Maestro/App.config
===================================================================
--- trunk/Tools/Maestro/Maestro/App.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro/App.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<!--
If you use the Local Native Connection, setup assembly binding redirection by
@@ -28,7 +28,7 @@
</runtime>
-->
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
<!--
Uncomment the section below for proxy server support.
@@ -43,9 +43,9 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+ <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: trunk/Tools/Maestro/Maestro/Maestro.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro/Maestro.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro/Maestro.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Maestro</RootNamespace>
<AssemblyName>Maestro</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ApplicationIcon>MapGuide Maestro.ico</ApplicationIcon>
<FileUpgradeFlags>
@@ -48,6 +48,7 @@
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -58,6 +59,7 @@
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject>Maestro.Program</StartupObject>
@@ -71,14 +73,20 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SDK\bin\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
- <Reference Include="IronPython, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <Reference Include="IronPython, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>packages\IronPython.2.7.4\lib\Net40\IronPython.dll</HintPath>
+ <HintPath>packages\IronPython.2.7.5\lib\Net45\IronPython.dll</HintPath>
</Reference>
- <Reference Include="IronPython.Modules, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <Reference Include="IronPython.Modules, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>packages\IronPython.2.7.4\lib\Net40\IronPython.Modules.dll</HintPath>
+ <HintPath>packages\IronPython.2.7.5\lib\Net45\IronPython.Modules.dll</HintPath>
</Reference>
+ <Reference Include="IronPython.SQLite">
+ <HintPath>packages\IronPython.2.7.5\lib\Net45\IronPython.SQLite.dll</HintPath>
+ </Reference>
+ <Reference Include="IronPython.Wpf">
+ <HintPath>packages\IronPython.2.7.5\lib\Net45\IronPython.Wpf.dll</HintPath>
+ </Reference>
<Reference Include="Maestro.Editors, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SDK\bin\Maestro.Editors.dll</HintPath>
@@ -97,15 +105,18 @@
</Reference>
<Reference Include="Microsoft.Dynamic, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>packages\IronPython.2.7.4\lib\Net40\Microsoft.Dynamic.dll</HintPath>
+ <HintPath>packages\IronPython.2.7.5\lib\Net45\Microsoft.Dynamic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>packages\IronPython.2.7.4\lib\Net40\Microsoft.Scripting.dll</HintPath>
+ <HintPath>packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.dll</HintPath>
</Reference>
+ <Reference Include="Microsoft.Scripting.AspNet">
+ <HintPath>packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.AspNet.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Scripting.Metadata, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>packages\IronPython.2.7.4\lib\Net40\Microsoft.Scripting.Metadata.dll</HintPath>
+ <HintPath>packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.Metadata.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Modified: trunk/Tools/Maestro/Maestro/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro/Properties/Settings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/Properties/Settings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro/Properties/Settings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.34209
//
// 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", "12.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/Tools/Maestro/Maestro/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Property changes on: trunk/Tools/Maestro/Maestro/packages
___________________________________________________________________
Modified: svn:ignore
- DockPanelSuite.2.9.0.0
fleesharp.0.9.27-pre
IronPython.2.7.4
IronPython.StdLib.2.7.4
NUnit.2.6.3
SharpZipLib.0.86.0
TreeViewAdv.1.7.0.0
mapguide-api-base-x86.2.5.2.7949
mg-desktop-net40-x86.2.5.2.7949
mg-desktop-viewer-net40-x86.2.5.2.7949
RestSharp.105.0.1
Moq.4.2.1409.1722
NUnit.2.6.2
+ DockPanelSuite.2.9.0.0
fleesharp.0.9.27-pre
IronPython.2.7.4
IronPython.StdLib.2.7.4
NUnit.2.6.3
SharpZipLib.0.86.0
TreeViewAdv.1.7.0.0
mapguide-api-base-x86.2.5.2.7949
mg-desktop-net40-x86.2.5.2.7949
mg-desktop-viewer-net40-x86.2.5.2.7949
RestSharp.105.0.1
Moq.4.2.1409.1722
NUnit.2.6.2
IronPython.2.7.5
IronPython.StdLib.2.7.5
Irony.0.9.0
mapguide-api-base-x86.2.6.0.8316
mg-desktop-viewer-x86.2.6.0.8316
mg-desktop-x86.2.6.0.8316
Modified: trunk/Tools/Maestro/Maestro/packages/repositories.config
===================================================================
--- trunk/Tools/Maestro/Maestro/packages/repositories.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro/packages/repositories.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,6 +10,7 @@
<repository path="..\..\MaestroAPITestRunner\packages.config" />
<repository path="..\..\MaestroAPITests\packages.config" />
<repository path="..\..\MpuCalc\packages.config" />
+ <repository path="..\..\OSGeo.MapGuide.MaestroAPI.Expressions\packages.config" />
<repository path="..\..\OSGeo.MapGuide.MaestroAPI.Local\packages.config" />
<repository path="..\..\OSGeo.MapGuide.MaestroAPI.Tests\packages.config" />
<repository path="..\..\OSGeo.MapGuide.MaestroAPI\packages.config" />
Modified: trunk/Tools/Maestro/Maestro/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="IronPython" version="2.7.4" targetFramework="net40" />
+ <package id="IronPython" version="2.7.5" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Maestro.AddIn.ExtendedObjectModels</RootNamespace>
<AssemblyName>Maestro.AddIn.ExtendedObjectModels</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -43,6 +43,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -53,6 +54,7 @@
<WarningLevel>4</WarningLevel>
<DocumentationFile>
</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+ <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Modified: trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Maestro.AddIn.FdoToolbox.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Maestro.AddIn.FdoToolbox.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Maestro.AddIn.FdoToolbox.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Maestro.AddIn.FdoToolbox</RootNamespace>
<AssemblyName>Maestro.AddIn.FdoToolbox</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -43,6 +43,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -51,6 +52,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+ <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Property changes on: trunk/Tools/Maestro/Maestro.AddIn.Local
___________________________________________________________________
Modified: svn:externals
- Dictionaries http://svn.osgeo.org/metacrs/csmap/branches/14.00/CsMapDev/Dictionaries
+ http://svn.osgeo.org/metacrs/csmap/branches/14.01/CsMapDev/Dictionaries Dictionaries
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/CS_Comp.exe
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Maestro.AddIn.Local</RootNamespace>
<AssemblyName>Maestro.AddIn.Local</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -46,6 +46,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -55,25 +56,32 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop">
- <HintPath>..\Maestro\packages\mg-desktop-net40-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.Desktop, Version=2.6.0.8316, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro\packages\mg-desktop-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.Foundation, Version=2.6.0.8316, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.Geometry, Version=2.6.0.8316, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.6.0.8316, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.Viewer">
- <HintPath>..\Maestro\packages\mg-desktop-viewer-net40-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.Viewer.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.Viewer, Version=2.6.0.8316, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro\packages\mg-desktop-viewer-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Viewer.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.Viewer.Desktop">
- <HintPath>..\Maestro\packages\mg-desktop-viewer-net40-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.Viewer.Desktop.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.Viewer.Desktop, Version=2.6.0.8316, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro\packages\mg-desktop-viewer-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Viewer.Desktop.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -746,7 +754,7 @@
</Target>
<PropertyGroup>
<PostBuildEvent>
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.5.2.7949\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-net40-x86.2.5.2.7949\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.6.0.8316\mapguide-api-base\*.*" "$(TargetDir)"
+xcopy /s /y "$(SolutionDir)packages\mg-desktop-x86.2.6.0.8316\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18034
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18034
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/app.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/app.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+ <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net40" />
- <package id="mg-desktop-net40-x86" version="2.5.2.7949" targetFramework="net40" />
- <package id="mg-desktop-viewer-net40-x86" version="2.5.2.7949" targetFramework="net40" />
+ <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net40" />
+ <package id="mapguide-api-base-x86" version="2.6.0.8316" targetFramework="net45" />
+ <package id="mg-desktop-net40-x86" version="2.5.2.7949" targetFramework="net40" />
+ <package id="mg-desktop-viewer-net40-x86" version="2.5.2.7949" targetFramework="net40" />
+ <package id="mg-desktop-viewer-x86" version="2.6.0.8316" targetFramework="net45" />
+ <package id="mg-desktop-x86" version="2.6.0.8316" targetFramework="net45" />
</packages>
\ No newline at end of file
Property changes on: trunk/Tools/Maestro/Maestro.AddIn.Scripting
___________________________________________________________________
Modified: svn:ignore
- bin
obj
+ bin
obj
Lib
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,10 +10,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Maestro.AddIn.Scripting</RootNamespace>
<AssemblyName>Maestro.AddIn.Scripting</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
<RestorePackages>true</RestorePackages>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -24,6 +25,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\out\Debug\AddIns\Scripting\Maestro.AddIn.Scripting.XML</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -33,27 +35,32 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\out\Release\AddIns\Scripting\Maestro.AddIn.Scripting.XML</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="IronPython">
- <HintPath>..\Maestro\packages\IronPython.2.7.4\lib\Net40\IronPython.dll</HintPath>
- <Private>False</Private>
+ <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\IronPython.dll</HintPath>
</Reference>
<Reference Include="IronPython.Modules">
- <HintPath>..\Maestro\packages\IronPython.2.7.4\lib\Net40\IronPython.Modules.dll</HintPath>
- <Private>False</Private>
+ <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\IronPython.Modules.dll</HintPath>
</Reference>
+ <Reference Include="IronPython.SQLite">
+ <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\IronPython.SQLite.dll</HintPath>
+ </Reference>
+ <Reference Include="IronPython.Wpf">
+ <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\IronPython.Wpf.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Dynamic">
- <HintPath>..\Maestro\packages\IronPython.2.7.4\lib\Net40\Microsoft.Dynamic.dll</HintPath>
- <Private>False</Private>
+ <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\Microsoft.Dynamic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Scripting">
- <HintPath>..\Maestro\packages\IronPython.2.7.4\lib\Net40\Microsoft.Scripting.dll</HintPath>
- <Private>False</Private>
+ <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.dll</HintPath>
</Reference>
+ <Reference Include="Microsoft.Scripting.AspNet">
+ <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.AspNet.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Scripting.Metadata">
- <HintPath>..\Maestro\packages\IronPython.2.7.4\lib\Net40\Microsoft.Scripting.Metadata.dll</HintPath>
- <Private>False</Private>
+ <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.Metadata.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -104,10 +111,521 @@
</Compile>
</ItemGroup>
<ItemGroup>
+ <Content Include="Lib\abc.py" />
+ <Content Include="Lib\aifc.py" />
+ <Content Include="Lib\antigravity.py" />
+ <Content Include="Lib\anydbm.py" />
+ <Content Include="Lib\argparse.py" />
+ <Content Include="Lib\ast.py" />
+ <Content Include="Lib\asynchat.py" />
+ <Content Include="Lib\asyncore.py" />
+ <Content Include="Lib\atexit.py" />
+ <Content Include="Lib\audiodev.py" />
+ <Content Include="Lib\base64.py" />
+ <Content Include="Lib\BaseHTTPServer.py" />
+ <Content Include="Lib\Bastion.py" />
+ <Content Include="Lib\bdb.py" />
+ <Content Include="Lib\binhex.py" />
+ <Content Include="Lib\bisect.py" />
+ <Content Include="Lib\calendar.py" />
+ <Content Include="Lib\cgi.py" />
+ <Content Include="Lib\CGIHTTPServer.py" />
+ <Content Include="Lib\cgitb.py" />
+ <Content Include="Lib\chunk.py" />
+ <Content Include="Lib\cmd.py" />
+ <Content Include="Lib\code.py" />
+ <Content Include="Lib\codecs.py" />
+ <Content Include="Lib\codeop.py" />
+ <Content Include="Lib\collections.py" />
+ <Content Include="Lib\colorsys.py" />
+ <Content Include="Lib\commands.py" />
+ <Content Include="Lib\compileall.py" />
+ <Content Include="Lib\ConfigParser.py" />
+ <Content Include="Lib\contextlib.py" />
+ <Content Include="Lib\Cookie.py" />
+ <Content Include="Lib\cookielib.py" />
+ <Content Include="Lib\copy.py" />
+ <Content Include="Lib\csv.py" />
+ <Content Include="Lib\ctypes\macholib\dyld.py" />
+ <Content Include="Lib\ctypes\macholib\dylib.py" />
+ <Content Include="Lib\ctypes\macholib\framework.py" />
+ <Content Include="Lib\ctypes\macholib\__init__.py" />
+ <Content Include="Lib\ctypes\util.py" />
+ <Content Include="Lib\ctypes\wintypes.py" />
+ <Content Include="Lib\ctypes\_endian.py" />
+ <Content Include="Lib\ctypes\__init__.py" />
+ <Content Include="Lib\decimal.py" />
+ <Content Include="Lib\difflib.py" />
+ <Content Include="Lib\dircache.py" />
+ <Content Include="Lib\dis.py" />
+ <Content Include="Lib\distutils\archive_util.py" />
+ <Content Include="Lib\distutils\bcppcompiler.py" />
+ <Content Include="Lib\distutils\ccompiler.py" />
+ <Content Include="Lib\distutils\cmd.py" />
+ <Content Include="Lib\distutils\command\bdist.py" />
+ <Content Include="Lib\distutils\command\bdist_dumb.py" />
+ <Content Include="Lib\distutils\command\bdist_rpm.py" />
+ <Content Include="Lib\distutils\command\bdist_wininst.py" />
+ <Content Include="Lib\distutils\command\build.py" />
+ <Content Include="Lib\distutils\command\build_clib.py" />
+ <Content Include="Lib\distutils\command\build_ext.py" />
+ <Content Include="Lib\distutils\command\build_py.py" />
+ <Content Include="Lib\distutils\command\build_scripts.py" />
+ <Content Include="Lib\distutils\command\check.py" />
+ <Content Include="Lib\distutils\command\clean.py" />
+ <Content Include="Lib\distutils\command\config.py" />
+ <Content Include="Lib\distutils\command\install.py" />
+ <Content Include="Lib\distutils\command\install_data.py" />
+ <Content Include="Lib\distutils\command\install_egg_info.py" />
+ <Content Include="Lib\distutils\command\install_headers.py" />
+ <Content Include="Lib\distutils\command\install_lib.py" />
+ <Content Include="Lib\distutils\command\install_scripts.py" />
+ <Content Include="Lib\distutils\command\register.py" />
+ <Content Include="Lib\distutils\command\sdist.py" />
+ <Content Include="Lib\distutils\command\upload.py" />
+ <Content Include="Lib\distutils\command\__init__.py" />
+ <Content Include="Lib\distutils\config.py" />
+ <Content Include="Lib\distutils\core.py" />
+ <Content Include="Lib\distutils\cygwinccompiler.py" />
+ <Content Include="Lib\distutils\debug.py" />
+ <Content Include="Lib\distutils\dep_util.py" />
+ <Content Include="Lib\distutils\dir_util.py" />
+ <Content Include="Lib\distutils\dist.py" />
+ <Content Include="Lib\distutils\emxccompiler.py" />
+ <Content Include="Lib\distutils\errors.py" />
+ <Content Include="Lib\distutils\extension.py" />
+ <Content Include="Lib\distutils\fancy_getopt.py" />
+ <Content Include="Lib\distutils\filelist.py" />
+ <Content Include="Lib\distutils\file_util.py" />
+ <Content Include="Lib\distutils\log.py" />
+ <Content Include="Lib\distutils\msvccompiler.py" />
+ <Content Include="Lib\distutils\spawn.py" />
+ <Content Include="Lib\distutils\sysconfig.py" />
+ <Content Include="Lib\distutils\text_file.py" />
+ <Content Include="Lib\distutils\unixccompiler.py" />
+ <Content Include="Lib\distutils\util.py" />
+ <Content Include="Lib\distutils\version.py" />
+ <Content Include="Lib\distutils\versionpredicate.py" />
+ <Content Include="Lib\distutils\__init__.py" />
+ <Content Include="Lib\doctest.py" />
+ <Content Include="Lib\DocXMLRPCServer.py" />
+ <Content Include="Lib\dumbdbm.py" />
+ <Content Include="Lib\dummy_thread.py" />
+ <Content Include="Lib\dummy_threading.py" />
+ <Content Include="Lib\email\base64mime.py" />
+ <Content Include="Lib\email\charset.py" />
+ <Content Include="Lib\email\encoders.py" />
+ <Content Include="Lib\email\errors.py" />
+ <Content Include="Lib\email\feedparser.py" />
+ <Content Include="Lib\email\generator.py" />
+ <Content Include="Lib\email\header.py" />
+ <Content Include="Lib\email\iterators.py" />
+ <Content Include="Lib\email\message.py" />
+ <Content Include="Lib\email\mime\application.py" />
+ <Content Include="Lib\email\mime\audio.py" />
+ <Content Include="Lib\email\mime\base.py" />
+ <Content Include="Lib\email\mime\image.py" />
+ <Content Include="Lib\email\mime\message.py" />
+ <Content Include="Lib\email\mime\multipart.py" />
+ <Content Include="Lib\email\mime\nonmultipart.py" />
+ <Content Include="Lib\email\mime\text.py" />
+ <Content Include="Lib\email\mime\__init__.py" />
+ <Content Include="Lib\email\parser.py" />
+ <Content Include="Lib\email\quoprimime.py" />
+ <Content Include="Lib\email\utils.py" />
+ <Content Include="Lib\email\_parseaddr.py" />
+ <Content Include="Lib\email\__init__.py" />
+ <Content Include="Lib\encodings\aliases.py" />
+ <Content Include="Lib\encodings\ascii.py" />
+ <Content Include="Lib\encodings\base64_codec.py" />
+ <Content Include="Lib\encodings\bz2_codec.py" />
+ <Content Include="Lib\encodings\charmap.py" />
+ <Content Include="Lib\encodings\cp037.py" />
+ <Content Include="Lib\encodings\cp1006.py" />
+ <Content Include="Lib\encodings\cp1026.py" />
+ <Content Include="Lib\encodings\cp1140.py" />
+ <Content Include="Lib\encodings\cp1250.py" />
+ <Content Include="Lib\encodings\cp1251.py" />
+ <Content Include="Lib\encodings\cp1252.py" />
+ <Content Include="Lib\encodings\cp1253.py" />
+ <Content Include="Lib\encodings\cp1254.py" />
+ <Content Include="Lib\encodings\cp1255.py" />
+ <Content Include="Lib\encodings\cp1256.py" />
+ <Content Include="Lib\encodings\cp1257.py" />
+ <Content Include="Lib\encodings\cp1258.py" />
+ <Content Include="Lib\encodings\cp424.py" />
+ <Content Include="Lib\encodings\cp437.py" />
+ <Content Include="Lib\encodings\cp500.py" />
+ <Content Include="Lib\encodings\cp720.py" />
+ <Content Include="Lib\encodings\cp737.py" />
+ <Content Include="Lib\encodings\cp775.py" />
+ <Content Include="Lib\encodings\cp850.py" />
+ <Content Include="Lib\encodings\cp852.py" />
+ <Content Include="Lib\encodings\cp855.py" />
+ <Content Include="Lib\encodings\cp856.py" />
+ <Content Include="Lib\encodings\cp857.py" />
+ <Content Include="Lib\encodings\cp858.py" />
+ <Content Include="Lib\encodings\cp860.py" />
+ <Content Include="Lib\encodings\cp861.py" />
+ <Content Include="Lib\encodings\cp862.py" />
+ <Content Include="Lib\encodings\cp863.py" />
+ <Content Include="Lib\encodings\cp864.py" />
+ <Content Include="Lib\encodings\cp865.py" />
+ <Content Include="Lib\encodings\cp866.py" />
+ <Content Include="Lib\encodings\cp869.py" />
+ <Content Include="Lib\encodings\cp874.py" />
+ <Content Include="Lib\encodings\cp875.py" />
+ <Content Include="Lib\encodings\hex_codec.py" />
+ <Content Include="Lib\encodings\hp_roman8.py" />
+ <Content Include="Lib\encodings\idna.py" />
+ <Content Include="Lib\encodings\iso8859_1.py" />
+ <Content Include="Lib\encodings\iso8859_10.py" />
+ <Content Include="Lib\encodings\iso8859_11.py" />
+ <Content Include="Lib\encodings\iso8859_13.py" />
+ <Content Include="Lib\encodings\iso8859_14.py" />
+ <Content Include="Lib\encodings\iso8859_15.py" />
+ <Content Include="Lib\encodings\iso8859_16.py" />
+ <Content Include="Lib\encodings\iso8859_2.py" />
+ <Content Include="Lib\encodings\iso8859_3.py" />
+ <Content Include="Lib\encodings\iso8859_4.py" />
+ <Content Include="Lib\encodings\iso8859_5.py" />
+ <Content Include="Lib\encodings\iso8859_6.py" />
+ <Content Include="Lib\encodings\iso8859_7.py" />
+ <Content Include="Lib\encodings\iso8859_8.py" />
+ <Content Include="Lib\encodings\iso8859_9.py" />
+ <Content Include="Lib\encodings\koi8_r.py" />
+ <Content Include="Lib\encodings\koi8_u.py" />
+ <Content Include="Lib\encodings\latin_1.py" />
+ <Content Include="Lib\encodings\mac_arabic.py" />
+ <Content Include="Lib\encodings\mac_centeuro.py" />
+ <Content Include="Lib\encodings\mac_croatian.py" />
+ <Content Include="Lib\encodings\mac_cyrillic.py" />
+ <Content Include="Lib\encodings\mac_farsi.py" />
+ <Content Include="Lib\encodings\mac_greek.py" />
+ <Content Include="Lib\encodings\mac_iceland.py" />
+ <Content Include="Lib\encodings\mac_latin2.py" />
+ <Content Include="Lib\encodings\mac_roman.py" />
+ <Content Include="Lib\encodings\mac_romanian.py" />
+ <Content Include="Lib\encodings\mac_turkish.py" />
+ <Content Include="Lib\encodings\mbcs.py" />
+ <Content Include="Lib\encodings\palmos.py" />
+ <Content Include="Lib\encodings\ptcp154.py" />
+ <Content Include="Lib\encodings\punycode.py" />
+ <Content Include="Lib\encodings\quopri_codec.py" />
+ <Content Include="Lib\encodings\raw_unicode_escape.py" />
+ <Content Include="Lib\encodings\rot_13.py" />
+ <Content Include="Lib\encodings\string_escape.py" />
+ <Content Include="Lib\encodings\tis_620.py" />
+ <Content Include="Lib\encodings\undefined.py" />
+ <Content Include="Lib\encodings\unicode_escape.py" />
+ <Content Include="Lib\encodings\unicode_internal.py" />
+ <Content Include="Lib\encodings\utf_16.py" />
+ <Content Include="Lib\encodings\utf_16_be.py" />
+ <Content Include="Lib\encodings\utf_16_le.py" />
+ <Content Include="Lib\encodings\utf_32.py" />
+ <Content Include="Lib\encodings\utf_32_le.py" />
+ <Content Include="Lib\encodings\utf_7.py" />
+ <Content Include="Lib\encodings\utf_8.py" />
+ <Content Include="Lib\encodings\utf_8_sig.py" />
+ <Content Include="Lib\encodings\uu_codec.py" />
+ <Content Include="Lib\encodings\zlib_codec.py" />
+ <Content Include="Lib\encodings\__init__.py" />
+ <Content Include="Lib\ensurepip\_uninstall.py" />
+ <Content Include="Lib\ensurepip\__init__.py" />
+ <Content Include="Lib\ensurepip\__main__.py" />
+ <Content Include="Lib\filecmp.py" />
+ <Content Include="Lib\fileinput.py" />
+ <Content Include="Lib\fnmatch.py" />
+ <Content Include="Lib\formatter.py" />
+ <Content Include="Lib\fpformat.py" />
+ <Content Include="Lib\fractions.py" />
+ <Content Include="Lib\ftplib.py" />
+ <Content Include="Lib\functools.py" />
+ <Content Include="Lib\genericpath.py" />
+ <Content Include="Lib\getopt.py" />
+ <Content Include="Lib\getpass.py" />
+ <Content Include="Lib\gettext.py" />
+ <Content Include="Lib\glob.py" />
+ <Content Include="Lib\gzip.py" />
+ <Content Include="Lib\hashlib.py" />
+ <Content Include="Lib\heapq.py" />
+ <Content Include="Lib\hmac.py" />
+ <Content Include="Lib\htmlentitydefs.py" />
+ <Content Include="Lib\htmllib.py" />
+ <Content Include="Lib\HTMLParser.py" />
+ <Content Include="Lib\httplib.py" />
+ <Content Include="Lib\ihooks.py" />
+ <Content Include="Lib\imaplib.py" />
+ <Content Include="Lib\imghdr.py" />
+ <Content Include="Lib\importlib\__init__.py" />
+ <Content Include="Lib\imputil.py" />
+ <Content Include="Lib\inspect.py" />
+ <Content Include="Lib\io.py" />
+ <Content Include="Lib\json\decoder.py" />
+ <Content Include="Lib\json\encoder.py" />
+ <Content Include="Lib\json\scanner.py" />
+ <Content Include="Lib\json\tool.py" />
+ <Content Include="Lib\json\__init__.py" />
+ <Content Include="Lib\keyword.py" />
+ <Content Include="Lib\lib2to3\btm_matcher.py" />
+ <Content Include="Lib\lib2to3\btm_utils.py" />
+ <Content Include="Lib\lib2to3\fixer_base.py" />
+ <Content Include="Lib\lib2to3\fixer_util.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_apply.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_basestring.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_buffer.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_callable.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_dict.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_except.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_exec.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_execfile.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_exitfunc.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_filter.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_funcattrs.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_future.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_getcwdu.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_has_key.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_idioms.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_import.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_imports.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_imports2.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_input.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_intern.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_isinstance.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_itertools.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_itertools_imports.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_long.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_map.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_metaclass.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_methodattrs.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_ne.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_next.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_nonzero.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_numliterals.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_operator.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_paren.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_print.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_raise.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_raw_input.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_reduce.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_renames.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_repr.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_set_literal.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_standarderror.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_sys_exc.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_throw.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_tuple_params.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_types.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_unicode.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_urllib.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_ws_comma.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_xrange.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_xreadlines.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_zip.py" />
+ <Content Include="Lib\lib2to3\fixes\__init__.py" />
+ <Content Include="Lib\lib2to3\main.py" />
+ <Content Include="Lib\lib2to3\patcomp.py" />
+ <Content Include="Lib\lib2to3\pgen2\conv.py" />
+ <Content Include="Lib\lib2to3\pgen2\driver.py" />
+ <Content Include="Lib\lib2to3\pgen2\grammar.py" />
+ <Content Include="Lib\lib2to3\pgen2\literals.py" />
+ <Content Include="Lib\lib2to3\pgen2\parse.py" />
+ <Content Include="Lib\lib2to3\pgen2\pgen.py" />
+ <Content Include="Lib\lib2to3\pgen2\token.py" />
+ <Content Include="Lib\lib2to3\pgen2\tokenize.py" />
+ <Content Include="Lib\lib2to3\pgen2\__init__.py" />
+ <Content Include="Lib\lib2to3\pygram.py" />
+ <Content Include="Lib\lib2to3\pytree.py" />
+ <Content Include="Lib\lib2to3\refactor.py" />
+ <Content Include="Lib\lib2to3\__init__.py" />
+ <Content Include="Lib\lib2to3\__main__.py" />
+ <Content Include="Lib\linecache.py" />
+ <Content Include="Lib\locale.py" />
+ <Content Include="Lib\logging\config.py" />
+ <Content Include="Lib\logging\handlers.py" />
+ <Content Include="Lib\logging\__init__.py" />
+ <Content Include="Lib\macpath.py" />
+ <Content Include="Lib\macurl2path.py" />
+ <Content Include="Lib\mailbox.py" />
+ <Content Include="Lib\mailcap.py" />
+ <Content Include="Lib\markupbase.py" />
+ <Content Include="Lib\md5.py" />
+ <Content Include="Lib\mhlib.py" />
+ <Content Include="Lib\mimetools.py" />
+ <Content Include="Lib\mimetypes.py" />
+ <Content Include="Lib\MimeWriter.py" />
+ <Content Include="Lib\mimify.py" />
+ <Content Include="Lib\modulefinder.py" />
+ <Content Include="Lib\multifile.py" />
+ <Content Include="Lib\multiprocessing\connection.py" />
+ <Content Include="Lib\multiprocessing\dummy\connection.py" />
+ <Content Include="Lib\multiprocessing\dummy\__init__.py" />
+ <Content Include="Lib\multiprocessing\forking.py" />
+ <Content Include="Lib\multiprocessing\heap.py" />
+ <Content Include="Lib\multiprocessing\managers.py" />
+ <Content Include="Lib\multiprocessing\pool.py" />
+ <Content Include="Lib\multiprocessing\process.py" />
+ <Content Include="Lib\multiprocessing\queues.py" />
+ <Content Include="Lib\multiprocessing\reduction.py" />
+ <Content Include="Lib\multiprocessing\sharedctypes.py" />
+ <Content Include="Lib\multiprocessing\synchronize.py" />
+ <Content Include="Lib\multiprocessing\util.py" />
+ <Content Include="Lib\multiprocessing\__init__.py" />
+ <Content Include="Lib\mutex.py" />
+ <Content Include="Lib\netrc.py" />
+ <Content Include="Lib\new.py" />
+ <Content Include="Lib\nntplib.py" />
+ <Content Include="Lib\ntpath.py" />
+ <Content Include="Lib\nturl2path.py" />
+ <Content Include="Lib\numbers.py" />
+ <Content Include="Lib\opcode.py" />
+ <Content Include="Lib\optparse.py" />
+ <Content Include="Lib\os.py" />
+ <Content Include="Lib\os2emxpath.py" />
+ <Content Include="Lib\pdb.py" />
+ <Content Include="Lib\pickle.py" />
+ <Content Include="Lib\pickletools.py" />
+ <Content Include="Lib\pipes.py" />
+ <Content Include="Lib\pkgutil.py" />
+ <Content Include="Lib\platform.py" />
+ <Content Include="Lib\plistlib.py" />
+ <Content Include="Lib\popen2.py" />
+ <Content Include="Lib\poplib.py" />
+ <Content Include="Lib\posixfile.py" />
+ <Content Include="Lib\posixpath.py" />
+ <Content Include="Lib\pprint.py" />
+ <Content Include="Lib\profile.py" />
+ <Content Include="Lib\pstats.py" />
+ <Content Include="Lib\pyclbr.py" />
+ <Content Include="Lib\pydoc.py" />
+ <Content Include="Lib\pydoc_data\topics.py" />
+ <Content Include="Lib\pydoc_data\__init__.py" />
+ <Content Include="Lib\py_compile.py" />
+ <Content Include="Lib\Queue.py" />
+ <Content Include="Lib\quopri.py" />
+ <Content Include="Lib\random.py" />
+ <Content Include="Lib\repr.py" />
+ <Content Include="Lib\rexec.py" />
+ <Content Include="Lib\rfc822.py" />
+ <Content Include="Lib\rlcompleter.py" />
+ <Content Include="Lib\robotparser.py" />
+ <Content Include="Lib\runpy.py" />
+ <Content Include="Lib\sched.py" />
+ <Content Include="Lib\sets.py" />
+ <Content Include="Lib\sgmllib.py" />
+ <Content Include="Lib\sha.py" />
+ <Content Include="Lib\shelve.py" />
+ <Content Include="Lib\shlex.py" />
+ <Content Include="Lib\shutil.py" />
+ <Content Include="Lib\SimpleHTTPServer.py" />
+ <Content Include="Lib\SimpleXMLRPCServer.py" />
+ <Content Include="Lib\site-packages\README.txt" />
+ <Content Include="Lib\site.py" />
+ <Content Include="Lib\smtpd.py" />
+ <Content Include="Lib\smtplib.py" />
+ <Content Include="Lib\sndhdr.py" />
+ <Content Include="Lib\SocketServer.py" />
+ <Content Include="Lib\sqlite3\dbapi2.py" />
+ <Content Include="Lib\sqlite3\dump.py" />
+ <Content Include="Lib\sqlite3\__init__.py" />
+ <Content Include="Lib\sre_compile.py" />
+ <Content Include="Lib\sre_constants.py" />
+ <Content Include="Lib\sre_parse.py" />
+ <Content Include="Lib\ssl.py" />
+ <Content Include="Lib\stat.py" />
+ <Content Include="Lib\statvfs.py" />
+ <Content Include="Lib\string.py" />
+ <Content Include="Lib\StringIO.py" />
+ <Content Include="Lib\stringold.py" />
+ <Content Include="Lib\stringprep.py" />
+ <Content Include="Lib\struct.py" />
+ <Content Include="Lib\subprocess.py" />
+ <Content Include="Lib\sunau.py" />
+ <Content Include="Lib\sunaudio.py" />
+ <Content Include="Lib\symbol.py" />
+ <Content Include="Lib\sysconfig.py" />
+ <Content Include="Lib\tabnanny.py" />
+ <Content Include="Lib\tarfile.py" />
+ <Content Include="Lib\telnetlib.py" />
+ <Content Include="Lib\tempfile.py" />
+ <Content Include="Lib\textwrap.py" />
+ <Content Include="Lib\this.py" />
+ <Content Include="Lib\threading.py" />
+ <Content Include="Lib\timeit.py" />
+ <Content Include="Lib\toaiff.py" />
+ <Content Include="Lib\token.py" />
+ <Content Include="Lib\tokenize.py" />
+ <Content Include="Lib\trace.py" />
+ <Content Include="Lib\traceback.py" />
+ <Content Include="Lib\types.py" />
+ <Content Include="Lib\unittest\case.py" />
+ <Content Include="Lib\unittest\loader.py" />
+ <Content Include="Lib\unittest\main.py" />
+ <Content Include="Lib\unittest\result.py" />
+ <Content Include="Lib\unittest\runner.py" />
+ <Content Include="Lib\unittest\signals.py" />
+ <Content Include="Lib\unittest\suite.py" />
+ <Content Include="Lib\unittest\util.py" />
+ <Content Include="Lib\unittest\__init__.py" />
+ <Content Include="Lib\unittest\__main__.py" />
+ <Content Include="Lib\urllib.py" />
+ <Content Include="Lib\urllib2.py" />
+ <Content Include="Lib\urlparse.py" />
+ <Content Include="Lib\user.py" />
+ <Content Include="Lib\UserDict.py" />
+ <Content Include="Lib\UserList.py" />
+ <Content Include="Lib\UserString.py" />
+ <Content Include="Lib\uu.py" />
+ <Content Include="Lib\uuid.py" />
+ <Content Include="Lib\warnings.py" />
+ <Content Include="Lib\wave.py" />
+ <Content Include="Lib\weakref.py" />
+ <Content Include="Lib\webbrowser.py" />
+ <Content Include="Lib\whichdb.py" />
+ <Content Include="Lib\wsgiref\handlers.py" />
+ <Content Include="Lib\wsgiref\headers.py" />
+ <Content Include="Lib\wsgiref\simple_server.py" />
+ <Content Include="Lib\wsgiref\util.py" />
+ <Content Include="Lib\wsgiref\validate.py" />
+ <Content Include="Lib\wsgiref\__init__.py" />
+ <Content Include="Lib\xdrlib.py" />
+ <Content Include="Lib\xmllib.py" />
+ <Content Include="Lib\xmlrpclib.py" />
+ <Content Include="Lib\xml\dom\domreg.py" />
+ <Content Include="Lib\xml\dom\minicompat.py" />
+ <Content Include="Lib\xml\dom\minidom.py" />
+ <Content Include="Lib\xml\dom\NodeFilter.py" />
+ <Content Include="Lib\xml\dom\pulldom.py" />
+ <Content Include="Lib\xml\dom\xmlbuilder.py" />
+ <Content Include="Lib\xml\dom\__init__.py" />
+ <Content Include="Lib\xml\etree\ElementInclude.py" />
+ <Content Include="Lib\xml\etree\ElementPath.py" />
+ <Content Include="Lib\xml\etree\ElementTree.py" />
+ <Content Include="Lib\xml\etree\SimpleXMLTreeBuilder.py" />
+ <Content Include="Lib\xml\etree\__init__.py" />
+ <Content Include="Lib\xml\parsers\__init__.py" />
+ <Content Include="Lib\xml\sax\handler.py" />
+ <Content Include="Lib\xml\sax\saxutils.py" />
+ <Content Include="Lib\xml\sax\xmlreader.py" />
+ <Content Include="Lib\xml\sax\_exceptions.py" />
+ <Content Include="Lib\xml\sax\__init__.py" />
+ <Content Include="Lib\xml\__init__.py" />
+ <Content Include="Lib\zipfile.py" />
+ <Content Include="Lib\_abcoll.py" />
+ <Content Include="Lib\_LWPCookieJar.py" />
+ <Content Include="Lib\_MozillaCookieJar.py" />
+ <Content Include="Lib\_pyio.py" />
+ <Content Include="Lib\_strptime.py" />
+ <Content Include="Lib\_threading_local.py" />
+ <Content Include="Lib\_weakrefset.py" />
+ <Content Include="Lib\__future__.py" />
+ <Content Include="Lib\__phello__.foo.py" />
<Content Include="Manifest.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="app.config" />
+ <None Include="Lib\ensurepip\_bundled\pip-1.5.6-py2.py3-none-any.whl" />
+ <None Include="Lib\ensurepip\_bundled\setuptools-3.6-py2.py3-none-any.whl" />
<None Include="packages.config" />
<None Include="Resources\control.png" />
<None Include="Resources\cross-script.png" />
@@ -168,7 +686,7 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PostBuildEvent>xcopy /S /Y /I "$(SolutionDir)packages\IronPython.StdLib.2.7.4\content\Lib" "$(SolutionDir)$(OutDir)Lib"</PostBuildEvent>
+ <PostBuildEvent>xcopy /S /Y /I "$(SolutionDir)packages\IronPython.StdLib.2.7.5\content\Lib" "$(SolutionDir)$(OutDir)Lib"</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+ <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="IronPython" version="2.7.4" targetFramework="net40" />
- <package id="IronPython.StdLib" version="2.7.4" targetFramework="net40" />
+ <package id="IronPython" version="2.7.5" targetFramework="net45" />
+ <package id="IronPython.StdLib" version="2.7.5" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddInManager/Maestro.AddInManager.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/Maestro.AddInManager.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddInManager/Maestro.AddInManager.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -7,8 +7,9 @@
<OutputType>Library</OutputType>
<RootNamespace>Maestro.AddInManager</RootNamespace>
<AssemblyName>Maestro.AddInManager</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
<RestorePackages>true</RestorePackages>
@@ -35,10 +36,12 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\out\Debug\AddIns\AddInManager\</OutputPath>
<PlatformTarget>AnyCPU</PlatformTarget>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>..\out\Release\AddIns\AddInManager\</OutputPath>
<PlatformTarget>AnyCPU</PlatformTarget>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib">
Modified: trunk/Tools/Maestro/Maestro.AddInManager/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddInManager/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.AddInManager/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.AddInManager/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="SharpZipLib" version="0.86.0" targetFramework="net40-Client" />
+ <package id="SharpZipLib" version="0.86.0" targetFramework="net40-Client" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Maestro.Base</RootNamespace>
<AssemblyName>Maestro.Base</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -47,6 +47,7 @@
<WarningLevel>4</WarningLevel>
<DocumentationFile>
</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -56,6 +57,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\out\Release\Maestro.Base.XML</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Aga.Controls, Version=1.7.0.0, Culture=neutral, PublicKeyToken=fcc90fbf924463a3, processorArchitecture=MSIL">
Modified: trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.Base/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/app.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Base/app.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+ <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Modified: trunk/Tools/Maestro/Maestro.Base/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Base/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="TreeViewAdv" version="1.7.0.0" targetFramework="net40" />
+ <package id="TreeViewAdv" version="1.7.0.0" targetFramework="net40" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Maestro.Editors</RootNamespace>
<AssemblyName>Maestro.Editors</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -45,6 +45,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -54,6 +55,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\SDK\bin\Maestro.Editors.XML</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Aga.Controls, Version=1.7.0.0, Culture=neutral, PublicKeyToken=fcc90fbf924463a3, processorArchitecture=MSIL">
Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.Editors/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Editors/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
- <package id="TreeViewAdv" version="1.7.0.0" targetFramework="net40" />
+ <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
+ <package id="TreeViewAdv" version="1.7.0.0" targetFramework="net40" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/Maestro.LiveMapEditor.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/Maestro.LiveMapEditor.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/Maestro.LiveMapEditor.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Maestro.LiveMapEditor</RootNamespace>
<AssemblyName>Maestro.LiveMapEditor</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
@@ -25,6 +25,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -35,6 +36,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>MapGuide Maestro.ico</ApplicationIcon>
Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/Settings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/Settings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/Settings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.225
+// Runtime Version:4.0.30319.34209
//
// 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", "12.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18047
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/app.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/app.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
<!--
Uncomment the section below for proxy server support.
@@ -13,4 +13,4 @@
<defaultProxy useDefaultCredentials="true" />
</system.net>
-->
-</configuration>
\ No newline at end of file
+</configuration>
Modified: trunk/Tools/Maestro/Maestro.Login/Maestro.Login.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/Maestro.Login.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Login/Maestro.Login.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,14 +10,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Maestro.Login</RootNamespace>
<AssemblyName>Maestro.Login</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -42,6 +43,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -51,6 +53,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\SDK\bin\Maestro.Login.XML</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Tools/Maestro/Maestro.Login/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Login/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.MapViewer/Maestro.MapViewer.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/Maestro.MapViewer.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.MapViewer/Maestro.MapViewer.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,8 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Maestro.MapViewer</RootNamespace>
<AssemblyName>Maestro.MapViewer</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -22,6 +23,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -31,6 +33,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Maestro.MapViewer.XML</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Tools/Maestro/Maestro.MapViewer/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.MapViewer/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.269
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -60,6 +60,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap about {
get {
object obj = ResourceManager.GetObject("about", resourceCulture);
@@ -67,6 +70,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap buffer {
get {
object obj = ResourceManager.GetObject("buffer", resourceCulture);
@@ -83,6 +89,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap control {
get {
object obj = ResourceManager.GetObject("control", resourceCulture);
@@ -90,6 +99,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap control_180 {
get {
object obj = ResourceManager.GetObject("control_180", resourceCulture);
@@ -124,6 +136,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap edit_copy {
get {
object obj = ResourceManager.GetObject("edit_copy", resourceCulture);
@@ -131,6 +146,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap edit_cut {
get {
object obj = ResourceManager.GetObject("edit_cut", resourceCulture);
@@ -138,6 +156,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap edit_duplicate {
get {
object obj = ResourceManager.GetObject("edit_duplicate", resourceCulture);
@@ -145,6 +166,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap edit_paste {
get {
object obj = ResourceManager.GetObject("edit_paste", resourceCulture);
@@ -152,6 +176,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap edit_xml {
get {
object obj = ResourceManager.GetObject("edit_xml", resourceCulture);
@@ -159,6 +186,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap error {
get {
object obj = ResourceManager.GetObject("error", resourceCulture);
@@ -166,6 +196,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap file_print {
get {
object obj = ResourceManager.GetObject("file_print", resourceCulture);
@@ -173,6 +206,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap file_save {
get {
object obj = ResourceManager.GetObject("file_save", resourceCulture);
@@ -189,6 +225,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Byte[].
+ /// </summary>
internal static byte[] grab {
get {
object obj = ResourceManager.GetObject("grab", resourceCulture);
@@ -196,6 +235,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap help {
get {
object obj = ResourceManager.GetObject("help", resourceCulture);
@@ -203,6 +245,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap icon_etc {
get {
object obj = ResourceManager.GetObject("icon_etc", resourceCulture);
@@ -210,6 +255,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap icon_home {
get {
object obj = ResourceManager.GetObject("icon_home", resourceCulture);
@@ -217,6 +265,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap icon_loading {
get {
object obj = ResourceManager.GetObject("icon_loading", resourceCulture);
@@ -224,6 +275,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap icon_pan {
get {
object obj = ResourceManager.GetObject("icon_pan", resourceCulture);
@@ -231,6 +285,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap icon_select {
get {
object obj = ResourceManager.GetObject("icon_select", resourceCulture);
@@ -238,6 +295,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap icon_tasks {
get {
object obj = ResourceManager.GetObject("icon_tasks", resourceCulture);
@@ -245,6 +305,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap icon_zoomselect {
get {
object obj = ResourceManager.GetObject("icon_zoomselect", resourceCulture);
@@ -252,6 +315,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap iconNavigator {
get {
object obj = ResourceManager.GetObject("iconNavigator", resourceCulture);
@@ -259,6 +325,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap info {
get {
object obj = ResourceManager.GetObject("info", resourceCulture);
@@ -266,6 +335,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap initial_center {
get {
object obj = ResourceManager.GetObject("initial_center", resourceCulture);
@@ -273,6 +345,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap invoke_script {
get {
object obj = ResourceManager.GetObject("invoke_script", resourceCulture);
@@ -280,6 +355,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap invoke_url {
get {
object obj = ResourceManager.GetObject("invoke_url", resourceCulture);
@@ -287,6 +365,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap layer_shape {
get {
object obj = ResourceManager.GetObject("layer_shape", resourceCulture);
@@ -294,6 +375,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap layer_shape_ellipse {
get {
object obj = ResourceManager.GetObject("layer_shape_ellipse", resourceCulture);
@@ -301,6 +385,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap layer_shape_line {
get {
object obj = ResourceManager.GetObject("layer_shape_line", resourceCulture);
@@ -308,6 +395,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap layer_shape_polygon {
get {
object obj = ResourceManager.GetObject("layer_shape_polygon", resourceCulture);
@@ -315,6 +405,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap layer_shape_polyline {
get {
object obj = ResourceManager.GetObject("layer_shape_polyline", resourceCulture);
@@ -322,6 +415,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap layer_small {
get {
object obj = ResourceManager.GetObject("layer_small", resourceCulture);
@@ -329,6 +425,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap lc_broken {
get {
object obj = ResourceManager.GetObject("lc_broken", resourceCulture);
@@ -336,6 +435,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap lc_dwf {
get {
object obj = ResourceManager.GetObject("lc_dwf", resourceCulture);
@@ -343,6 +445,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap lc_group {
get {
object obj = ResourceManager.GetObject("lc_group", resourceCulture);
@@ -350,6 +455,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap lc_raster {
get {
object obj = ResourceManager.GetObject("lc_raster", resourceCulture);
@@ -357,6 +465,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap lc_select {
get {
object obj = ResourceManager.GetObject("lc_select", resourceCulture);
@@ -364,6 +475,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap lc_theme {
get {
object obj = ResourceManager.GetObject("lc_theme", resourceCulture);
@@ -371,6 +485,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap lc_unselect {
get {
object obj = ResourceManager.GetObject("lc_unselect", resourceCulture);
@@ -396,6 +513,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap load_package {
get {
object obj = ResourceManager.GetObject("load_package", resourceCulture);
@@ -403,6 +523,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap measure {
get {
object obj = ResourceManager.GetObject("measure", resourceCulture);
@@ -410,6 +533,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap monitor_status {
get {
object obj = ResourceManager.GetObject("monitor_status", resourceCulture);
@@ -426,6 +552,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap options {
get {
object obj = ResourceManager.GetObject("options", resourceCulture);
@@ -433,6 +562,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap overview_map {
get {
object obj = ResourceManager.GetObject("overview_map", resourceCulture);
@@ -458,6 +590,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap PoweredBy_en {
get {
object obj = ResourceManager.GetObject("PoweredBy_en", resourceCulture);
@@ -465,6 +600,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap preview {
get {
object obj = ResourceManager.GetObject("preview", resourceCulture);
@@ -472,6 +610,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap print {
get {
object obj = ResourceManager.GetObject("print", resourceCulture);
@@ -488,6 +629,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap search {
get {
object obj = ResourceManager.GetObject("search", resourceCulture);
@@ -495,6 +639,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap select_centre {
get {
object obj = ResourceManager.GetObject("select_centre", resourceCulture);
@@ -502,6 +649,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap select_clear {
get {
object obj = ResourceManager.GetObject("select_clear", resourceCulture);
@@ -509,6 +659,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap select_features {
get {
object obj = ResourceManager.GetObject("select_features", resourceCulture);
@@ -516,6 +669,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap select_polygon {
get {
object obj = ResourceManager.GetObject("select_polygon", resourceCulture);
@@ -523,6 +679,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap select_radius {
get {
object obj = ResourceManager.GetObject("select_radius", resourceCulture);
@@ -530,6 +689,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap select_zoom {
get {
object obj = ResourceManager.GetObject("select_zoom", resourceCulture);
@@ -915,6 +1077,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap ui_tooltip_balloon_bottom {
get {
object obj = ResourceManager.GetObject("ui_tooltip_balloon_bottom", resourceCulture);
@@ -922,6 +1087,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap view_back {
get {
object obj = ResourceManager.GetObject("view_back", resourceCulture);
@@ -929,6 +1097,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap view_forward {
get {
object obj = ResourceManager.GetObject("view_forward", resourceCulture);
@@ -936,6 +1107,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap view_log {
get {
object obj = ResourceManager.GetObject("view_log", resourceCulture);
@@ -943,6 +1117,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap view_refresh {
get {
object obj = ResourceManager.GetObject("view_refresh", resourceCulture);
@@ -950,6 +1127,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap zoom_dynamic {
get {
object obj = ResourceManager.GetObject("zoom_dynamic", resourceCulture);
@@ -957,6 +1137,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap zoom_full {
get {
object obj = ResourceManager.GetObject("zoom_full", resourceCulture);
@@ -964,6 +1147,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap zoom_in {
get {
object obj = ResourceManager.GetObject("zoom_in", resourceCulture);
@@ -971,6 +1157,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap zoom_in_fixed {
get {
object obj = ResourceManager.GetObject("zoom_in_fixed", resourceCulture);
@@ -978,6 +1167,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap zoom_out_fixed {
get {
object obj = ResourceManager.GetObject("zoom_out_fixed", resourceCulture);
@@ -985,6 +1177,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Byte[].
+ /// </summary>
internal static byte[] zoomin {
get {
object obj = ResourceManager.GetObject("zoomin", resourceCulture);
@@ -992,6 +1187,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Byte[].
+ /// </summary>
internal static byte[] zoomout {
get {
object obj = ResourceManager.GetObject("zoomout", resourceCulture);
Modified: trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,14 +10,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Maestro.Packaging</RootNamespace>
<AssemblyName>Maestro.Packaging</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -44,6 +45,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -53,6 +55,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\SDK\bin\Maestro.Packaging.XML</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
Modified: trunk/Tools/Maestro/Maestro.Packaging/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Packaging/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.Packaging/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Packaging/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.Packaging/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Packaging/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="SharpZipLib" version="0.86.0" targetFramework="net40-Client" />
+ <package id="SharpZipLib" version="0.86.0" targetFramework="net40-Client" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,14 +10,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Maestro.Shared.UI</RootNamespace>
<AssemblyName>Maestro.Shared.UI</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -44,6 +45,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -53,6 +55,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\SDK\bin\Maestro.Shared.UI.XML</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="DockPanelSuite" version="2.9.0.0" targetFramework="net40-Client" />
+ <package id="DockPanelSuite" version="2.9.0.0" targetFramework="net40-Client" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/App.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/App.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/App.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -3,15 +3,15 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="MapGuideDotNetApi" publicKeyToken="f526c48929fda856" />
+ <assemblyIdentity name="MapGuideDotNetApi" publicKeyToken="f526c48929fda856"/>
- <codeBase version="1.0.0.1" href="MapGuideDotNetApi-2.2.dll" />
+ <codeBase version="1.0.0.1" href="MapGuideDotNetApi-2.2.dll"/>
- <bindingRedirect oldVersion="2.0.0.2308" newVersion="1.0.0.1" />
+ <bindingRedirect oldVersion="2.0.0.2308" newVersion="1.0.0.1"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MaestroAPITestRunner</RootNamespace>
<AssemblyName>MaestroAPITestRunner</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -47,6 +47,7 @@
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
<PlatformTarget>x86</PlatformTarget>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -57,6 +58,7 @@
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ciloci.Flee">
@@ -181,8 +183,8 @@
COPY /Y "$(SolutionDir)..\Maestro.AddIn.Local\*.dll" "$(ProjectDir)$(OutDir)" )
echo Copy CS-Map Dictionaries
IF NOT EXIST "$(OutDir)Dictionaries" XCOPY /S /Y /I "$(SolutionDir)..\Maestro.AddIn.Local\Dictionaries\*.*" "$(ProjectDir)$(OutDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.5.2.7949\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-net40-x86.2.5.2.7949\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.6.0.8316\mapguide-api-base\*.*" "$(TargetDir)"
+xcopy /s /y "$(SolutionDir)packages\mg-desktop-x86.2.6.0.8316\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MaestroAPITestRunner</RootNamespace>
<AssemblyName>MaestroAPITestRunner64</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -47,6 +47,7 @@
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
<PlatformTarget>x64</PlatformTarget>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -57,6 +58,7 @@
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ciloci.Flee">
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="fleesharp" version="0.9.27-pre" targetFramework="net40" />
- <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net40" />
- <package id="mg-desktop-net40-x86" version="2.5.2.7949" targetFramework="net40" />
+ <package id="fleesharp" version="0.9.27-pre" targetFramework="net40" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MaestroAPITests</RootNamespace>
<AssemblyName>MaestroAPITests</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<SignAssembly>true</SignAssembly>
@@ -48,6 +48,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -56,6 +57,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="NetTopologySuite.Merged">
Modified: trunk/Tools/Maestro/MaestroAPITests/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MaestroAPITests/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -65,9 +65,9 @@
///<FeatureSet>
/// <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/TempSchema" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:TempSchema="http://fdo.osgeo.org/schemas/feature/TempSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
/// <xs:annotation>
- /// <xs:documentation/>
+ /// <xs:documentation />
/// </xs:annotation>
- /// <xs:complexType name="Parc [rest of string was truncated]";.
+ /// <xs:complexType name="Par [rest of string was truncated]";.
/// </summary>
internal static string FeatureJoinSelectSample {
get {
@@ -106,9 +106,9 @@
///<FeatureSet>
/// <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/Schema1" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:Schema1="http://fdo.osgeo.org/schemas/feature/Schema1" elementFormDefault="qualified" attributeFormDefault="unqualified">
/// <xs:annotation>
- /// <xs:documentation/>
- /// <xs:appinfo source="http://fdo.osgeo.org/schemas"/>
- /// [rest of string was truncated]";.
+ /// <xs:documentation />
+ /// <xs:appinfo source="http://fdo.osgeo.org/schemas" />
+ /// [rest of string was truncated]";.
/// </summary>
internal static string SelectFeatureSample {
get {
Modified: trunk/Tools/Maestro/MaestroAPITests/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MaestroAPITests/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="NUnit" version="2.6.3" targetFramework="net40" />
+ <package id="NUnit" version="2.6.3" targetFramework="net40" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroFsPreview/MaestroFsPreview.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/MaestroFsPreview.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MaestroFsPreview/MaestroFsPreview.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MaestroFsPreview</RootNamespace>
<AssemblyName>MaestroFsPreview</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ApplicationIcon>MapGuide Maestro.ico</ApplicationIcon>
<FileUpgradeFlags>
@@ -44,6 +44,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -53,6 +54,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Aga.Controls, Version=1.7.0.0, Culture=neutral, PublicKeyToken=fcc90fbf924463a3, processorArchitecture=MSIL">
Modified: trunk/Tools/Maestro/MaestroFsPreview/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MaestroFsPreview/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/MaestroFsPreview/Properties/Settings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/Properties/Settings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MaestroFsPreview/Properties/Settings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.34209
//
// 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", "12.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/Tools/Maestro/MaestroFsPreview/app.config
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/app.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MaestroFsPreview/app.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
<!--
Uncomment the section below for proxy server support.
@@ -13,4 +13,4 @@
<defaultProxy useDefaultCredentials="true" />
</system.net>
-->
-</configuration>
\ No newline at end of file
+</configuration>
Modified: trunk/Tools/Maestro/MgCooker/MgCooker.csproj
===================================================================
--- trunk/Tools/Maestro/MgCooker/MgCooker.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MgCooker/MgCooker.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MgCooker</RootNamespace>
<AssemblyName>MgCooker</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ApplicationIcon>MgCookerLogo.ico</ApplicationIcon>
<FileUpgradeFlags>
@@ -18,7 +18,8 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -43,6 +44,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -51,6 +53,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Tools/Maestro/MgCooker/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MgCooker/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/MgCooker/Properties/Settings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Properties/Settings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MgCooker/Properties/Settings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.34209
//
// 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", "12.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/Tools/Maestro/MgCooker/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MgCooker/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/MgCooker/app.config
===================================================================
--- trunk/Tools/Maestro/MgCooker/app.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MgCooker/app.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
<!--
Uncomment the section below for proxy server support.
@@ -13,4 +13,4 @@
<defaultProxy useDefaultCredentials="true" />
</system.net>
-->
-</configuration>
\ No newline at end of file
+</configuration>
Modified: trunk/Tools/Maestro/MgCooker.Cmd/MgCooker.Cmd.csproj
===================================================================
--- trunk/Tools/Maestro/MgCooker.Cmd/MgCooker.Cmd.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MgCooker.Cmd/MgCooker.Cmd.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MgCooker.Cmd</RootNamespace>
<AssemblyName>MgCookerCmd</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ApplicationIcon>MgCookerLogo.ico</ApplicationIcon>
<FileUpgradeFlags>
@@ -18,7 +18,8 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -43,6 +44,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -51,6 +53,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Tools/Maestro/MgCooker.Cmd/app.config
===================================================================
--- trunk/Tools/Maestro/MgCooker.Cmd/app.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MgCooker.Cmd/app.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: trunk/Tools/Maestro/MpuCalc/App.config
===================================================================
--- trunk/Tools/Maestro/MpuCalc/App.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MpuCalc/App.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: trunk/Tools/Maestro/MpuCalc/MpuCalc.csproj
===================================================================
--- trunk/Tools/Maestro/MpuCalc/MpuCalc.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MpuCalc/MpuCalc.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -9,11 +9,12 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MpuCalc</RootNamespace>
<AssemblyName>MpuCalc</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
<RestorePackages>true</RestorePackages>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
@@ -24,6 +25,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
@@ -33,19 +35,20 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=2.5.2.7949, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <Reference Include="OSGeo.MapGuide.Foundation, Version=2.6.0.8316, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=2.5.2.7949, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <Reference Include="OSGeo.MapGuide.Geometry, Version=2.6.0.8316, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.5.2.7949, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.6.0.8316, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -73,7 +76,7 @@
</Target>
<PropertyGroup>
<PostBuildEvent>
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.5.2.7949\mapguide-api-base\*.*" "$(TargetDir)"</PostBuildEvent>
+xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.6.0.8316\mapguide-api-base\*.*" "$(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.
Modified: trunk/Tools/Maestro/MpuCalc/packages.config
===================================================================
--- trunk/Tools/Maestro/MpuCalc/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/MpuCalc/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net45" />
+ <package id="mapguide-api-base-x86" version="2.6.0.8316" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OSGeo.MapGuide.MaestroAPI</RootNamespace>
<AssemblyName>OSGeo.MapGuide.MaestroAPI</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>
@@ -20,7 +20,8 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -47,6 +48,7 @@
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -56,6 +58,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.XML</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ciloci.Flee, Version=0.9.27.0, Culture=neutral, PublicKeyToken=fc11e355737f8b7f, processorArchitecture=MSIL">
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="fleesharp" version="0.9.27-pre" targetFramework="net40-Client" />
+ <package id="fleesharp" version="0.9.27-pre" targetFramework="net40-Client" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Files.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Files.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Files.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OSGeo.MapGuide.MaestroAPI.Http</RootNamespace>
<AssemblyName>OSGeo.MapGuide.MaestroAPI.Http</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>
@@ -20,7 +20,8 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -47,6 +48,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -55,6 +57,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,14 +10,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OSGeo.MapGuide.MaestroAPI.Local</RootNamespace>
<AssemblyName>OSGeo.MapGuide.MaestroAPI.Local</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -45,6 +46,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -54,6 +56,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
@@ -61,21 +64,17 @@
<HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.5.2.7949, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Maestro\packages\mg-desktop-net40-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.Desktop">
+ <HintPath>..\Maestro\packages\mg-desktop-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=2.5.2.7949, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.Foundation">
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=2.5.2.7949, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.Geometry">
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.5.2.7949, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.PlatformBase">
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -173,8 +172,8 @@
</Target>
<PropertyGroup>
<PostBuildEvent>
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.5.2.7949\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-net40-x86.2.5.2.7949\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.6.0.8316\mapguide-api-base\*.*" "$(TargetDir)"
+xcopy /s /y "$(SolutionDir)packages\mg-desktop-x86.2.6.0.8316\mg-desktop\*.*" "$(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.
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net40-Client" />
- <package id="mg-desktop-net40-x86" version="2.5.2.7949" targetFramework="net40-Client" />
+ <package id="mapguide-api-base-x86" version="2.6.0.8316" targetFramework="net45" />
+ <package id="mg-desktop-x86" version="2.6.0.8316" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OSGeo.MapGuide.MaestroAPI.Native</RootNamespace>
<AssemblyName>OSGeo.MapGuide.MaestroAPI.Native32-2.2.0</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>
@@ -20,7 +20,8 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -45,6 +46,7 @@
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -54,6 +56,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>Always</RunPostBuildEvent>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OSGeo.MapGuide.MaestroAPI.Tests</RootNamespace>
<AssemblyName>OSGeo.MapGuide.MaestroAPI.Tests</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
@@ -24,6 +24,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -32,6 +33,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Moq">
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/OSGeo.MapGuide.ObjectModels.Tests.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/OSGeo.MapGuide.ObjectModels.Tests.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/OSGeo.MapGuide.ObjectModels.Tests.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -9,11 +9,12 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OSGeo.MapGuide.ObjectModels.Tests</RootNamespace>
<AssemblyName>OSGeo.MapGuide.ObjectModels.Tests</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
<RestorePackages>true</RestorePackages>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -38,6 +39,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -46,6 +48,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Moq">
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/OSGeo.MapGuide.ObjectModels.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/OSGeo.MapGuide.ObjectModels.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/OSGeo.MapGuide.ObjectModels.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OSGeo.MapGuide.ObjectModels</RootNamespace>
<AssemblyName>OSGeo.MapGuide.ObjectModels</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -22,6 +23,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -31,6 +33,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\OSGeo.MapGuide.ObjectModels.XML</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/ProviderTemplate/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/ProviderTemplate/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/ProviderTemplate/Properties/Settings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/Properties/Settings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/ProviderTemplate/Properties/Settings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,28 +1,24 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
-namespace ProviderTemplate.Properties
-{
-
-
+namespace ProviderTemplate.Properties {
+
+
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
- {
-
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.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/Maestro/ProviderTemplate/ProviderTemplate.csproj
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ProviderTemplate</RootNamespace>
<AssemblyName>ProviderTemplate</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -22,6 +23,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,6 +34,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Tools/Maestro/RtMapInspector/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/Properties/Resources.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/RtMapInspector/Properties/Resources.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/RtMapInspector/Properties/Settings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/Properties/Settings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/RtMapInspector/Properties/Settings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.34209
//
// 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", "12.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -10,14 +10,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RtMapInspector</RootNamespace>
<AssemblyName>RtMapInspector</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -42,6 +43,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -50,6 +52,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Tools/Maestro/RtMapInspector/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/Strings.Designer.cs 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/RtMapInspector/Strings.Designer.cs 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/Tools/Maestro/RtMapInspector/app.config
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/app.config 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/RtMapInspector/app.config 2015-01-18 12:21:15 UTC (rev 8502)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
<!--
Uncomment the section below for proxy server support.
@@ -13,4 +13,4 @@
<defaultProxy useDefaultCredentials="true" />
</system.net>
-->
-</configuration>
\ No newline at end of file
+</configuration>
Modified: trunk/Tools/Maestro/SignMapGuideApi/SignMapGuideApi.csproj
===================================================================
--- trunk/Tools/Maestro/SignMapGuideApi/SignMapGuideApi.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/SignMapGuideApi/SignMapGuideApi.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -17,6 +17,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -26,6 +27,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -34,6 +36,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -44,6 +47,9 @@
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy /Y "$(SolutionDir)..\Properties\maestroapi.key" "$(SolutionDir)..\SDK\bin"</PostBuildEvent>
Modified: trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core/ICSharpCode.Core.csproj
===================================================================
--- trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core/ICSharpCode.Core.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core/ICSharpCode.Core.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -18,11 +18,12 @@
<RunPostBuildEvent>Always</RunPostBuildEvent>
<DelaySign>False</DelaySign>
<AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<SourceAnalysisOverrideSettingsFile>C:\Users\daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -34,6 +35,7 @@
<DocumentationFile>bin\Debug\ICSharpCode.Core.xml</DocumentationFile>
<DefineConstants>DEBUG</DefineConstants>
<NoWarn>1591</NoWarn>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -44,6 +46,7 @@
<DebugType>None</DebugType>
<DocumentationFile>
</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<RegisterForComInterop>False</RegisterForComInterop>
Modified: trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj
===================================================================
--- trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>ICSharpCode.Core.WinForms</RootNamespace>
<AssemblyName>ICSharpCode.Core.WinForms</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -43,6 +43,12 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+ <Prefer32Bit>false</Prefer32Bit>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+ <Prefer32Bit>false</Prefer32Bit>
+ </PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.TextEditor/ICSharpCode.TextEditor.csproj
===================================================================
--- trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.TextEditor/ICSharpCode.TextEditor.csproj 2015-01-14 10:08:37 UTC (rev 8501)
+++ trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.TextEditor/ICSharpCode.TextEditor.csproj 2015-01-18 12:21:15 UTC (rev 8502)
@@ -21,7 +21,7 @@
<BaseAddress>98041856</BaseAddress>
<PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<DelaySign>False</DelaySign>
<AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
<TargetFrameworkProfile>
@@ -35,6 +35,7 @@
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<CodeAnalysisRules>-Microsoft.Design#CA1012;-Microsoft.Design#CA2210;-Microsoft.Design#CA1040;-Microsoft.Design#CA1005;-Microsoft.Design#CA1020;-Microsoft.Design#CA1021;-Microsoft.Design#CA1010;-Microsoft.Design#CA1011;-Microsoft.Design#CA1009;-Microsoft.Design#CA1050;-Microsoft.Design#CA1026;-Microsoft.Design#CA1019;-Microsoft.Design#CA1031;-Microsoft.Design#CA1047;-Microsoft.Design#CA1000;-Microsoft.Design#CA1048;-Microsoft.Design#CA1051;-Microsoft.Design#CA1002;-Microsoft.Design#CA1061;-Microsoft.Design#CA1006;-Microsoft.Design#CA1046;-Microsoft.Design#CA1045;-Microsoft.Design#CA1038;-Microsoft.Design#CA1008;-Microsoft.Design#CA1028;-Microsoft.Design#CA1004;-Microsoft.Design#CA1035;-Microsoft.Design#CA1063;-Microsoft.Design#CA1032;-Microsoft.Design#CA1023;-Microsoft.Design#CA1033;-Microsoft.Design#CA1039;-Microsoft.Design#CA1016;-Microsoft.Design#CA1014;-Microsoft.Design#CA1017;-Microsoft.Design#CA1018;-Microsoft.Design#CA1027;-Microsoft.Design#CA1059;-Microsoft.Desig
n#CA1060;-Microsoft.Design#CA1034;-Microsoft.Design#CA1013;-Microsoft.Design#CA1036;-Microsoft.Design#CA1044;-Microsoft.Design#CA1041;-Microsoft.Design#CA1025;-Microsoft.Design#CA1052;-Microsoft.Design#CA1053;-Microsoft.Design#CA1057;-Microsoft.Design#CA1058;-Microsoft.Design#CA1001;-Microsoft.Design#CA1049;-Microsoft.Design#CA1054;-Microsoft.Design#CA1056;-Microsoft.Design#CA1055;-Microsoft.Design#CA1030;-Microsoft.Design#CA1003;-Microsoft.Design#CA1007;-Microsoft.Design#CA1043;-Microsoft.Design#CA1024;-Microsoft.Design#CA1062;-Microsoft.Globalization#CA1301;-Microsoft.Globalization#CA1302;-Microsoft.Globalization#CA1303;-Microsoft.Globalization#CA1306;-Microsoft.Globalization#CA1304;-Microsoft.Globalization#CA1305;-Microsoft.Globalization#CA1300;-Microsoft.Mobility#CA1600;-Microsoft.Mobility#CA1601;-Microsoft.Naming#CA1718;-Microsoft.Naming#CA1720;-Microsoft.Naming#CA1700;-Microsoft.Naming#CA1712;-Microsoft.Naming#CA1713;-Microsoft.Naming#CA1709;-Microsoft.Naming#CA1708;-M
icrosoft.Naming#CA1715;-Microsoft.Naming#CA1710;-Microsoft.Naming#CA1707;-Microsoft.Naming#CA1722;-Microsoft.Naming#CA1711;-Microsoft.Naming#CA1716;-Microsoft.Naming#CA1705;-Microsoft.Naming#CA1725;-Microsoft.Naming#CA1719;-Microsoft.Naming#CA1721;-Microsoft.Naming#CA1706;-Microsoft.Naming#CA1724;-Microsoft.Naming#CA1726;-Microsoft.Performance#CA1809;-Microsoft.Performance#CA1811;-Microsoft.Performance#CA1812;-Microsoft.Performance#CA1807;-Microsoft.Performance#CA1813;-Microsoft.Performance#CA1823;-Microsoft.Performance#CA1816;-Microsoft.Performance#CA1817;-Microsoft.Performance#CA1800;-Microsoft.Performance#CA1818;-Microsoft.Performance#CA1805;-Microsoft.Performance#CA1810;-Microsoft.Performance#CA1822;-Microsoft.Performance#CA1815;-Microsoft.Performance#CA1814;-Microsoft.Performance#CA1819;-Microsoft.Performance#CA1804;-Microsoft.Performance#CA1820;-Microsoft.Performance#CA1802;-Microsoft.Security#CA2116;-Microsoft.Security#CA2117;-Microsoft.Security#CA2105;-Microsoft.Secu
rity#CA2115;-Microsoft.Security#CA2104;-Microsoft.Security#CA2122;-Microsoft.Security#CA2114;-Microsoft.Security#CA2123;-Microsoft.Security#CA2111;-Microsoft.Security#CA2108;-Microsoft.Security#CA2107;-Microsoft.Security#CA2103;-Microsoft.Security#CA2100;-Microsoft.Security#CA2118;-Microsoft.Security#CA2109;-Microsoft.Security#CA2119;-Microsoft.Security#CA2106;-Microsoft.Security#CA2112;-Microsoft.Security#CA2110;-Microsoft.Security#CA2120;-Microsoft.Security#CA2101;-Microsoft.Security#CA2121;-Microsoft.Security#CA2126;-Microsoft.Security#CA2124;-Microsoft.Usage#CA2209;-Microsoft.Usage#CA2236;-Microsoft.Usage#CA2227;-Microsoft.Usage#CA2213;-Microsoft.Usage#CA2216;-Microsoft.Usage#CA2215;-Microsoft.Usage#CA2214;-Microsoft.Usage#CA2222;-Microsoft.Usage#CA2202;-Microsoft.Usage#CA1806;-Microsoft.Usage#CA2217;-Microsoft.Usage#CA2212;-Microsoft.Usage#CA2219;-Microsoft.Usage#CA2201;-Microsoft.Usage#CA2228;-Microsoft.Usage#CA2221;-Microsoft.Usage#CA2220;-Microsoft.Usage#CA2240;-Micr
osoft.Usage#CA2229;-Microsoft.Usage#CA2238;-Microsoft.Usage#CA2207;-Microsoft.Usage#CA2208;-Microsoft.Usage#CA2235;-Microsoft.Usage#CA2237;-Microsoft.Usage#CA2232;-Microsoft.Usage#CA2223;-Microsoft.Usage#CA2211;-Microsoft.Usage#CA2233;-Microsoft.Usage#CA2225;-Microsoft.Usage#CA2226;-Microsoft.Usage#CA2231;-Microsoft.Usage#CA2224;-Microsoft.Usage#CA2218;-Microsoft.Usage#CA2234;-Microsoft.Usage#CA2241;-Microsoft.Usage#CA2239;-Microsoft.Usage#CA2200;-Microsoft.Usage#CA1801;-Microsoft.Usage#CA2205;-Microsoft.Usage#CA2230</CodeAnalysisRules>
<DefineConstants>DEBUG;DATACONSISTENCYTEST</DefineConstants>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>True</Optimize>
@@ -42,6 +43,7 @@
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<OutputPath>bin\Release</OutputPath>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugType>Full</DebugType>
More information about the mapguide-commits
mailing list