[mapguide-commits] r8905 - 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.MaestroAPI.Tests/Schema OSGeo.MapGuide.ObjectModel.Tests OSGeo.MapGuide.ObjectModels ProviderTemplate RtMapInspector SignMapGuideApi
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Apr 7 05:56:21 PDT 2016
Author: jng
Date: 2016-04-07 05:56:21 -0700 (Thu, 07 Apr 2016)
New Revision: 8905
Added:
trunk/Tools/Maestro/Maestro.AddIn.Rest/app.config
trunk/Tools/Maestro/Maestro.Editors/app.config
trunk/Tools/Maestro/Maestro.Login/app.config
trunk/Tools/Maestro/Maestro.MapViewer/app.config
trunk/Tools/Maestro/Maestro.Packaging/app.config
trunk/Tools/Maestro/MaestroAPITests/app.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/app.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/app.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/app.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/app.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/app.config
Removed:
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/packages.config
trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/packages.config
trunk/Tools/Maestro/Maestro.LiveMapEditor/packages.config
trunk/Tools/Maestro/Maestro.Login/packages.config
trunk/Tools/Maestro/Maestro.MapViewer/packages.config
trunk/Tools/Maestro/MaestroFsPreview/packages.config
trunk/Tools/Maestro/MgCooker.Cmd/packages.config
trunk/Tools/Maestro/MgCooker/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/packages.config
trunk/Tools/Maestro/RtMapInspector/packages.config
Modified:
trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config
trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Maestro.AddIn.FdoToolbox.csproj
trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.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/app.config
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/app.config
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/app.config
trunk/Tools/Maestro/Maestro.Login/Maestro.Login.csproj
trunk/Tools/Maestro/Maestro.MapViewer/Maestro.MapViewer.csproj
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/App.config
trunk/Tools/Maestro/Maestro/Maestro.csproj
trunk/Tools/Maestro/Maestro/Maestro_All.sln
trunk/Tools/Maestro/Maestro/packages.config
trunk/Tools/Maestro/Maestro/packages/
trunk/Tools/Maestro/MaestroAPITestRunner/App.config
trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj
trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs
trunk/Tools/Maestro/MaestroAPITests/packages.config
trunk/Tools/Maestro/MaestroFsPreview/MaestroFsPreview.csproj
trunk/Tools/Maestro/MaestroFsPreview/app.config
trunk/Tools/Maestro/MgCooker.Cmd/MgCooker.Cmd.csproj
trunk/Tools/Maestro/MgCooker.Cmd/app.config
trunk/Tools/Maestro/MgCooker/MgCooker.csproj
trunk/Tools/Maestro/MgCooker/app.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/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/Schema/FeatureSchemaTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/GeometricPropertyDefinitionTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/SchemaTests.cs
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/ObjectFactoryTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/TileSetDefinitionTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/OSGeo.MapGuide.ObjectModels.csproj
trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj
trunk/Tools/Maestro/ProviderTemplate/packages.config
trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj
trunk/Tools/Maestro/RtMapInspector/app.config
trunk/Tools/Maestro/SignMapGuideApi/SignMapGuideApi.csproj
Log:
- Remove RefactoringEssentials analyzers
- Add missing app.config files as a result of NuGet package consolidation
Modified: trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -85,7 +85,6 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
- <None Include="packages.config" />
<None Include="Resources\Platform.ini" />
</ItemGroup>
<ItemGroup>
@@ -108,9 +107,6 @@
<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/App.config
===================================================================
--- trunk/Tools/Maestro/Maestro/App.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro/App.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<!--
If you use the Local Native Connection, setup assembly binding redirection by
@@ -28,7 +28,7 @@
</runtime>
-->
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<!--
Uncomment the section below for proxy server support.
@@ -43,9 +43,17 @@
<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="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.3.0" newVersion="1.7.3.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="NetTopologySuite" publicKeyToken="f580a05016ebada1" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.13.3.0" newVersion="1.13.3.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Modified: trunk/Tools/Maestro/Maestro/Maestro.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro/Maestro.csproj 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro/Maestro.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -521,9 +521,6 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
- <ItemGroup>
- <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')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Modified: trunk/Tools/Maestro/Maestro/Maestro_All.sln
===================================================================
--- trunk/Tools/Maestro/Maestro/Maestro_All.sln 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro/Maestro_All.sln 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "..\Thirdparty\SharpDevelop\ICSharpCode.Core\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
EndProject
@@ -310,6 +310,7 @@
{43B01C27-E0D2-439B-83ED-8C814ED1526A} = {8AEDB361-4C62-4FD6-8D45-14FAD3A53AB7}
{48C5EB23-45AE-4C4C-8FAB-635428AE8CA1} = {0DA73D0B-B89E-464B-AD24-CD370242F641}
{28224492-7383-46BD-AE64-2DA35243175C} = {7507E52A-413B-4E0D-A1FF-7D293E462C1B}
+ {8AEDB361-4C62-4FD6-8D45-14FAD3A53AB7} = {345BD020-7A7B-4E8B-9CC6-4EC111D51779}
{D32BE7DB-D0C3-4805-A057-18312370C57E} = {7507E52A-413B-4E0D-A1FF-7D293E462C1B}
{DA2CC031-200B-4F99-A0A9-2E95374BE78F} = {0DA73D0B-B89E-464B-AD24-CD370242F641}
{2BFC5B13-3179-4FF9-9877-0D6CE9911A74} = {D5A5B73D-6F2D-4199-8F1E-6786CE41B83D}
Property changes on: trunk/Tools/Maestro/Maestro/packages
___________________________________________________________________
Modified: svn:ignore
- 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
+ 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
GeoAPI.1.7.4
Irony.0.9.1
Microsoft.CodeAnalysis.Analyzers.1.1.0
Microsoft.CodeAnalysis.Common.1.2.1
Microsoft.CodeAnalysis.CSharp.1.2.1
Moq.4.2.1510.2205
NetTopologySuite.1.14
Newtonsoft.Json.8.0.3
NUnit.3.2.0
RefactoringEssentials.4.0.0
System.Collections.4.0.0
System.Collections.Immutable.1.1.37
System.Diagnostics.Debug.4.0.0
System.Globalization.4.0.0
System.Linq.4.0.0
System.Reflection.Metadata.1.2.0
System.Resources.ResourceManager.4.0.0
System.Runtime.4.0.0
System.Runtime.Extensions.4.0.0
System.Threading.4.0.0
Modified: trunk/Tools/Maestro/Maestro/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="IronPython" version="2.7.5" 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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -105,7 +105,6 @@
<Content Include="Manifest.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <None Include="packages.config" />
<None Include="Resources\Images\grid.png" />
<None Include="app.config" />
<None Include="Resources\water.png" />
@@ -179,9 +178,6 @@
<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.AddIn.ExtendedObjectModels/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,11 +1,15 @@
-<?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="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </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>
Deleted: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Maestro.AddIn.FdoToolbox.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -140,11 +140,7 @@
</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" />
<!-- 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.AddIn.FdoToolbox/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,11 +1,15 @@
-<?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="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </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>
Deleted: trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -738,9 +738,6 @@
<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.AddIn.Local/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/app.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -22,6 +22,10 @@
<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>
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
<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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -3,5 +3,4 @@
<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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/Maestro.AddIn.Rest.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -32,8 +32,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\Maestro\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
@@ -172,6 +172,7 @@
<Content Include="Manifest.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <None Include="app.config" />
<None Include="packages.config" />
<None Include="Resources\Images\pencil.png" />
<None Include="Resources\Images\blue-document--plus.png" />
@@ -214,9 +215,6 @@
<DependentUpon>RestLoginDialog.cs</DependentUpon>
</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">
Added: trunk/Tools/Maestro/Maestro.AddIn.Rest/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/app.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
- <package id="RefactoringEssentials" version="2.0.0" targetFramework="net451" developmentDependency="true" />
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
<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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -686,9 +686,6 @@
<DependentUpon>IronPythonRepl.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
- <ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /S /Y /I "$(SolutionDir)packages\IronPython.StdLib.2.7.5\content\Lib" "$(SolutionDir)$(OutDir)Lib"</PostBuildEvent>
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,11 +1,15 @@
-<?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="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </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.Scripting/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -2,5 +2,4 @@
<packages>
<package id="IronPython" version="2.7.5" targetFramework="net45" />
<package id="IronPython.StdLib" version="2.7.5" 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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddInManager/Maestro.AddInManager.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -117,9 +117,6 @@
<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" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Modified: trunk/Tools/Maestro/Maestro.AddInManager/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.AddInManager/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -727,9 +727,6 @@
<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" />
<PropertyGroup>
<PostBuildEvent>if not exist "$(TargetDir)..\..\SDK\addin-bin" md "$(TargetDir)..\..\SDK\addin-bin"
Modified: trunk/Tools/Maestro/Maestro.Base/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/app.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.Base/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,11 +1,15 @@
-<?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="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </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.Base/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.Base/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -2067,6 +2067,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <None Include="app.config" />
<None Include="packages.config" />
<None Include="Resources\document--plus.png" />
</ItemGroup>
@@ -2837,9 +2838,6 @@
<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" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Added: trunk/Tools/Maestro/Maestro.Editors/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/app.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.Editors/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/Maestro.LiveMapEditor.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -113,7 +113,6 @@
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.config" />
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -174,9 +173,6 @@
<ItemGroup>
<Content Include="MapGuide Maestro.ico" />
</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.LiveMapEditor/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/app.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<!--
Uncomment the section below for proxy server support.
@@ -13,4 +13,12 @@
<defaultProxy useDefaultCredentials="true" />
</system.net>
-->
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
</configuration>
Deleted: trunk/Tools/Maestro/Maestro.LiveMapEditor/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.Login/Maestro.Login.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -176,11 +176,8 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
+ <None Include="app.config" />
</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.
Added: trunk/Tools/Maestro/Maestro.Login/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/app.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.Login/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Deleted: trunk/Tools/Maestro/Maestro.Login/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.Login/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.MapViewer/Maestro.MapViewer.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -102,7 +102,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
+ <None Include="app.config" />
<None Include="Resources\about.png" />
</ItemGroup>
<ItemGroup>
@@ -300,9 +300,6 @@
<ItemGroup>
<None Include="Resources\zoomout.cur" />
</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.
Added: trunk/Tools/Maestro/Maestro.MapViewer/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/app.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.MapViewer/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Deleted: trunk/Tools/Maestro/Maestro.MapViewer/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.MapViewer/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.Packaging/Maestro.Packaging.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -165,11 +165,9 @@
</BootstrapperPackage>
</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" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Added: trunk/Tools/Maestro/Maestro.Packaging/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/app.config (rev 0)
+++ trunk/Tools/Maestro/Maestro.Packaging/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Packaging/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.Packaging/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -218,12 +218,6 @@
<ItemGroup>
<None Include="Resources\cross.png" />
</ItemGroup>
- <ItemGroup>
- <Content Include="license.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/Maestro.Shared.UI/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DockPanelSuite" version="2.9.0.0" targetFramework="net4-client" />
- <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/App.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/App.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/App.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,17 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="MapGuideDotNetApi" publicKeyToken="f526c48929fda856"/>
+ <assemblyIdentity name="MapGuideDotNetApi" publicKeyToken="f526c48929fda856" />
- <codeBase version="1.0.0.1" href="MapGuideDotNetApi-2.2.dll"/>
+ <codeBase version="1.0.0.1" href="MapGuideDotNetApi-2.2.dll" />
- <bindingRedirect oldVersion="2.0.0.2308" newVersion="1.0.0.1"/>
+ <bindingRedirect oldVersion="2.0.0.2308" newVersion="1.0.0.1" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
</configuration>
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -62,8 +62,8 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="GeoAPI, Version=1.7.3.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Maestro\packages\GeoAPI.1.7.3\lib\net45-client\GeoAPI.dll</HintPath>
+ <HintPath>..\Maestro\packages\GeoAPI.1.7.3.1\lib\net45\GeoAPI.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="nunit-console-runner, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Modified: trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -68,8 +68,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Thirdparty\NMock\bin\NMock2.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\Maestro\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@@ -108,6 +108,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <None Include="app.config" />
<None Include="packages.config" />
<None Include="Resources\SelectAggregatesSample.xml" />
</ItemGroup>
@@ -659,9 +660,6 @@
<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/RuntimeMapTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1363,7 +1363,7 @@
}
Assert.NotNull(rtInfo.CoordinateSystem);
- Assert.IsNullOrEmpty(rtInfo.IconMimeType);
+ Assert.True(String.IsNullOrEmpty(rtInfo.IconMimeType));
Assert.NotNull(rtInfo.Extents);
Assert.NotNull(rtInfo.Layers);
Assert.True(rtInfo.Layers.Count == 0);
@@ -1380,7 +1380,7 @@
Assert.IsInstanceOf<MapModel.IRuntimeMapInfo2>(rtInfo);
}
Assert.NotNull(rtInfo.CoordinateSystem);
- Assert.IsNullOrEmpty(rtInfo.IconMimeType);
+ Assert.True(String.IsNullOrEmpty(rtInfo.IconMimeType));
Assert.NotNull(rtInfo.Extents);
Assert.NotNull(rtInfo.Layers);
Assert.True(rtInfo.Layers.Count == 0);
@@ -1400,7 +1400,7 @@
Assert.IsInstanceOf<MapModel.IRuntimeMapInfo2>(rtInfo);
}
Assert.NotNull(rtInfo.CoordinateSystem);
- Assert.IsNullOrEmpty(rtInfo.IconMimeType);
+ Assert.True(String.IsNullOrEmpty(rtInfo.IconMimeType));
Assert.NotNull(rtInfo.Extents);
Assert.NotNull(rtInfo.Layers);
Assert.True(rtInfo.Layers.Count > 0);
@@ -1423,7 +1423,7 @@
Assert.IsInstanceOf<MapModel.IRuntimeMapInfo2>(rtInfo);
}
Assert.NotNull(rtInfo.CoordinateSystem);
- Assert.IsNotNullOrEmpty(rtInfo.IconMimeType);
+ Assert.False(String.IsNullOrEmpty(rtInfo.IconMimeType));
Assert.NotNull(rtInfo.Extents);
Assert.NotNull(rtInfo.Layers);
Assert.True(rtInfo.Layers.Count > 0);
@@ -1442,7 +1442,7 @@
foreach (var rule in feat.Rules)
{
- Assert.IsNotNullOrEmpty(rule.IconBase64);
+ Assert.False(String.IsNullOrEmpty(rule.IconBase64));
}
}
}
@@ -1461,16 +1461,16 @@
Assert.IsInstanceOf<MapModel.IRuntimeMapInfo2>(rtInfo);
}
Assert.NotNull(rtInfo.CoordinateSystem);
- Assert.IsNotNullOrEmpty(rtInfo.IconMimeType);
+ Assert.False(String.IsNullOrEmpty(rtInfo.IconMimeType));
Assert.NotNull(rtInfo.Extents);
Assert.NotNull(rtInfo.Layers);
Assert.True(rtInfo.Layers.Count > 0);
foreach (var layer in rtInfo.Layers)
{
Assert.NotNull(layer.FeatureSource);
- Assert.IsNotNullOrEmpty(layer.FeatureSource.ClassName);
- Assert.IsNotNullOrEmpty(layer.FeatureSource.Geometry);
- Assert.IsNotNullOrEmpty(layer.FeatureSource.ResourceID);
+ Assert.False(String.IsNullOrEmpty(layer.FeatureSource.ClassName));
+ Assert.False(String.IsNullOrEmpty(layer.FeatureSource.Geometry));
+ Assert.False(String.IsNullOrEmpty(layer.FeatureSource.ResourceID));
Assert.True(layer.ScaleRanges.Count > 0);
foreach (var sr in layer.ScaleRanges)
{
@@ -1483,7 +1483,7 @@
foreach (var rule in feat.Rules)
{
- Assert.IsNotNullOrEmpty(rule.IconBase64);
+ Assert.False(String.IsNullOrEmpty(rule.IconBase64));
}
}
}
@@ -1535,7 +1535,7 @@
Assert.IsInstanceOf<MapModel.IRuntimeMapInfo2>(rtInfo);
}
Assert.NotNull(rtInfo.CoordinateSystem);
- Assert.IsNullOrEmpty(rtInfo.IconMimeType);
+ Assert.True(String.IsNullOrEmpty(rtInfo.IconMimeType));
Assert.NotNull(rtInfo.Extents);
Assert.NotNull(rtInfo.Layers);
Assert.True(rtInfo.Layers.Count == 0);
@@ -1559,7 +1559,7 @@
Assert.IsInstanceOf<MapModel.IRuntimeMapInfo2>(rtInfo);
}
Assert.NotNull(rtInfo.CoordinateSystem);
- Assert.IsNullOrEmpty(rtInfo.IconMimeType);
+ Assert.True(String.IsNullOrEmpty(rtInfo.IconMimeType));
Assert.NotNull(rtInfo.Extents);
Assert.NotNull(rtInfo.Layers);
Assert.True(rtInfo.Layers.Count == 0);
@@ -1586,7 +1586,7 @@
Assert.IsInstanceOf<MapModel.IRuntimeMapInfo2>(rtInfo);
}
Assert.NotNull(rtInfo.CoordinateSystem);
- Assert.IsNullOrEmpty(rtInfo.IconMimeType);
+ Assert.True(String.IsNullOrEmpty(rtInfo.IconMimeType));
Assert.NotNull(rtInfo.Extents);
Assert.NotNull(rtInfo.Layers);
Assert.True(rtInfo.Layers.Count > 0);
@@ -1616,7 +1616,7 @@
Assert.IsInstanceOf<MapModel.IRuntimeMapInfo2>(rtInfo);
}
Assert.NotNull(rtInfo.CoordinateSystem);
- Assert.IsNotNullOrEmpty(rtInfo.IconMimeType);
+ Assert.False(String.IsNullOrEmpty(rtInfo.IconMimeType));
Assert.NotNull(rtInfo.Extents);
Assert.NotNull(rtInfo.Layers);
Assert.True(rtInfo.Layers.Count > 0);
@@ -1635,7 +1635,7 @@
foreach (var rule in feat.Rules)
{
- Assert.IsNotNullOrEmpty(rule.IconBase64);
+ Assert.False(String.IsNullOrEmpty(rule.IconBase64));
}
}
}
@@ -1661,16 +1661,16 @@
Assert.IsInstanceOf<MapModel.IRuntimeMapInfo2>(rtInfo);
}
Assert.NotNull(rtInfo.CoordinateSystem);
- Assert.IsNotNullOrEmpty(rtInfo.IconMimeType);
+ Assert.False(String.IsNullOrEmpty(rtInfo.IconMimeType));
Assert.NotNull(rtInfo.Extents);
Assert.NotNull(rtInfo.Layers);
Assert.True(rtInfo.Layers.Count > 0);
foreach (var layer in rtInfo.Layers)
{
Assert.NotNull(layer.FeatureSource);
- Assert.IsNotNullOrEmpty(layer.FeatureSource.ClassName);
- Assert.IsNotNullOrEmpty(layer.FeatureSource.Geometry);
- Assert.IsNotNullOrEmpty(layer.FeatureSource.ResourceID);
+ Assert.False(String.IsNullOrEmpty(layer.FeatureSource.ClassName));
+ Assert.False(String.IsNullOrEmpty(layer.FeatureSource.Geometry));
+ Assert.False(String.IsNullOrEmpty(layer.FeatureSource.ResourceID));
Assert.True(layer.ScaleRanges.Count > 0);
foreach (var sr in layer.ScaleRanges)
{
@@ -1683,7 +1683,7 @@
foreach (var rule in feat.Rules)
{
- Assert.IsNotNullOrEmpty(rule.IconBase64);
+ Assert.False(String.IsNullOrEmpty(rule.IconBase64));
}
}
}
Added: trunk/Tools/Maestro/MaestroAPITests/app.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/app.config (rev 0)
+++ trunk/Tools/Maestro/MaestroAPITests/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroAPITests/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MaestroAPITests/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<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" />
+ <package id="NUnit" version="3.2.0" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroFsPreview/MaestroFsPreview.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/MaestroFsPreview.csproj 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MaestroFsPreview/MaestroFsPreview.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -99,7 +99,6 @@
<DesignTime>True</DesignTime>
</Compile>
<None Include="app.config" />
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -131,9 +130,6 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
- </ItemGroup>
- <ItemGroup>
<ProjectReference Include="..\Maestro.Editors\Maestro.Editors.csproj">
<Project>{5ad2cdba-952e-4148-98a1-31d2e0d540d5}</Project>
<Name>Maestro.Editors</Name>
Modified: trunk/Tools/Maestro/MaestroFsPreview/app.config
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/app.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MaestroFsPreview/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<!--
Uncomment the section below for proxy server support.
@@ -13,4 +13,12 @@
<defaultProxy useDefaultCredentials="true" />
</system.net>
-->
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
</configuration>
Deleted: trunk/Tools/Maestro/MaestroFsPreview/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MaestroFsPreview/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MgCooker/MgCooker.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -107,7 +107,6 @@
<SubType>Designer</SubType>
</EmbeddedResource>
<None Include="app.config" />
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -162,9 +161,6 @@
<Name>OSGeo.MapGuide.ObjectModels</Name>
</ProjectReference>
</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/MgCooker/app.config
===================================================================
--- trunk/Tools/Maestro/MgCooker/app.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MgCooker/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<!--
Uncomment the section below for proxy server support.
@@ -13,4 +13,12 @@
<defaultProxy useDefaultCredentials="true" />
</system.net>
-->
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
</configuration>
Deleted: trunk/Tools/Maestro/MgCooker/packages.config
===================================================================
--- trunk/Tools/Maestro/MgCooker/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MgCooker/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MgCooker.Cmd/MgCooker.Cmd.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -81,7 +81,6 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
- <None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -100,9 +99,6 @@
<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/MgCooker.Cmd/app.config
===================================================================
--- trunk/Tools/Maestro/MgCooker.Cmd/app.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MgCooker.Cmd/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,6 +1,14 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
</configuration>
Deleted: trunk/Tools/Maestro/MgCooker.Cmd/packages.config
===================================================================
--- trunk/Tools/Maestro/MgCooker.Cmd/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MgCooker.Cmd/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MpuCalc/MpuCalc.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -69,9 +69,6 @@
<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" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Modified: trunk/Tools/Maestro/MpuCalc/packages.config
===================================================================
--- trunk/Tools/Maestro/MpuCalc/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/MpuCalc/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/OSGeo.FDO.Expressions.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -37,8 +37,9 @@
<DocumentationFile>..\SDK\bin\OSGeo.FDO.Expressions.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Irony">
- <HintPath>..\Maestro\packages\Irony.0.9.0\lib\net45\Irony.dll</HintPath>
+ <Reference Include="Irony, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ca48ace7223ead47, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Irony.0.9.1\lib\net40\Irony.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -92,16 +93,13 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="Strings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <Analyzer Include="..\Maestro\packages\RefactoringEssentials.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <None Include="packages.config" />
</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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Irony" version="0.9.0" targetFramework="net451" />
- <package id="RefactoringEssentials" version="2.0.0" targetFramework="net45" developmentDependency="true" />
+ <package id="Irony" version="0.9.1" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -65,14 +65,17 @@
<HintPath>..\Maestro\packages\GeoAPI.1.7.3.1\lib\net45\GeoAPI.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="NetTopologySuite">
+ <Reference Include="NetTopologySuite, Version=1.13.3.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
<HintPath>..\Maestro\packages\NetTopologySuite.1.13.3.2\lib\net45\NetTopologySuite.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <Reference Include="PowerCollections">
+ <Reference Include="PowerCollections, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2573bf8a1bdddcd5, processorArchitecture=MSIL">
<HintPath>..\Maestro\packages\NetTopologySuite.1.13.3.2\lib\net45\PowerCollections.dll</HintPath>
+ <Private>True</Private>
</Reference>
- <Reference Include="ProjNet">
+ <Reference Include="ProjNet, Version=1.3.0.3, Culture=neutral, PublicKeyToken=a1f5bdcd9c6f5740, processorArchitecture=MSIL">
<HintPath>..\Maestro\packages\ProjNET4GeoAPI.1.3.0.4\lib\net45-client\ProjNet.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -246,6 +249,7 @@
<Compile Include="XmlValidator.cs" />
</ItemGroup>
<ItemGroup>
+ <None Include="app.config" />
<None Include="packages.config" />
<None Include="Schemas\ApplicationDefinition-1.0.0.xsd">
</None>
@@ -426,9 +430,6 @@
<Name>OSGeo.MapGuide.ObjectModels</Name>
</ProjectReference>
</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">
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/app.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/app.config (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -3,5 +3,4 @@
<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="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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -144,12 +144,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <None Include="app.config" />
<None Include="packages.config" />
<None Include="Resources\TextWatermark.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">
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/app.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/app.config (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GeoAPI" version="1.7.3.1" 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/OSGeo.MapGuide.MaestroAPI.Local.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -166,11 +166,9 @@
</BootstrapperPackage>
</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" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/app.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/app.config (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -3,5 +3,4 @@
<package id="GeoAPI" version="1.7.3.1" 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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -154,11 +154,9 @@
</BootstrapperPackage>
</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>xcopy /Y /I "$(ProjectDir)*.cs" "$(SolutionDir)..\SDK\LocalNativeProvider\Src\"
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/app.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/app.config (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GeoAPI" version="1.7.3.1" 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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -40,12 +40,12 @@
<HintPath>..\Maestro\packages\GeoAPI.1.7.3.1\lib\net45\GeoAPI.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
- <HintPath>..\Maestro\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
+ <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\Maestro\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@@ -105,9 +105,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
- <ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
@@ -135,6 +132,8 @@
<Link>UserTestData\gen_default1_SqlServer_master.xml</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <None Include="app.config" />
+ <None Include="packages.config" />
<None Include="Resources\SelectSqlSample.xml" />
<None Include="Resources\SelectFeatureSample.xml" />
<None Include="Resources\SelectAggregatesSample.xml" />
@@ -180,9 +179,6 @@
<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/Schema/FeatureSchemaTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/FeatureSchemaTests.cs 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/FeatureSchemaTests.cs 2016-04-07 12:56:21 UTC (rev 8905)
@@ -35,13 +35,13 @@
public void FeatureSchemaTest()
{
var fs = new FeatureSchema();
- Assert.IsNullOrEmpty(fs.Name);
- Assert.IsNullOrEmpty(fs.Description);
+ Assert.True(String.IsNullOrEmpty(fs.Name));
+ Assert.True(String.IsNullOrEmpty(fs.Description));
Assert.AreEqual(0, fs.Classes.Count);
fs = new FeatureSchema("Foo", "");
Assert.AreEqual("Foo", fs.Name);
- Assert.IsNullOrEmpty(fs.Description);
+ Assert.True(String.IsNullOrEmpty(fs.Description));
Assert.AreEqual(0, fs.Classes.Count);
fs = new FeatureSchema("Foo", "Bar");
@@ -156,7 +156,7 @@
fs.WriteXml(doc, doc);
string xml = doc.ToXmlString();
- Assert.IsNotNullOrEmpty(xml);
+ Assert.False(String.IsNullOrEmpty(xml));
}
[Test]
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/GeometricPropertyDefinitionTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/GeometricPropertyDefinitionTests.cs 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/GeometricPropertyDefinitionTests.cs 2016-04-07 12:56:21 UTC (rev 8905)
@@ -37,7 +37,7 @@
Assert.AreEqual("Foo", prop.Name);
Assert.AreEqual("Bar", prop.Description);
Assert.AreEqual(0, prop.SpecificGeometryTypes.Length);
- Assert.IsNullOrEmpty(prop.SpatialContextAssociation);
+ Assert.True(String.IsNullOrEmpty(prop.SpatialContextAssociation));
}
[Test]
@@ -47,7 +47,7 @@
Assert.AreEqual("Foo", prop.Name);
Assert.AreEqual("Bar", prop.Description);
Assert.AreEqual(0, prop.SpecificGeometryTypes.Length);
- Assert.IsNullOrEmpty(prop.SpatialContextAssociation);
+ Assert.True(String.IsNullOrEmpty(prop.SpatialContextAssociation));
prop.GeometricTypes = FeatureGeometricType.Curve | FeatureGeometricType.Solid;
var types = new List<string>(prop.GeometryTypesToString().Split(' '));
@@ -64,7 +64,7 @@
Assert.AreEqual("Foo", prop.Name);
Assert.AreEqual("Bar", prop.Description);
Assert.AreEqual(0, prop.SpecificGeometryTypes.Length);
- Assert.IsNullOrEmpty(prop.SpatialContextAssociation);
+ Assert.True(String.IsNullOrEmpty(prop.SpatialContextAssociation));
prop.GeometricTypes = FeatureGeometricType.Curve | FeatureGeometricType.Solid;
@@ -82,7 +82,7 @@
Assert.AreEqual("Foo", prop.Name);
Assert.AreEqual("Bar", prop.Description);
Assert.AreEqual(0, prop.SpecificGeometryTypes.Length);
- Assert.IsNullOrEmpty(prop.SpatialContextAssociation);
+ Assert.True(String.IsNullOrEmpty(prop.SpatialContextAssociation));
prop.GeometricTypes = FeatureGeometricType.Curve | FeatureGeometricType.Point;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/SchemaTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/SchemaTests.cs 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/SchemaTests.cs 2016-04-07 12:56:21 UTC (rev 8905)
@@ -212,7 +212,7 @@
Assert.NotNull(geom);
cls.DefaultGeometryPropertyName = geom.Name;
- Assert.IsNotNullOrEmpty(cls.DefaultGeometryPropertyName);
+ Assert.False(String.IsNullOrEmpty(cls.DefaultGeometryPropertyName));
schema.AddClass(cls);
Assert.AreEqual(schema, cls.Parent);
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/app.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/app.config (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<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" />
+ <package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
+ <package id="NUnit" version="3.2.0" targetFramework="net45" />
</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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/OSGeo.MapGuide.ObjectModels.Tests.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -51,12 +51,12 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
- <HintPath>..\Maestro\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
+ <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\Maestro\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@@ -144,9 +144,6 @@
<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/ObjectFactoryTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/ObjectFactoryTests.cs 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/ObjectFactoryTests.cs 2016-04-07 12:56:21 UTC (rev 8905)
@@ -288,8 +288,8 @@
Assert.NotNull(ds);
Assert.NotNull(ds.Sheet);
Assert.AreEqual(0, ds.Sheet.Count());
- Assert.IsNullOrEmpty(ds.SourceName);
- Assert.IsNullOrEmpty(ds.CoordinateSpace);
+ Assert.True(String.IsNullOrEmpty(ds.SourceName));
+ Assert.True(String.IsNullOrEmpty(ds.CoordinateSpace));
}
[Test]
@@ -306,7 +306,7 @@
var ext = fs.Extension;
Assert.NotNull(ext);
Assert.AreEqual(0, ext.Count());
- Assert.IsNullOrEmpty(fs.ConfigurationDocument);
+ Assert.True(String.IsNullOrEmpty(fs.ConfigurationDocument));
Assert.AreEqual(0, fs.ConnectionPropertyNames.Length);
}
@@ -328,10 +328,10 @@
var ext = fs.Extension;
Assert.NotNull(ext);
Assert.AreEqual(0, ext.Count());
- Assert.IsNullOrEmpty(fs.ConfigurationDocument);
+ Assert.True(String.IsNullOrEmpty(fs.ConfigurationDocument));
Assert.AreEqual(2, fs.ConnectionPropertyNames.Length);
- Assert.IsNotNullOrEmpty(fs.GetConnectionProperty("File"));
- Assert.IsNotNullOrEmpty(fs.GetConnectionProperty("ReadOnly"));
+ Assert.False(String.IsNullOrEmpty(fs.GetConnectionProperty("File")));
+ Assert.False(String.IsNullOrEmpty(fs.GetConnectionProperty("ReadOnly")));
var param2 = fs.GetConnectionProperties();
Assert.AreEqual(2, param2.Count);
Assert.NotNull(param2["File"]);
@@ -420,7 +420,7 @@
{
var mdf = ObjectFactory.CreateMapDefinition(version, "Test");
Assert.AreEqual("Test", mdf.Name);
- Assert.IsNullOrEmpty(mdf.CoordinateSystem);
+ Assert.True(String.IsNullOrEmpty(mdf.CoordinateSystem));
Assert.Null(mdf.ExtentCalculator);
Assert.Null(mdf.BaseMap);
Assert.NotNull(mdf.MapLayer);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/TileSetDefinitionTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/TileSetDefinitionTests.cs 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/TileSetDefinitionTests.cs 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2014, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using NUnit.Framework;
@@ -105,7 +105,7 @@
Assert.Contains(1562.5, values);
Assert.Contains(781.25, values);
Assert.Contains(390.625, values);
- Assert.IsNotNullOrEmpty(tsd.GetDefaultCoordinateSystem());
+ Assert.False(String.IsNullOrEmpty(tsd.GetDefaultCoordinateSystem()));
var ext = tsd.Extents;
Assert.AreEqual(-87.79786601383196, ext.MinX);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<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" />
+ <package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
+ <package id="NUnit" version="3.2.0" targetFramework="net45" />
</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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/OSGeo.MapGuide.ObjectModels.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -311,11 +311,7 @@
</ItemGroup>
<ItemGroup>
<None Include="CoreTypes.cd" />
- <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" />
<!-- 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.
Deleted: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -37,25 +37,25 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\Maestro\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+ <Reference Include="Microsoft.CodeAnalysis, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Microsoft.CodeAnalysis.Common.1.2.1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\Maestro\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+ <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Microsoft.CodeAnalysis.CSharp.1.2.1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
- <Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\Maestro\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+ <Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
- <Reference Include="System.Reflection.Metadata, Version=1.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\Maestro\packages\System.Reflection.Metadata.1.0.21\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+ <Reference Include="System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows.Forms" />
@@ -109,9 +109,8 @@
<None Include="Resources\AssemblyInfo.txt" />
</ItemGroup>
<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.2.0.0\analyzers\dotnet\RefactoringEssentials.dll" />
+ <Analyzer Include="..\Maestro\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+ <Analyzer Include="..\Maestro\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/ProviderTemplate/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,9 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <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="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" />
+ <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.2.1" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.CSharp" version="1.2.1" targetFramework="net45" />
+ <package id="System.Collections" version="4.0.0" targetFramework="net45" />
+ <package id="System.Collections.Immutable" version="1.1.37" targetFramework="net45" />
+ <package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net45" />
+ <package id="System.Globalization" version="4.0.0" targetFramework="net45" />
+ <package id="System.Linq" version="4.0.0" targetFramework="net45" />
+ <package id="System.Reflection.Metadata" version="1.2.0" targetFramework="net45" />
+ <package id="System.Resources.ResourceManager" version="4.0.0" targetFramework="net45" />
+ <package id="System.Runtime" version="4.0.0" targetFramework="net45" />
+ <package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net45" />
+ <package id="System.Threading" version="4.0.0" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -99,7 +99,6 @@
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.config" />
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -141,9 +140,6 @@
<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/RtMapInspector/app.config
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/app.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/RtMapInspector/app.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<!--
Uncomment the section below for proxy server support.
@@ -13,4 +13,12 @@
<defaultProxy useDefaultCredentials="true" />
</system.net>
-->
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="GeoAPI" publicKeyToken="a1a0da7def465678" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.7.4.0" newVersion="1.7.4.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
</configuration>
Deleted: trunk/Tools/Maestro/RtMapInspector/packages.config
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/packages.config 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/RtMapInspector/packages.config 2016-04-07 12:56:21 UTC (rev 8905)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <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 2016-04-06 10:38:03 UTC (rev 8904)
+++ trunk/Tools/Maestro/SignMapGuideApi/SignMapGuideApi.csproj 2016-04-07 12:56:21 UTC (rev 8905)
@@ -52,11 +52,7 @@
</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>
More information about the mapguide-commits
mailing list