[mapguide-commits] r8765 - in trunk/Tools/Maestro: LocalConfigure Maestro Maestro/packages Maestro.AddIn.ExtendedObjectModels Maestro.AddIn.FdoToolbox Maestro.AddIn.Local Maestro.AddIn.Rest Maestro.AddIn.Scripting Maestro.AddInManager Maestro.Base Maestro.Editors Maestro.LiveMapEditor Maestro.Login Maestro.MapViewer Maestro.Packaging Maestro.Shared.UI MaestroAPITestRunner MaestroAPITests MaestroFsPreview MgCooker MgCooker.Cmd MpuCalc OSGeo.FDO.Expressions OSGeo.MapGuide.MaestroAPI OSGeo.MapGuide.MaestroAPI.Http OSGeo.MapGuide.MaestroAPI.Local OSGeo.MapGuide.MaestroAPI.Native OSGeo.MapGuide.MaestroAPI.Tests OSGeo.MapGuide.ObjectModel.Tests OSGeo.MapGuide.ObjectModels ProviderTemplate RtMapInspector SignMapGuideApi Thirdparty/SharpDevelop/ICSharpCode.Core Thirdparty/SharpDevelop/ICSharpCode.Core.WinForms Thirdparty/SharpDevelop/ICSharpCode.TextEditor
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Sep 24 06:32:49 PDT 2015
Author: jng
Date: 2015-09-24 06:32:49 -0700 (Thu, 24 Sep 2015)
New Revision: 8765
Modified:
trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/packages.config
trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Maestro.AddIn.FdoToolbox.csproj
trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/packages.config
trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
trunk/Tools/Maestro/Maestro.AddIn.Local/app.config
trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config
trunk/Tools/Maestro/Maestro.AddIn.Rest/Maestro.AddIn.Rest.csproj
trunk/Tools/Maestro/Maestro.AddIn.Rest/packages.config
trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj
trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config
trunk/Tools/Maestro/Maestro.AddInManager/Maestro.AddInManager.csproj
trunk/Tools/Maestro/Maestro.AddInManager/packages.config
trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
trunk/Tools/Maestro/Maestro.Base/packages.config
trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
trunk/Tools/Maestro/Maestro.Editors/packages.config
trunk/Tools/Maestro/Maestro.LiveMapEditor/Maestro.LiveMapEditor.csproj
trunk/Tools/Maestro/Maestro.LiveMapEditor/packages.config
trunk/Tools/Maestro/Maestro.Login/Maestro.Login.csproj
trunk/Tools/Maestro/Maestro.Login/packages.config
trunk/Tools/Maestro/Maestro.MapViewer/Maestro.MapViewer.csproj
trunk/Tools/Maestro/Maestro.MapViewer/packages.config
trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj
trunk/Tools/Maestro/Maestro.Packaging/packages.config
trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj
trunk/Tools/Maestro/Maestro.Shared.UI/packages.config
trunk/Tools/Maestro/Maestro/Maestro.csproj
trunk/Tools/Maestro/Maestro/packages.config
trunk/Tools/Maestro/Maestro/packages/
trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj
trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
trunk/Tools/Maestro/MaestroAPITests/packages.config
trunk/Tools/Maestro/MaestroFsPreview/MaestroFsPreview.csproj
trunk/Tools/Maestro/MaestroFsPreview/packages.config
trunk/Tools/Maestro/MgCooker.Cmd/MgCooker.Cmd.csproj
trunk/Tools/Maestro/MgCooker.Cmd/packages.config
trunk/Tools/Maestro/MgCooker/MgCooker.csproj
trunk/Tools/Maestro/MgCooker/packages.config
trunk/Tools/Maestro/MpuCalc/MpuCalc.csproj
trunk/Tools/Maestro/MpuCalc/packages.config
trunk/Tools/Maestro/OSGeo.FDO.Expressions/OSGeo.FDO.Expressions.csproj
trunk/Tools/Maestro/OSGeo.FDO.Expressions/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.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.Native/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
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/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/OSGeo.MapGuide.ObjectModels.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/packages.config
trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj
trunk/Tools/Maestro/ProviderTemplate/packages.config
trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj
trunk/Tools/Maestro/RtMapInspector/packages.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:
NuGet package updates:
- Refactoring Essentials (1.2.0 -> 2.0.0)
- mg-desktop (2.6.0 -> 3.0.0)
- MapGuide API base (2.6.0 -> 3.0.0)
- RestSharp (105.2.1 -> 105.2.3)
Modified: trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -85,6 +85,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
+ <None Include="packages.config" />
<None Include="Resources\Platform.ini" />
</ItemGroup>
<ItemGroup>
@@ -107,6 +108,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: trunk/Tools/Maestro/Maestro/Maestro.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro/Maestro.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro/Maestro.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -522,7 +522,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
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
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
GeoAPI.1.7.3
NetTopologySuite.1.13.3.2
ProjNET4GeoAPI.1.3.0.4
Newtonsoft.Json.6.0.8
RefactoringEssentials.1.1.0
GeoAPI.1.7.3.1
Moq.4.2.1507.0118
Newtonsoft.Json.7.0.1
NUnit.2.6.4
RefactoringEssentials.1.2.0
RestSharp.105.2.1
Microsoft.CodeAnalysis.Analyzers.1.0.0
Microsoft.CodeAnalysis.Common.1.0.0
Microsoft.CodeAnalysis.CSharp.1.0.0
System.Collections.Immutable.1.1.36
System.Reflection.Metadata.1.0.21
+ DockPanelSuite.2.9.0.0
GeoAPI.1.7.3
GeoAPI.1.7.3.1
IronPython.2.7.4
IronPython.2.7.5
IronPython.StdLib.2.7.4
IronPython.StdLib.2.7.5
Irony.0.9.0
Microsoft.CodeAnalysis.Analyzers.1.0.0
Microsoft.CodeAnalysis.CSharp.1.0.0
Microsoft.CodeAnalysis.Common.1.0.0
Moq.4.2.1409.1722
Moq.4.2.1507.0118
NUnit.2.6.2
NUnit.2.6.3
NUnit.2.6.4
NetTopologySuite.1.13.3.2
Newtonsoft.Json.6.0.8
Newtonsoft.Json.7.0.1
ProjNET4GeoAPI.1.3.0.4
RefactoringEssentials.1.1.0
RefactoringEssentials.1.2.0
RefactoringEssentials.2.0.0
RestSharp.105.0.1
RestSharp.105.2.1
SharpZipLib.0.86.0
System.Collections.Immutable.1.1.36
System.Reflection.Metadata.1.0.21
TreeViewAdv.1.7.0.0
fleesharp.0.9.27-pre
mapguide-api-base-x86.2.5.2.7949
mapguide-api-base-x86.2.6.0.8316
mapguide-api-base-x86.3.0.0.8701
mg-desktop-net40-x86.2.5.2.7949
mg-desktop-viewer-net40-x86.2.5.2.7949
mg-desktop-viewer-x86.2.6.0.8316
mg-desktop-viewer-x86.3.0.0.8701
mg-desktop-x86.2.6.0.8316
mg-desktop-x86.3.0.0.8701
RestSharp.105.2.3
Modified: trunk/Tools/Maestro/Maestro/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="IronPython" version="2.7.5" targetFramework="net45" />
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -180,7 +180,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ 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 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Maestro.AddIn.FdoToolbox.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -143,7 +143,7 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ 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 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -59,29 +59,29 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <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 Include="OSGeo.MapGuide.Desktop, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
+ <HintPath>..\Maestro\packages\mg-desktop-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <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 Include="OSGeo.MapGuide.Foundation, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <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 Include="OSGeo.MapGuide.Geometry, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <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 Include="OSGeo.MapGuide.PlatformBase, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <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 Include="OSGeo.MapGuide.Viewer, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\mg-desktop-viewer-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.Viewer.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <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 Include="OSGeo.MapGuide.Viewer.Desktop, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\mg-desktop-viewer-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.Viewer.Desktop.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -739,7 +739,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -761,7 +761,7 @@
</Target>
<PropertyGroup>
<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>
+xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.3.0.0.8701\mapguide-api-base\*.*" "$(TargetDir)"
+xcopy /s /y "$(SolutionDir)packages\mg-desktop-x86.3.0.0.8701\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/app.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/app.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,11 +1,27 @@
-<?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>
+ <dependentAssembly>
+ <assemblyIdentity name="OSGeo.MapGuide.PlatformBase" publicKeyToken="f526c48929fda856" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-3.0.0.8701" newVersion="3.0.0.8701" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="OSGeo.MapGuide.Geometry" publicKeyToken="f526c48929fda856" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-3.0.0.8701" newVersion="3.0.0.8701" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="OSGeo.MapGuide.Foundation" publicKeyToken="f526c48929fda856" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-3.0.0.8701" newVersion="3.0.0.8701" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="OSGeo.MapGuide.Desktop" publicKeyToken="e75f9fd7cf82dc3f" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-3.0.0.8701" newVersion="3.0.0.8701" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mapguide-api-base-x86" version="2.6.0.8316" targetFramework="net45" />
- <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" />
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="mapguide-api-base-x86" version="3.0.0.8701" targetFramework="net45" />
+ <package id="mg-desktop-viewer-x86" version="3.0.0.8701" targetFramework="net45" />
+ <package id="mg-desktop-x86" version="3.0.0.8701" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/Maestro.AddIn.Rest.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/Maestro.AddIn.Rest.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/Maestro.AddIn.Rest.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -40,8 +40,8 @@
<HintPath>..\Maestro\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="RestSharp, Version=105.2.1.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\Maestro\packages\RestSharp.105.2.1\lib\net451\RestSharp.dll</HintPath>
+ <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\RestSharp.105.2.3\lib\net451\RestSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@@ -214,7 +214,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net451" />
- <package id="RestSharp" version="105.2.1" targetFramework="net451" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net451" developmentDependency="true" />
+ <package id="RestSharp" version="105.2.3" targetFramework="net451" />
</packages>
\ 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 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -687,7 +687,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -2,5 +2,5 @@
<packages>
<package id="IronPython" version="2.7.5" targetFramework="net45" />
<package id="IronPython.StdLib" version="2.7.5" targetFramework="net45" />
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddInManager/Maestro.AddInManager.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -118,7 +118,7 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
Modified: trunk/Tools/Maestro/Maestro.AddInManager/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.AddInManager/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net4-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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -728,7 +728,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
Modified: trunk/Tools/Maestro/Maestro.Base/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.Base/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
<package id="TreeViewAdv" version="1.7.0.0" targetFramework="net4" />
</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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -2838,7 +2838,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
Modified: trunk/Tools/Maestro/Maestro.Editors/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.Editors/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net4" />
<package id="TreeViewAdv" version="1.7.0.0" targetFramework="net4" />
</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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/Maestro.LiveMapEditor.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -175,7 +175,7 @@
<Content Include="MapGuide Maestro.ico" />
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Login/Maestro.Login.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/Maestro.Login.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.Login/Maestro.Login.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -179,7 +179,7 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Tools/Maestro/Maestro.Login/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.Login/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.MapViewer/Maestro.MapViewer.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/Maestro.MapViewer.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.MapViewer/Maestro.MapViewer.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -301,7 +301,7 @@
<None Include="Resources\zoomout.cur" />
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Tools/Maestro/Maestro.MapViewer/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.MapViewer/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -168,7 +168,7 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
Modified: trunk/Tools/Maestro/Maestro.Packaging/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.Packaging/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net4-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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -222,7 +222,7 @@
<Content Include="license.txt" />
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DockPanelSuite" version="2.9.0.0" targetFramework="net4-client" />
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -70,16 +70,16 @@
<HintPath>..\Maestro\packages\NUnit.Runners.2.6.3\tools\lib\nunit-console-runner.dll</HintPath>
</Reference>
<Reference Include="OSGeo.MapGuide.Desktop">
- <HintPath>..\Maestro\packages\mg-desktop-net40-x86.2.5.2.7949\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
+ <HintPath>..\Maestro\packages\mg-desktop-x86.3.0.0.8701\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>
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.3.0.0.8701\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>
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.3.0.0.8701\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>
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
@@ -184,8 +184,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.6.0.8316\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-x86.2.6.0.8316\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.3.0.0.8701\mapguide-api-base\*.*" "$(TargetDir)"
+xcopy /s /y "$(SolutionDir)packages\mg-desktop-x86.3.0.0.8701\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/MaestroAPITests/MaestroAPITests.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -659,6 +659,9 @@
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
+ <ItemGroup>
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Modified: trunk/Tools/Maestro/MaestroAPITests/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/MaestroAPITests/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -2,4 +2,5 @@
<packages>
<package id="GeoAPI" version="1.7.3.1" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroFsPreview/MaestroFsPreview.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/MaestroFsPreview.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/MaestroFsPreview/MaestroFsPreview.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -153,7 +153,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Tools/Maestro/MaestroFsPreview/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/MaestroFsPreview/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MgCooker/MgCooker.csproj
===================================================================
--- trunk/Tools/Maestro/MgCooker/MgCooker.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/MgCooker/MgCooker.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -163,7 +163,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Tools/Maestro/MgCooker/packages.config
===================================================================
--- trunk/Tools/Maestro/MgCooker/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/MgCooker/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MgCooker.Cmd/MgCooker.Cmd.csproj
===================================================================
--- trunk/Tools/Maestro/MgCooker.Cmd/MgCooker.Cmd.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/MgCooker.Cmd/MgCooker.Cmd.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -101,7 +101,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Tools/Maestro/MgCooker.Cmd/packages.config
===================================================================
--- trunk/Tools/Maestro/MgCooker.Cmd/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/MgCooker.Cmd/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MpuCalc/MpuCalc.csproj
===================================================================
--- trunk/Tools/Maestro/MpuCalc/MpuCalc.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/MpuCalc/MpuCalc.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -38,17 +38,17 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <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 Include="OSGeo.MapGuide.Foundation, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <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 Include="OSGeo.MapGuide.Geometry, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <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 Include="OSGeo.MapGuide.PlatformBase, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -70,7 +70,7 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
@@ -82,7 +82,7 @@
</Target>
<PropertyGroup>
<PostBuildEvent>
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.6.0.8316\mapguide-api-base\*.*" "$(TargetDir)"</PostBuildEvent>
+xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.3.0.0.8701\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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/MpuCalc/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mapguide-api-base-x86" version="2.6.0.8316" targetFramework="net45" />
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="mapguide-api-base-x86" version="3.0.0.8701" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/OSGeo.FDO.Expressions.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/OSGeo.FDO.Expressions.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/OSGeo.FDO.Expressions.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -101,7 +101,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Irony" version="0.9.0" targetFramework="net451" />
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -427,7 +427,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -3,5 +3,5 @@
<package id="GeoAPI" version="1.7.3.1" targetFramework="net45" />
<package id="NetTopologySuite" version="1.13.3.2" targetFramework="net45" />
<package id="ProjNET4GeoAPI" version="1.3.0.4" targetFramework="net45" />
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -148,7 +148,7 @@
<None Include="Resources\TextWatermark.txt" />
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GeoAPI" version="1.7.3.1" targetFramework="net45" />
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs 2015-09-24 13:32:49 UTC (rev 8765)
@@ -940,7 +940,7 @@
try
{
MgdFeatureService fs = GetFeatureService();
- return fs.UpdateFeatures(fsId, className, props, filter);
+ return fs.UpdateMatchingFeatures(fsId, className, props, filter);
}
catch (MgException ex)
{
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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -63,17 +63,21 @@
<HintPath>..\Maestro\packages\GeoAPI.1.7.3.1\lib\net45\GeoAPI.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.Desktop">
- <HintPath>..\Maestro\packages\mg-desktop-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.Desktop, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
+ <HintPath>..\Maestro\packages\mg-desktop-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.Foundation, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.Geometry, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\Maestro\packages\mapguide-api-base-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
+ <Reference Include="OSGeo.MapGuide.PlatformBase, Version=3.0.0.8701, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <HintPath>..\Maestro\packages\mapguide-api-base-x86.3.0.0.8701\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -165,7 +169,7 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
@@ -177,8 +181,8 @@
</Target>
<PropertyGroup>
<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>
+xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.3.0.0.8701\mapguide-api-base\*.*" "$(TargetDir)"
+xcopy /s /y "$(SolutionDir)packages\mg-desktop-x86.3.0.0.8701\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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GeoAPI" version="1.7.3.1" targetFramework="net45" />
- <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" />
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="mapguide-api-base-x86" version="3.0.0.8701" targetFramework="net45" />
+ <package id="mg-desktop-x86" version="3.0.0.8701" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -157,7 +157,7 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GeoAPI" version="1.7.3.1" targetFramework="net45" />
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -180,6 +180,9 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -3,4 +3,5 @@
<package id="GeoAPI" version="1.7.3.1" targetFramework="net45" />
<package id="Moq" version="4.2.1507.0118" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/OSGeo.MapGuide.ObjectModels.Tests.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -144,6 +144,9 @@
<ItemGroup>
<None Include="Resources\OldTiledMap.txt" />
</ItemGroup>
+ <ItemGroup>
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -2,4 +2,5 @@
<packages>
<package id="Moq" version="4.2.1507.0118" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/OSGeo.MapGuide.ObjectModels.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/OSGeo.MapGuide.ObjectModels.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/OSGeo.MapGuide.ObjectModels.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -314,7 +314,7 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -111,7 +111,7 @@
<ItemGroup>
<Analyzer Include="..\Maestro\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
<Analyzer Include="..\Maestro\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Tools/Maestro/ProviderTemplate/packages.config
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/ProviderTemplate/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -3,7 +3,7 @@
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" targetFramework="net45" />
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
<package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -142,7 +142,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.1.2.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Tools/Maestro/RtMapInspector/packages.config
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/packages.config 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/RtMapInspector/packages.config 2015-09-24 13:32:49 UTC (rev 8765)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="RefactoringEssentials" version="1.2.0" targetFramework="net45" />
+ <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/SignMapGuideApi/SignMapGuideApi.csproj
===================================================================
--- trunk/Tools/Maestro/SignMapGuideApi/SignMapGuideApi.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/SignMapGuideApi/SignMapGuideApi.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -52,7 +52,11 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
+ <None Include="packages.config" />
</ItemGroup>
+ <ItemGroup>
+ <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ </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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core/ICSharpCode.Core.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -146,5 +146,11 @@
<Link>Src\AddInTree\AddIn\AddIn.xsd</Link>
</Content>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <Analyzer Include="..\..\..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
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-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -120,11 +120,16 @@
<Compile Include="Util\RightToLeftConverter.cs" />
<Compile Include="WinFormsResourceService.cs" />
</ItemGroup>
- <ItemGroup />
<ItemGroup>
<ProjectReference Include="..\ICSharpCode.Core\ICSharpCode.Core.csproj">
<Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
<Name>ICSharpCode.Core</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <Analyzer Include="..\..\..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.TextEditor/ICSharpCode.TextEditor.csproj
===================================================================
--- trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.TextEditor/ICSharpCode.TextEditor.csproj 2015-09-24 12:17:06 UTC (rev 8764)
+++ trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.TextEditor/ICSharpCode.TextEditor.csproj 2015-09-24 13:32:49 UTC (rev 8765)
@@ -205,6 +205,7 @@
<EmbeddedResource Include="Resources\CSharp-Mode.xshd" />
<EmbeddedResource Include="Resources\HTML-Mode.xshd" />
<EmbeddedResource Include="Resources\FDO.xshd" />
+ <None Include="packages.config" />
<None Include="Resources\ICSharpCode.TextEditor.snk" />
<EmbeddedResource Include="Resources\TextEditorControl.bmp" />
<EmbeddedResource Include="Resources\Java-Mode.xshd" />
@@ -229,5 +230,8 @@
<EmbeddedResource Include="Resources\Python.xshd" />
<EmbeddedResource Include="Resources\SQL.xshd" />
</ItemGroup>
+ <ItemGroup>
+ <Analyzer Include="..\..\..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
More information about the mapguide-commits
mailing list