[mapguide-commits] r8018 - in trunk/Tools/Maestro: Maestro Maestro/.nuget Maestro/packages Maestro.AddIn.ExtendedObjectModels Maestro.AddIn.FdoToolbox Maestro.AddIn.Local Maestro.AddIn.Scripting Maestro.AddInManager Maestro.Base Maestro.Editors Maestro.Packaging Maestro.Shared.UI MaestroAPITestRunner MaestroAPITests OSGeo.MapGuide.MaestroAPI Thirdparty
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Apr 9 05:33:21 PDT 2014
Author: jng
Date: 2014-04-09 05:33:21 -0700 (Wed, 09 Apr 2014)
New Revision: 8018
Added:
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config
trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config
trunk/Tools/Maestro/Maestro.AddIn.Local/app.config
trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config
trunk/Tools/Maestro/Maestro.AddInManager/packages.config
trunk/Tools/Maestro/Maestro.Base/app.config
trunk/Tools/Maestro/Maestro.Base/packages.config
trunk/Tools/Maestro/Maestro.Editors/packages.config
trunk/Tools/Maestro/Maestro.Packaging/packages.config
trunk/Tools/Maestro/Maestro.Shared.UI/packages.config
trunk/Tools/Maestro/Maestro/.nuget/
trunk/Tools/Maestro/Maestro/.nuget/NuGet.Config
trunk/Tools/Maestro/Maestro/.nuget/NuGet.exe
trunk/Tools/Maestro/Maestro/.nuget/NuGet.targets
trunk/Tools/Maestro/Maestro/.nuget/packages.config
trunk/Tools/Maestro/Maestro/packages/
trunk/Tools/Maestro/Maestro/packages/repositories.config
trunk/Tools/Maestro/MaestroAPITestRunner/packages.config
trunk/Tools/Maestro/MaestroAPITests/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config
Removed:
trunk/Tools/Maestro/Thirdparty/Flee/
trunk/Tools/Maestro/Thirdparty/NUnit/
trunk/Tools/Maestro/Thirdparty/SharpZipLib/
trunk/Tools/Maestro/Thirdparty/TreeViewAdv/
trunk/Tools/Maestro/Thirdparty/WinFormsUI/
Modified:
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj
trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Maestro.AddIn.FdoToolbox.csproj
trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj
trunk/Tools/Maestro/Maestro.AddInManager/Maestro.AddInManager.csproj
trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj
trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj
trunk/Tools/Maestro/Maestro/App.config
trunk/Tools/Maestro/Maestro/Maestro.csproj
trunk/Tools/Maestro/Maestro/Maestro_All.sln
trunk/Tools/Maestro/Maestro/changelog.txt
trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj
trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj
trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
Log:
#2427: Nuget-ify some of our thirdparty libraries.
- DockPanel
- SharpZipLib
- NUnit
- Flee Expression Evaluator
- TreeViewAdv
Property changes on: trunk/Tools/Maestro/Maestro/.nuget
___________________________________________________________________
Added: bugtraq:number
+ true
Added: trunk/Tools/Maestro/Maestro/.nuget/NuGet.Config
===================================================================
--- trunk/Tools/Maestro/Maestro/.nuget/NuGet.Config (rev 0)
+++ trunk/Tools/Maestro/Maestro/.nuget/NuGet.Config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <solution>
+ <add key="disableSourceControlIntegration" value="true" />
+ </solution>
+</configuration>
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro/.nuget/NuGet.exe
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro/.nuget/NuGet.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro/.nuget/NuGet.targets
===================================================================
--- trunk/Tools/Maestro/Maestro/.nuget/NuGet.targets (rev 0)
+++ trunk/Tools/Maestro/Maestro/.nuget/NuGet.targets 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+
+ <!-- Enable the restore command to run before builds -->
+ <RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
+
+ <!-- Property that enables building a package from a project -->
+ <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+ <!-- Determines if package restore consent is required to restore packages -->
+ <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+
+ <!-- Download NuGet.exe if it does not already exist -->
+ <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+ </PropertyGroup>
+
+ <ItemGroup Condition=" '$(PackageSources)' == '' ">
+ <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+ <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+ <!--
+ <PackageSource Include="https://www.nuget.org/api/v2/" />
+ <PackageSource Include="https://my-nuget-source/nuget/" />
+ -->
+ </ItemGroup>
+
+ <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+ <!-- Windows specific commands -->
+ <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+ </PropertyGroup>
+
+ <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+ <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+ <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
+ <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
+ <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <!-- NuGet command -->
+ <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+ <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+
+ <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+ <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+ <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+ <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+ <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+
+ <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+ <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
+ <!-- Commands -->
+ <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+ <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+
+ <!-- We need to ensure packages are restored prior to assembly resolve -->
+ <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+ RestorePackages;
+ $(BuildDependsOn);
+ </BuildDependsOn>
+
+ <!-- Make the build depend on restore packages -->
+ <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+ $(BuildDependsOn);
+ BuildPackage;
+ </BuildDependsOn>
+ </PropertyGroup>
+
+ <Target Name="CheckPrerequisites">
+ <!-- Raise an error if we're unable to locate nuget.exe -->
+ <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+ <!--
+ Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+ This effectively acts as a lock that makes sure that the download operation will only happen once and all
+ parallel builds will have to wait for it to complete.
+ -->
+ <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+ </Target>
+
+ <Target Name="_DownloadNuGet">
+ <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+ </Target>
+
+ <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+ <Exec Command="$(RestoreCommand)"
+ Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+ <Exec Command="$(RestoreCommand)"
+ LogStandardErrorAsError="true"
+ Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+ </Target>
+
+ <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+ <Exec Command="$(BuildCommand)"
+ Condition=" '$(OS)' != 'Windows_NT' " />
+
+ <Exec Command="$(BuildCommand)"
+ LogStandardErrorAsError="true"
+ Condition=" '$(OS)' == 'Windows_NT' " />
+ </Target>
+
+ <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+ <ParameterGroup>
+ <OutputFilename ParameterType="System.String" Required="true" />
+ </ParameterGroup>
+ <Task>
+ <Reference Include="System.Core" />
+ <Using Namespace="System" />
+ <Using Namespace="System.IO" />
+ <Using Namespace="System.Net" />
+ <Using Namespace="Microsoft.Build.Framework" />
+ <Using Namespace="Microsoft.Build.Utilities" />
+ <Code Type="Fragment" Language="cs">
+ <![CDATA[
+ try {
+ OutputFilename = Path.GetFullPath(OutputFilename);
+
+ Log.LogMessage("Downloading latest version of NuGet.exe...");
+ WebClient webClient = new WebClient();
+ webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+ return true;
+ }
+ catch (Exception ex) {
+ Log.LogErrorFromException(ex);
+ return false;
+ }
+ ]]>
+ </Code>
+ </Task>
+ </UsingTask>
+</Project>
Added: trunk/Tools/Maestro/Maestro/.nuget/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro/.nuget/packages.config (rev 0)
+++ trunk/Tools/Maestro/Maestro/.nuget/packages.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="NUnit.Runners" version="2.6.3" />
+</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro/App.config
===================================================================
--- trunk/Tools/Maestro/Maestro/App.config 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro/App.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<!--
If you use the Local Native Connection, setup assembly binding redirection by
@@ -29,7 +29,7 @@
</runtime>
-->
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
</startup>
<!--
Uncomment the section below for proxy server support.
@@ -41,4 +41,12 @@
<defaultProxy useDefaultCredentials="true" />
</system.net>
-->
+ <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" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
</configuration>
Modified: trunk/Tools/Maestro/Maestro/Maestro.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro/Maestro.csproj 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro/Maestro.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -65,10 +65,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SDK\bin\Aga.Controls.dll</HintPath>
</Reference>
- <Reference Include="Ciloci.Flee, Version=0.9.26.0, Culture=neutral, PublicKeyToken=c8526a021ef298ed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Ciloci.Flee.dll</HintPath>
- </Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SDK\bin\ICSharpCode.SharpZipLib.dll</HintPath>
Modified: trunk/Tools/Maestro/Maestro/Maestro_All.sln
===================================================================
--- trunk/Tools/Maestro/Maestro/Maestro_All.sln 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro/Maestro_All.sln 2014-04-09 12:33:21 UTC (rev 8018)
@@ -65,8 +65,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0", "..\ExtendedModels\WebLayout-1.1.0\OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0.csproj", "{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "..\Thirdparty\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaestroAPITests", "..\MaestroAPITests\MaestroAPITests.csproj", "{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaestroAPITestRunner", "..\MaestroAPITestRunner\MaestroAPITestRunner.csproj", "{50C12B5C-387C-4007-A1D1-CB181CB474CC}"
@@ -126,8 +124,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maestro.AddIn.Scripting", "..\Maestro.AddIn.Scripting\Maestro.AddIn.Scripting.csproj", "{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "..\Thirdparty\WinFormsUI\WinFormsUI.csproj", "{C75532C4-765B-418E-B09B-46D36B2ABDB1}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "..\Thirdparty\SharpDevelop\ICSharpCode.TextEditor\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maestro.AddInManager", "..\Maestro.AddInManager\Maestro.AddInManager.csproj", "{9CC51643-37D6-4B8F-A0EA-E7606AA561EB}"
@@ -152,6 +148,14 @@
{50C12B5C-387C-4007-A1D1-CB181CB474CC} = {50C12B5C-387C-4007-A1D1-CB181CB474CC}
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{24093FBD-9376-4FE6-8A33-4D7F6AEAADC3}"
+ ProjectSection(SolutionItems) = preProject
+ .nuget\NuGet.Config = .nuget\NuGet.Config
+ .nuget\NuGet.exe = .nuget\NuGet.exe
+ .nuget\NuGet.targets = .nuget\NuGet.targets
+ .nuget\packages.config = .nuget\packages.config
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -238,10 +242,6 @@
{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}.Release|Any CPU.Build.0 = Release|Any CPU
- {E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU
{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Debug|Any CPU.Build.0 = Debug|Any CPU
{351D49A3-2E4A-4EC3-AFC2-D56598F44F51}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -318,10 +318,6 @@
{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3591C5BB-2B87-4FB4-AD87-9C8176DF9835}.Release|Any CPU.Build.0 = Release|Any CPU
- {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.Build.0 = Release|Any CPU
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
Modified: trunk/Tools/Maestro/Maestro/changelog.txt
===================================================================
--- trunk/Tools/Maestro/Maestro/changelog.txt 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro/changelog.txt 2014-04-09 12:33:21 UTC (rev 8018)
@@ -1,6 +1,15 @@
- 5.1
- ---
+ - New grid-based style editor. All layers will use this editor unless you un-tick "Use grid-based style editor" in the options
+ - Basic support for theming composite styles (only from the grid-based style editor)
+ - All style editors now auto-refresh their style previews
+ - Previews of certain resources will now have optional debug watermarks attached which include information about the generated Map Definition (useful for Layer previews to determine if it has correct CS and bounds)
+ - Added support for generating individual themes by values from an external class definition (eg. A lookup table)
+ - Added support for retreving information about a Layer Definition's referenced Spatial Context
+ - Fix: Text Frame settings not applying for a Text element in a Symbol Definition
+ - Fix: Wrong spatial context used when creating a preview for a layer that points to a multi spatial context Feature Source
+5.1
+---
+
- mg-desktop updated to 2.5.2.7949
- Map Definition Editor now uses a PropertyGrid for editing layer/group properties
- Map Definition Editor can now batch edit properties of multiple selected groups/layers
Property changes on: trunk/Tools/Maestro/Maestro/packages
___________________________________________________________________
Added: bugtraq:number
+ true
Added: trunk/Tools/Maestro/Maestro/packages/repositories.config
===================================================================
--- trunk/Tools/Maestro/Maestro/packages/repositories.config (rev 0)
+++ trunk/Tools/Maestro/Maestro/packages/repositories.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+ <repository path="..\..\Maestro.AddInManager\packages.config" />
+ <repository path="..\..\Maestro.Base\packages.config" />
+ <repository path="..\..\Maestro.Editors\packages.config" />
+ <repository path="..\..\Maestro.Packaging\packages.config" />
+ <repository path="..\..\Maestro.Shared.UI\packages.config" />
+ <repository path="..\..\MaestroAPITestRunner\packages.config" />
+ <repository path="..\..\MaestroAPITests\packages.config" />
+ <repository path="..\..\OSGeo.MapGuide.MaestroAPI\packages.config" />
+</repositories>
\ 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 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -97,6 +97,7 @@
<Content Include="Manifest.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <None Include="app.config" />
<None Include="Resources\water.png" />
<None Include="Resources\edit.png" />
<None Include="Resources\marker.png" />
Added: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,11 @@
+<?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" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Maestro.AddIn.FdoToolbox.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Maestro.AddIn.FdoToolbox.csproj 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Maestro.AddIn.FdoToolbox.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -133,6 +133,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Added: trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,11 @@
+<?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" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -383,6 +383,7 @@
<Content Include="OSGeo.MapGuide.Desktop.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <None Include="app.config" />
<None Include="Resources\arrow-090.png" />
<None Include="Resources\arrow-180.png" />
<None Include="Resources\arrow.png" />
Added: trunk/Tools/Maestro/Maestro.AddIn.Local/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/app.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/app.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,11 @@
+<?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" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -107,6 +107,7 @@
<Content Include="Manifest.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <None Include="app.config" />
<None Include="Resources\control.png" />
<None Include="Resources\cross-script.png" />
<None Include="Resources\block.png" />
Added: trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,11 @@
+<?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" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddInManager/Maestro.AddInManager.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/Maestro.AddInManager.csproj 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro.AddInManager/Maestro.AddInManager.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -10,6 +10,8 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<AppDesignerFolder>Properties</AppDesignerFolder>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -40,7 +42,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib">
- <HintPath>..\Thirdparty\SharpZipLib\ICSharpCode.SharpZipLib.dll</HintPath>
+ <HintPath>..\Maestro\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
@@ -106,5 +108,15 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
</Project>
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro.AddInManager/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/packages.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddInManager/packages.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <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 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -34,6 +34,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -56,6 +58,10 @@
<DocumentationFile>..\out\Release\Maestro.Base.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Aga.Controls, Version=1.7.0.0, Culture=neutral, PublicKeyToken=fcc90fbf924463a3, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro\packages\TreeViewAdv.1.7.0.0\lib\net\Aga.Controls.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -450,6 +456,8 @@
</ItemGroup>
<ItemGroup>
<Content Include="Maestro.Base.addin" />
+ <None Include="app.config" />
+ <None Include="packages.config" />
<None Include="Resources\icon_document.ico" />
<None Include="Resources\icon_xmleditor.ico" />
<None Include="Resources\icon_weblayout.ico" />
@@ -692,10 +700,6 @@
<Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
<Name>ICSharpCode.Core</Name>
</ProjectReference>
- <ProjectReference Include="..\Thirdparty\TreeViewAdv\Aga.Controls\Aga.Controls.csproj">
- <Project>{E73BB233-D88B-44A7-A98F-D71EE158381D}</Project>
- <Name>Aga.Controls</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -726,6 +730,13 @@
copy /Y "$(TargetDir)ICSharpCode.Core.WinForms.dll" "$(TargetDir)..\..\SDK\addin-bin\"
if exist "$(TargetDir)ICSharpCode.Core.WinForms.pdb" copy /Y "$(TargetDir)ICSharpCode.Core.WinForms.pdb" "$(TargetDir)..\..\SDK\addin-bin\"</PostBuildEvent>
</PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Added: trunk/Tools/Maestro/Maestro.Base/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/app.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.Base/app.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,11 @@
+<?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" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro.Base/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/packages.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.Base/packages.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <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 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -34,6 +34,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -54,10 +56,14 @@
<DocumentationFile>..\SDK\bin\Maestro.Editors.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+ <Reference Include="Aga.Controls, Version=1.7.0.0, Culture=neutral, PublicKeyToken=fcc90fbf924463a3, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\SharpZipLib\ICSharpCode.SharpZipLib.dll</HintPath>
+ <HintPath>..\Maestro\packages\TreeViewAdv.1.7.0.0\lib\net\Aga.Controls.dll</HintPath>
</Reference>
+ <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Design" />
@@ -1890,12 +1896,9 @@
<Project>{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}</Project>
<Name>ICSharpCode.TextEditor</Name>
</ProjectReference>
- <ProjectReference Include="..\Thirdparty\TreeViewAdv\Aga.Controls\Aga.Controls.csproj">
- <Project>{E73BB233-D88B-44A7-A98F-D71EE158381D}</Project>
- <Name>Aga.Controls</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
+ <None Include="packages.config" />
<None Include="Resources\document--plus.png" />
</ItemGroup>
<ItemGroup>
@@ -2657,6 +2660,13 @@
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Added: trunk/Tools/Maestro/Maestro.Editors/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/packages.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/packages.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +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" />
+</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -33,6 +33,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -53,9 +55,9 @@
<DocumentationFile>..\SDK\bin\Maestro.Packaging.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+ <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\SharpZipLib\ICSharpCode.SharpZipLib.dll</HintPath>
+ <HintPath>..\Maestro\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
@@ -152,7 +154,17 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Added: trunk/Tools/Maestro/Maestro.Packaging/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/packages.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.Packaging/packages.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <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 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -33,6 +33,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -58,6 +60,10 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
+ <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.9.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro\packages\DockPanelSuite.2.9.0.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Properties\GlobalAssemblyInfo.cs">
@@ -171,6 +177,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <None Include="packages.config" />
<None Include="Resources\minus-white.png" />
</ItemGroup>
<ItemGroup>
@@ -206,12 +213,16 @@
<None Include="Resources\cross.png" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\Thirdparty\WinFormsUI\WinFormsUI.csproj">
- <Project>{c75532c4-765b-418e-b09b-46d36b2abdb1}</Project>
- <Name>WinFormsUI</Name>
- </ProjectReference>
+ <Content Include="license.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Added: trunk/Tools/Maestro/Maestro.Shared.UI/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/packages.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/packages.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="DockPanelSuite" version="2.9.0.0" targetFramework="net40-Client" />
+</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -57,15 +57,12 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ciloci.Flee">
- <HintPath>..\Thirdparty\Flee\lib\Ciloci.Flee.dll</HintPath>
- </Reference>
<Reference Include="NetTopologySuite.Merged">
<HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
</Reference>
<Reference Include="nunit-console-runner, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\NUnit\bin\net-2.0\lib\nunit-console-runner.dll</HintPath>
+ <HintPath>..\Maestro\packages\NUnit.Runners.2.6.3\tools\lib\nunit-console-runner.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -34,6 +34,8 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -58,14 +60,14 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Ciloci.Flee">
- <HintPath>..\Thirdparty\Flee\lib\Ciloci.Flee.dll</HintPath>
+ <HintPath>..\Maestro\packages\fleesharp.0.9.27-pre\lib\net40\Ciloci.Flee.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.Merged">
<HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
</Reference>
<Reference Include="nunit-console-runner, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\NUnit\bin\net-2.0\lib\nunit-console-runner.dll</HintPath>
+ <HintPath>..\Maestro\packages\NUnit.Runners.2.6.3\tools\lib\nunit-console-runner.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
@@ -101,6 +103,7 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
+ <None Include="packages.config" />
<None Include="Platform.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
@@ -147,4 +150,11 @@
echo XCOPY /S /Y /I "$(TargetDir)$(TargetName).*" "$(SolutionDir)..\SDK\Test"
XCOPY /S /Y /I "$(TargetDir)$(TargetName).*" "$(SolutionDir)..\SDK\Test" )</PostBuildEvent>
</PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
</Project>
\ No newline at end of file
Added: trunk/Tools/Maestro/MaestroAPITestRunner/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/packages.config (rev 0)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/packages.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <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 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -37,6 +37,8 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -64,9 +66,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Thirdparty\NMock\bin\NMock2.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\NUnit\bin\net-2.0\nunit.framework.dll</HintPath>
+ <HintPath>..\Maestro\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -111,6 +113,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <None Include="packages.config" />
<None Include="Resources\SelectAggregatesSample.xml" />
</ItemGroup>
<ItemGroup>
@@ -653,6 +656,13 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Added: trunk/Tools/Maestro/MaestroAPITests/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/packages.config (rev 0)
+++ trunk/Tools/Maestro/MaestroAPITests/packages.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="NUnit" version="2.6.3" targetFramework="net40" />
+</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 2014-04-09 11:16:33 UTC (rev 8017)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2014-04-09 12:33:21 UTC (rev 8018)
@@ -36,6 +36,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -56,9 +58,9 @@
<DocumentationFile>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ciloci.Flee, Version=0.9.26.0, Culture=neutral, PublicKeyToken=c8526a021ef298ed, processorArchitecture=MSIL">
+ <Reference Include="Ciloci.Flee, Version=0.9.27.0, Culture=neutral, PublicKeyToken=fc11e355737f8b7f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\Flee\lib\Ciloci.Flee.dll</HintPath>
+ <HintPath>..\Maestro\packages\fleesharp.0.9.27-pre\lib\net40\Ciloci.Flee.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -411,6 +413,7 @@
<Compile Include="XmlValidator.cs" />
</ItemGroup>
<ItemGroup>
+ <None Include="packages.config" />
<None Include="Schemas\ApplicationDefinition-1.0.0.xsd">
</None>
<None Include="Schemas\ApplicationDefinitionInfo-1.0.0.xsd">
@@ -562,8 +565,14 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
- <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config 2014-04-09 12:33:21 UTC (rev 8018)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="fleesharp" version="0.9.27-pre" targetFramework="net40-Client" />
+</packages>
\ No newline at end of file
More information about the mapguide-commits
mailing list