[mapguide-commits] r9109 - in trunk/Tools/Maestro: Maestro Maestro/packages Maestro.AddIn.Rest Maestro.AddIn.Scripting Maestro.Shared.UI MaestroAPITests OSGeo.MapGuide.MaestroAPI.Tests OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection OSGeo.MapGuide.MaestroAPI.Tests/Mapping OSGeo.MapGuide.ObjectModel.Tests ProviderTemplate
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Dec 31 07:42:49 PST 2016
Author: jng
Date: 2016-12-31 07:42:49 -0800 (Sat, 31 Dec 2016)
New Revision: 9109
Added:
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Utils.cs
Modified:
trunk/Tools/Maestro/Maestro.AddIn.Rest/Maestro.AddIn.Rest.csproj
trunk/Tools/Maestro/Maestro.AddIn.Rest/packages.config
trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj
trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config
trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj
trunk/Tools/Maestro/Maestro.Shared.UI/packages.config
trunk/Tools/Maestro/Maestro/Maestro.csproj
trunk/Tools/Maestro/Maestro/packages.config
trunk/Tools/Maestro/Maestro/packages/
trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs
trunk/Tools/Maestro/MaestroAPITests/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ConfigurationDocumentTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection/ResourceRebaserTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/FilterTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Mapping/RuntimeMapTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ResourceTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/SchemaTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ValidationTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/OSGeo.MapGuide.ObjectModels.Tests.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/packages.config
trunk/Tools/Maestro/ProviderTemplate/App.config
trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj
trunk/Tools/Maestro/ProviderTemplate/packages.config
Log:
Package updates:
- IronPython 2.7.7
- DockPanel 2.12.0
- NUnit 3.5.0
- Newtonsoft.Json 9.0.1
- Roslyn 1.3.2
Also fix up various unit tests in light of updating NUnit to 3.5.0 and some changed relative path resolution logic in the VS 2017 test runner
Modified: trunk/Tools/Maestro/Maestro/Maestro.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro/Maestro.csproj 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/Maestro/Maestro.csproj 2016-12-31 15:42:49 UTC (rev 9109)
@@ -73,14 +73,18 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SDK\bin\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
- <Reference Include="IronPython, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>packages\IronPython.2.7.5\lib\Net45\IronPython.dll</HintPath>
+ <Reference Include="IronPython, Version=2.7.7.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>packages\IronPython.2.7.7\lib\Net45\IronPython.dll</HintPath>
</Reference>
- <Reference Include="IronPython.Modules, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>packages\IronPython.2.7.5\lib\Net45\IronPython.Modules.dll</HintPath>
+ <Reference Include="IronPython.Modules, Version=2.7.7.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>packages\IronPython.2.7.7\lib\Net45\IronPython.Modules.dll</HintPath>
</Reference>
+ <Reference Include="IronPython.SQLite, Version=2.7.7.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>packages\IronPython.2.7.7\lib\Net45\IronPython.SQLite.dll</HintPath>
+ </Reference>
+ <Reference Include="IronPython.Wpf, Version=2.7.7.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>packages\IronPython.2.7.7\lib\Net45\IronPython.Wpf.dll</HintPath>
+ </Reference>
<Reference Include="Maestro.Editors, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SDK\bin\Maestro.Editors.dll</HintPath>
@@ -97,18 +101,18 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SDK\bin\Maestro.Shared.UI.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.Dynamic, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>packages\IronPython.2.7.5\lib\Net45\Microsoft.Dynamic.dll</HintPath>
+ <Reference Include="Microsoft.Dynamic, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>packages\DynamicLanguageRuntime.1.1.2\lib\Net45\Microsoft.Dynamic.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.dll</HintPath>
+ <Reference Include="Microsoft.Scripting, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>packages\DynamicLanguageRuntime.1.1.2\lib\Net45\Microsoft.Scripting.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.Scripting.Metadata, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.Metadata.dll</HintPath>
+ <Reference Include="Microsoft.Scripting.AspNet, Version=1.1.1.21, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>packages\DynamicLanguageRuntime.1.1.2\lib\Net45\Microsoft.Scripting.AspNet.dll</HintPath>
</Reference>
+ <Reference Include="Microsoft.Scripting.Metadata, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>packages\DynamicLanguageRuntime.1.1.2\lib\Net45\Microsoft.Scripting.Metadata.dll</HintPath>
+ </Reference>
<Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
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
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
+ 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
Castle.Core.3.3.3
DockPanelSuite.2.12.0
DynamicLanguageRuntime.1.1.2
IronPython.2.7.7
IronPython.StdLib.2.7.7
Microsoft.CodeAnalysis.Common.1.3.2
Microsoft.CodeAnalysis.CSharp.1.3.2
Moq.4.5.29
Newtonsoft.Json.9.0.1
NUnit.3.5.0
System.Collections.4.3.0
System.Collections.Immutable.1.3.0
System.Diagnostics.Debug.4.3.0
System.Globalization.4.3.0
System.Linq.4.3.0
System.Reflection.Metadata.1.4.1
System.Resources.ResourceManager.4.3.0
System.Runtime.4.3.0
System.Runtime.Extensions.4.3.0
System.Threading.4.3.0
Modified: trunk/Tools/Maestro/Maestro/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro/packages.config 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/Maestro/packages.config 2016-12-31 15:42:49 UTC (rev 9109)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="IronPython" version="2.7.5" targetFramework="net45" />
+ <package id="DynamicLanguageRuntime" version="1.1.2" targetFramework="net45" />
+ <package id="IronPython" version="2.7.7" targetFramework="net45" />
</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-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/Maestro.AddIn.Rest.csproj 2016-12-31 15:42:49 UTC (rev 9109)
@@ -32,9 +32,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <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 Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\Maestro\packages\RestSharp.105.2.3\lib\net451\RestSharp.dll</HintPath>
Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/packages.config 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/packages.config 2016-12-31 15:42:49 UTC (rev 9109)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
+ <package id="Newtonsoft.Json" version="9.0.1" 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-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Maestro.AddIn.Scripting.csproj 2016-12-31 15:42:49 UTC (rev 9109)
@@ -38,29 +38,29 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="IronPython">
- <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\IronPython.dll</HintPath>
+ <Reference Include="IronPython, Version=2.7.7.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\IronPython.2.7.7\lib\Net45\IronPython.dll</HintPath>
</Reference>
- <Reference Include="IronPython.Modules">
- <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\IronPython.Modules.dll</HintPath>
+ <Reference Include="IronPython.Modules, Version=2.7.7.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\IronPython.2.7.7\lib\Net45\IronPython.Modules.dll</HintPath>
</Reference>
- <Reference Include="IronPython.SQLite">
- <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\IronPython.SQLite.dll</HintPath>
+ <Reference Include="IronPython.SQLite, Version=2.7.7.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\IronPython.2.7.7\lib\Net45\IronPython.SQLite.dll</HintPath>
</Reference>
- <Reference Include="IronPython.Wpf">
- <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\IronPython.Wpf.dll</HintPath>
+ <Reference Include="IronPython.Wpf, Version=2.7.7.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\IronPython.2.7.7\lib\Net45\IronPython.Wpf.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.Dynamic">
- <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\Microsoft.Dynamic.dll</HintPath>
+ <Reference Include="Microsoft.Dynamic, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\DynamicLanguageRuntime.1.1.2\lib\Net45\Microsoft.Dynamic.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.Scripting">
- <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.dll</HintPath>
+ <Reference Include="Microsoft.Scripting, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\DynamicLanguageRuntime.1.1.2\lib\Net45\Microsoft.Scripting.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.Scripting.AspNet">
- <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.AspNet.dll</HintPath>
+ <Reference Include="Microsoft.Scripting.AspNet, Version=1.1.1.21, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\DynamicLanguageRuntime.1.1.2\lib\Net45\Microsoft.Scripting.AspNet.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.Scripting.Metadata">
- <HintPath>..\Maestro\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.Metadata.dll</HintPath>
+ <Reference Include="Microsoft.Scripting.Metadata, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\DynamicLanguageRuntime.1.1.2\lib\Net45\Microsoft.Scripting.Metadata.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -326,6 +326,7 @@
<Content Include="Lib\encodings\utf_16_be.py" />
<Content Include="Lib\encodings\utf_16_le.py" />
<Content Include="Lib\encodings\utf_32.py" />
+ <Content Include="Lib\encodings\utf_32_be.py" />
<Content Include="Lib\encodings\utf_32_le.py" />
<Content Include="Lib\encodings\utf_7.py" />
<Content Include="Lib\encodings\utf_8.py" />
@@ -375,6 +376,7 @@
<Content Include="Lib\lib2to3\fixer_base.py" />
<Content Include="Lib\lib2to3\fixer_util.py" />
<Content Include="Lib\lib2to3\fixes\fix_apply.py" />
+ <Content Include="Lib\lib2to3\fixes\fix_asserts.py" />
<Content Include="Lib\lib2to3\fixes\fix_basestring.py" />
<Content Include="Lib\lib2to3\fixes\fix_buffer.py" />
<Content Include="Lib\lib2to3\fixes\fix_callable.py" />
@@ -617,6 +619,7 @@
<Content Include="Lib\_abcoll.py" />
<Content Include="Lib\_LWPCookieJar.py" />
<Content Include="Lib\_MozillaCookieJar.py" />
+ <Content Include="Lib\_osx_support.py" />
<Content Include="Lib\_pyio.py" />
<Content Include="Lib\_strptime.py" />
<Content Include="Lib\_threading_local.py" />
@@ -628,6 +631,8 @@
</Content>
<None Include="app.config" />
<None Include="Lib\ensurepip\_bundled\pip-1.5.6-py2.py3-none-any.whl" />
+ <None Include="Lib\ensurepip\_bundled\pip-8.1.1-py2.py3-none-any.whl" />
+ <None Include="Lib\ensurepip\_bundled\setuptools-20.10.1-py2.py3-none-any.whl" />
<None Include="Lib\ensurepip\_bundled\setuptools-3.6-py2.py3-none-any.whl" />
<None Include="packages.config" />
<None Include="Resources\control.png" />
@@ -688,7 +693,7 @@
</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>
+ <PostBuildEvent>xcopy /S /Y /I "$(SolutionDir)packages\IronPython.StdLib.2.7.7\content\Lib" "$(SolutionDir)$(OutDir)Lib"</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config 2016-12-31 15:42:49 UTC (rev 9109)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="IronPython" version="2.7.5" targetFramework="net45" />
- <package id="IronPython.StdLib" version="2.7.5" targetFramework="net45" />
+ <package id="DynamicLanguageRuntime" version="1.1.2" targetFramework="net45" />
+ <package id="IronPython" version="2.7.7" targetFramework="net45" />
+ <package id="IronPython.StdLib" version="2.7.7" targetFramework="net45" />
</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-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj 2016-12-31 15:42:49 UTC (rev 9109)
@@ -63,9 +63,8 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.9.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Maestro\packages\DockPanelSuite.2.9.0.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
+ <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.11.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\DockPanelSuite.2.12.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/packages.config 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/packages.config 2016-12-31 15:42:49 UTC (rev 9109)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="DockPanelSuite" version="2.9.0.0" targetFramework="net4-client" />
+ <package id="DockPanelSuite" version="2.12.0" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2016-12-31 15:42:49 UTC (rev 9109)
@@ -68,9 +68,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Thirdparty\NMock\bin\NMock2.dll</HintPath>
</Reference>
- <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 Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs 2016-12-31 15:42:49 UTC (rev 9109)
@@ -49,7 +49,7 @@
//Guard variable to prevent duplicate registration on repeated test runs of a single test session
private static bool _registered = false;
- [SetUp]
+ [OneTimeSetUp]
public void Setup()
{
if (!_registered)
@@ -62,7 +62,7 @@
}
}
- [TearDown]
+ [OneTimeTearDown]
public void Teardown()
{
}
Modified: trunk/Tools/Maestro/MaestroAPITests/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/packages.config 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/MaestroAPITests/packages.config 2016-12-31 15:42:49 UTC (rev 9109)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GeoAPI" version="1.7.3.1" targetFramework="net45" />
- <package id="NUnit" version="3.2.0" targetFramework="net45" />
+ <package id="NUnit" version="3.5.0" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ConfigurationDocumentTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ConfigurationDocumentTests.cs 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ConfigurationDocumentTests.cs 2016-12-31 15:42:49 UTC (rev 9109)
@@ -40,7 +40,7 @@
[Test]
public void TestMySqlSchema()
{
- var fds = new FeatureSourceDescription(File.OpenRead("UserTestData\\gen_default1_MySql_master.xml"));
+ var fds = new FeatureSourceDescription(Utils.OpenFile("UserTestData\\gen_default1_MySql_master.xml"));
Assert.AreEqual(1, fds.Schemas.Length);
var fs = fds.GetSchema("AutoGen");
@@ -132,14 +132,14 @@
[Test]
public void TestOdbcLoad()
{
- var conf = ConfigurationDocument.LoadXml(File.ReadAllText("UserTestData\\odbc_example_config.xml")) as OdbcConfigurationDocument;
+ var conf = ConfigurationDocument.LoadXml(Utils.ReadAllText("UserTestData\\odbc_example_config.xml")) as OdbcConfigurationDocument;
Assert.NotNull(conf);
}
[Test]
public void TestOdbcLoad2()
{
- var conf = ConfigurationDocument.LoadXml(File.ReadAllText("UserTestData\\odbc_example_config2.xml")) as OdbcConfigurationDocument;
+ var conf = ConfigurationDocument.LoadXml(Utils.ReadAllText("UserTestData\\odbc_example_config2.xml")) as OdbcConfigurationDocument;
Assert.NotNull(conf);
}
@@ -220,10 +220,10 @@
conf.AddOverride(ov);
string path = "OdbcConfigTest.xml";
- File.WriteAllText(path, conf.ToXml());
+ Utils.WriteAllText(path, conf.ToXml());
conf = null;
- string xml = File.ReadAllText(path);
+ string xml = Utils.ReadAllText(path);
conf = ConfigurationDocument.LoadXml(xml) as OdbcConfigurationDocument;
Assert.NotNull(conf);
@@ -239,21 +239,21 @@
[Test]
public void TestWmsLoad()
{
- var conf = ConfigurationDocument.LoadXml(File.ReadAllText("UserTestData\\NASA_WMS_config_doc.xml")) as WmsConfigurationDocument;
+ var conf = ConfigurationDocument.LoadXml(Utils.ReadAllText("UserTestData\\NASA_WMS_config_doc.xml")) as WmsConfigurationDocument;
Assert.NotNull(conf);
}
[Test]
public void TestWmsLoad2()
{
- var conf = ConfigurationDocument.LoadXml(File.ReadAllText("UserTestData\\wms_config_example1.xml")) as WmsConfigurationDocument;
+ var conf = ConfigurationDocument.LoadXml(Utils.ReadAllText("UserTestData\\wms_config_example1.xml")) as WmsConfigurationDocument;
Assert.NotNull(conf);
}
[Test]
public void TestWmsLoad3()
{
- var conf = ConfigurationDocument.LoadXml(File.ReadAllText("UserTestData\\wms_config_example2.xml")) as WmsConfigurationDocument;
+ var conf = ConfigurationDocument.LoadXml(Utils.ReadAllText("UserTestData\\wms_config_example2.xml")) as WmsConfigurationDocument;
Assert.NotNull(conf);
}
@@ -295,10 +295,10 @@
conf.AddRasterItem(item);
string path = "WmsConfigTest.xml";
- File.WriteAllText(path, conf.ToXml());
+ Utils.WriteAllText(path, conf.ToXml());
conf = null;
- string xml = File.ReadAllText(path);
+ string xml = Utils.ReadAllText(path);
conf = ConfigurationDocument.LoadXml(xml) as WmsConfigurationDocument;
Assert.NotNull(conf);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection/ResourceRebaserTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection/ResourceRebaserTests.cs 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection/ResourceRebaserTests.cs 2016-12-31 15:42:49 UTC (rev 9109)
@@ -31,6 +31,7 @@
using System.IO;
using OSGeo.MapGuide.ObjectModels.MapDefinition;
using System.Xml;
+using OSGeo.MapGuide.MaestroAPI.Tests;
namespace OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests
{
@@ -49,7 +50,7 @@
[Test]
public void RebaseTest()
{
- var res = (IMapDefinition)ObjectFactory.Deserialize(ResourceTypes.MapDefinition.ToString(), File.OpenRead("UserTestData\\TestTiledMap.xml"));
+ var res = (IMapDefinition)ObjectFactory.Deserialize(ResourceTypes.MapDefinition.ToString(), Utils.OpenFile("UserTestData\\TestTiledMap.xml"));
res.ResourceID = "Library://Test.MapDefinition";
var rbaser = new ResourceRebaser(res);
var rbres = rbaser.Rebase("Library://UnitTests/Layers/", "Library://Rebased/Layers/");
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/FilterTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/FilterTests.cs 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/FilterTests.cs 2016-12-31 15:42:49 UTC (rev 9109)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2015, 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) 2015, 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;
using OSGeo.FDO.Expressions;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Mapping/RuntimeMapTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Mapping/RuntimeMapTests.cs 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Mapping/RuntimeMapTests.cs 2016-12-31 15:42:49 UTC (rev 9109)
@@ -24,6 +24,7 @@
using NUnit.Framework;
using OSGeo.MapGuide.MaestroAPI.Mapping;
using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.MaestroAPI.Tests;
using OSGeo.MapGuide.ObjectModels;
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
using OSGeo.MapGuide.ObjectModels.MapDefinition;
@@ -42,7 +43,7 @@
private static RuntimeMap CreateTestMap()
{
var layers = new Dictionary<string, ILayerDefinition>();
- var mdf = (IMapDefinition)ObjectFactory.Deserialize(ResourceTypes.MapDefinition.ToString(), File.OpenRead("UserTestData\\TestTiledMap.xml"));
+ var mdf = (IMapDefinition)ObjectFactory.Deserialize(ResourceTypes.MapDefinition.ToString(), Utils.OpenFile("UserTestData\\TestTiledMap.xml"));
mdf.ResourceID = "Library://UnitTest/Test.MapDefinition";
foreach (var lyr in mdf.BaseMap.BaseMapLayerGroups.First().BaseMapLayer)
{
@@ -89,7 +90,7 @@
[Test]
public void UnsupportedConnectionTest()
{
- var res = (IMapDefinition)ObjectFactory.Deserialize(ResourceTypes.MapDefinition.ToString(), File.OpenRead("UserTestData\\TestTiledMap.xml"));
+ var res = (IMapDefinition)ObjectFactory.Deserialize(ResourceTypes.MapDefinition.ToString(), Utils.OpenFile("UserTestData\\TestTiledMap.xml"));
var conn = new Mock<IServerConnection>();
var caps = new Mock<IConnectionCapabilities>();
caps.Setup(c => c.SupportedServices).Returns(new int[0]);
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-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj 2016-12-31 15:42:49 UTC (rev 9109)
@@ -36,17 +36,18 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
+ </Reference>
<Reference Include="GeoAPI, Version=1.7.3.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
<HintPath>..\Maestro\packages\GeoAPI.1.7.3.1\lib\net45\GeoAPI.dll</HintPath>
<Private>True</Private>
</Reference>
- <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 Include="Moq, Version=4.5.29.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Moq.4.5.29\lib\net45\Moq.dll</HintPath>
</Reference>
- <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 Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -84,6 +85,7 @@
<Compile Include="Schema\DataPropertyDefinitionTests.cs" />
<Compile Include="Schema\FeatureSchemaTests.cs" />
<Compile Include="Schema\GeometricPropertyDefinitionTests.cs" />
+ <Compile Include="Utils.cs" />
<Compile Include="ValidationTests.cs" />
</ItemGroup>
<ItemGroup>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ResourceTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ResourceTests.cs 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ResourceTests.cs 2016-12-31 15:42:49 UTC (rev 9109)
@@ -93,7 +93,7 @@
Assert.AreEqual("LayerDefinition-1.0.0.xsd", ldf.ValidatingSchema);
Assert.AreEqual(new Version(1, 0, 0), ldf.ResourceVersion);
- using (var fs = File.OpenWrite("LayerDef_100.xml"))
+ using (var fs = Utils.OpenTempWrite("LayerDef_100.xml"))
{
using (var src = ObjectFactory.Serialize(ldf))
{
@@ -108,7 +108,7 @@
Assert.AreEqual("LayerDefinition-1.1.0.xsd", ldf1.ValidatingSchema);
Assert.AreEqual(new Version(1, 1, 0), ldf1.ResourceVersion);
- using (var fs = File.OpenWrite("LayerDef_110.xml"))
+ using (var fs = Utils.OpenTempWrite("LayerDef_110.xml"))
{
using (var src = ObjectFactory.Serialize(ldf1))
{
@@ -123,7 +123,7 @@
Assert.AreEqual("LayerDefinition-1.2.0.xsd", ldf2.ValidatingSchema);
Assert.AreEqual(new Version(1, 2, 0), ldf2.ResourceVersion);
- using (var fs = File.OpenWrite("LayerDef_120.xml"))
+ using (var fs = Utils.OpenTempWrite("LayerDef_120.xml"))
{
using (var src = ObjectFactory.Serialize(ldf2))
{
@@ -138,7 +138,7 @@
Assert.AreEqual("LayerDefinition-1.3.0.xsd", ldf3.ValidatingSchema);
Assert.AreEqual(new Version(1, 3, 0), ldf3.ResourceVersion);
- using (var fs = File.OpenWrite("LayerDef_130.xml"))
+ using (var fs = Utils.OpenTempWrite("LayerDef_130.xml"))
{
using (var src = ObjectFactory.Serialize(ldf3))
{
@@ -154,7 +154,7 @@
Assert.AreEqual(new Version(2, 3, 0), ldf4.ResourceVersion);
Assert.IsTrue(ldf4.SubLayer is ISubLayerDefinition2);
- using (var fs = File.OpenWrite("LayerDef_230.xml"))
+ using (var fs = Utils.OpenTempWrite("LayerDef_230.xml"))
{
using (var src = ObjectFactory.Serialize(ldf4))
{
@@ -348,7 +348,7 @@
Assert.AreEqual("MapDefinition-1.0.0.xsd", mdf.ValidatingSchema);
Assert.AreEqual(new Version(1, 0, 0), mdf.ResourceVersion);
- using (var fs = File.OpenWrite("MapDef_100.xml"))
+ using (var fs = Utils.OpenTempWrite("MapDef_100.xml"))
{
using (var src = ObjectFactory.Serialize(mdf))
{
@@ -364,7 +364,7 @@
Assert.AreEqual(new Version(2, 3, 0), mdf2.ResourceVersion);
Assert.True(mdf2 is IMapDefinition2);
- using (var fs = File.OpenWrite("MapDef_230.xml"))
+ using (var fs = Utils.OpenTempWrite("MapDef_230.xml"))
{
using (var src = ObjectFactory.Serialize(mdf2))
{
@@ -387,7 +387,7 @@
Assert.AreEqual("LoadProcedure-1.0.0.xsd", lproc.ValidatingSchema);
Assert.AreEqual(new Version(1, 0, 0), lproc.ResourceVersion);
- using (var fs = File.OpenWrite("LoadProc_100.xml"))
+ using (var fs = Utils.OpenTempWrite("LoadProc_100.xml"))
{
using (var src = ObjectFactory.Serialize(lproc))
{
@@ -402,7 +402,7 @@
Assert.AreEqual("LoadProcedure-1.1.0.xsd", lproc2.ValidatingSchema);
Assert.AreEqual(new Version(1, 1, 0), lproc2.ResourceVersion);
- using (var fs = File.OpenWrite("LoadProc_110.xml"))
+ using (var fs = Utils.OpenTempWrite("LoadProc_110.xml"))
{
using (var src = ObjectFactory.Serialize(lproc2))
{
@@ -417,7 +417,7 @@
Assert.AreEqual("LoadProcedure-2.2.0.xsd", lproc3.ValidatingSchema);
Assert.AreEqual(new Version(2, 2, 0), lproc3.ResourceVersion);
- using (var fs = File.OpenWrite("LoadProc_220.xml"))
+ using (var fs = Utils.OpenTempWrite("LoadProc_220.xml"))
{
using (var src = ObjectFactory.Serialize(lproc3))
{
@@ -440,7 +440,7 @@
Assert.AreEqual("WebLayout-1.0.0.xsd", wl.ValidatingSchema);
Assert.AreEqual(new Version(1, 0, 0), wl.ResourceVersion);
- using (var fs = File.OpenWrite("WebLayout_100.xml"))
+ using (var fs = Utils.OpenTempWrite("WebLayout_100.xml"))
{
using (var src = ObjectFactory.Serialize(wl))
{
@@ -456,7 +456,7 @@
Assert.AreEqual(new Version(1, 1, 0), wl2.ResourceVersion);
Assert.True(wl2 is IWebLayout2);
- using (var fs = File.OpenWrite("WebLayout_110.xml"))
+ using (var fs = Utils.OpenTempWrite("WebLayout_110.xml"))
{
using (var src = ObjectFactory.Serialize(wl2))
{
@@ -479,7 +479,7 @@
Assert.AreEqual("SymbolDefinition-1.0.0.xsd", ssym.ValidatingSchema);
Assert.AreEqual(new Version(1, 0, 0), ssym.ResourceVersion);
- using (var fs = File.OpenWrite("SimpleSymDef_100.xml"))
+ using (var fs = Utils.OpenTempWrite("SimpleSymDef_100.xml"))
{
using (var src = ObjectFactory.Serialize(ssym))
{
@@ -494,7 +494,7 @@
Assert.AreEqual("SymbolDefinition-1.1.0.xsd", ssym2.ValidatingSchema);
Assert.AreEqual(new Version(1, 1, 0), ssym2.ResourceVersion);
- using (var fs = File.OpenWrite("SimpleSymDef_110.xml"))
+ using (var fs = Utils.OpenTempWrite("SimpleSymDef_110.xml"))
{
using (var src = ObjectFactory.Serialize(ssym2))
{
@@ -510,7 +510,7 @@
Assert.AreEqual("SymbolDefinition-1.0.0.xsd", csym.ValidatingSchema);
Assert.AreEqual(new Version(1, 0, 0), csym.ResourceVersion);
- using (var fs = File.OpenWrite("CompoundSymDef_100.xml"))
+ using (var fs = Utils.OpenTempWrite("CompoundSymDef_100.xml"))
{
using (var src = ObjectFactory.Serialize(csym))
{
@@ -525,7 +525,7 @@
Assert.AreEqual("SymbolDefinition-1.1.0.xsd", csym2.ValidatingSchema);
Assert.AreEqual(new Version(1, 1, 0), csym2.ResourceVersion);
- using (var fs = File.OpenWrite("CompoundSymDef_110.xml"))
+ using (var fs = Utils.OpenTempWrite("CompoundSymDef_110.xml"))
{
using (var src = ObjectFactory.Serialize(csym2))
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/SchemaTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/SchemaTests.cs 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/SchemaTests.cs 2016-12-31 15:42:49 UTC (rev 9109)
@@ -99,7 +99,7 @@
string path = Path.GetTempFileName();
doc.Save(path);
- FeatureSourceDescription fsd = new FeatureSourceDescription(File.OpenRead(path));
+ FeatureSourceDescription fsd = new FeatureSourceDescription(Utils.OpenFile(path));
Assert.AreEqual(1, fsd.Schemas.Length);
schema = fsd.Schemas[0];
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Utils.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Utils.cs (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Utils.cs 2016-12-31 15:42:49 UTC (rev 9109)
@@ -0,0 +1,62 @@
+#region Disclaimer / License
+
+// Copyright (C) 2016, 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 System;
+using System.IO;
+using System.Reflection;
+
+namespace OSGeo.MapGuide.MaestroAPI.Tests
+{
+ public class Utils
+ {
+ public static string ResolvePath(string relPath)
+ {
+ UriBuilder uri = new UriBuilder(Assembly.GetExecutingAssembly().CodeBase);
+ string path = Uri.UnescapeDataString(uri.Path);
+ string absPath = Path.Combine(Path.GetDirectoryName(path), relPath);
+ return absPath;
+ }
+
+ public static void WriteAllText(string relPath, string text)
+ {
+ string absPath = ResolvePath(relPath);
+ File.WriteAllText(absPath, text);
+ }
+
+ public static string ReadAllText(string relPath)
+ {
+ string absPath = ResolvePath(relPath);
+ return File.ReadAllText(absPath);
+ }
+
+ public static Stream OpenFile(string relPath)
+ {
+ string absPath = ResolvePath(relPath);
+ return File.OpenRead(absPath);
+ }
+
+ public static Stream OpenTempWrite(string relPath)
+ {
+ string absPath = Path.Combine(Path.GetTempPath(), relPath);
+ return File.OpenWrite(absPath);
+ }
+ }
+}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ValidationTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ValidationTests.cs 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ValidationTests.cs 2016-12-31 15:42:49 UTC (rev 9109)
@@ -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 Moq;
using NUnit.Framework;
@@ -39,7 +39,7 @@
[TestFixture]
public class ValidationTests
{
- [SetUp]
+ [OneTimeSetUp]
public void Setup()
{
ResourceValidatorLoader.LoadStockValidators();
@@ -246,7 +246,7 @@
var fs = new FeatureSchema();
var doc = new XmlDocument();
- doc.Load("UserTestData\\1896.xml");
+ doc.Load(Utils.ResolvePath("UserTestData\\1896.xml"));
var mgr = new XmlNamespaceManager(doc.NameTable);
mgr.AddNamespace("xs", XmlNamespaces.XS);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config 2016-12-31 15:42:49 UTC (rev 9109)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="Castle.Core" version="3.3.3" targetFramework="net45" />
<package id="GeoAPI" version="1.7.3.1" targetFramework="net45" />
- <package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
- <package id="NUnit" version="3.2.0" targetFramework="net45" />
+ <package id="Moq" version="4.5.29" targetFramework="net45" />
+ <package id="NUnit" version="3.5.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-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/OSGeo.MapGuide.ObjectModels.Tests.csproj 2016-12-31 15:42:49 UTC (rev 9109)
@@ -51,14 +51,15 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <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 Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
</Reference>
- <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 Include="Moq, Version=4.5.29.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Moq.4.5.29\lib\net45\Moq.dll</HintPath>
</Reference>
+ <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/packages.config 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/packages.config 2016-12-31 15:42:49 UTC (rev 9109)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
- <package id="NUnit" version="3.2.0" targetFramework="net45" />
+ <package id="Castle.Core" version="3.3.3" targetFramework="net45" />
+ <package id="Moq" version="4.5.29" targetFramework="net45" />
+ <package id="NUnit" version="3.5.0" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/ProviderTemplate/App.config
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/App.config 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/ProviderTemplate/App.config 2016-12-31 15:42:49 UTC (rev 9109)
@@ -1,6 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.4.1.0" newVersion="1.4.1.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
</configuration>
\ No newline at end of file
Modified: trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/ProviderTemplate/ProviderTemplate.csproj 2016-12-31 15:42:49 UTC (rev 9109)
@@ -37,26 +37,23 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <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 Include="Microsoft.CodeAnalysis, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
</Reference>
- <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 Include="Microsoft.CodeAnalysis.CSharp, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
- <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 Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
+ <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
- <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 Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\Maestro\packages\System.Reflection.Metadata.1.4.1\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
Modified: trunk/Tools/Maestro/ProviderTemplate/packages.config
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/packages.config 2016-12-27 02:29:03 UTC (rev 9108)
+++ trunk/Tools/Maestro/ProviderTemplate/packages.config 2016-12-31 15:42:49 UTC (rev 9109)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<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" />
+ <package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net45" />
+ <package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net45" />
+ <package id="System.Collections" version="4.3.0" targetFramework="net45" />
+ <package id="System.Collections.Immutable" version="1.3.0" targetFramework="net45" />
+ <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
+ <package id="System.Globalization" version="4.3.0" targetFramework="net45" />
+ <package id="System.Linq" version="4.3.0" targetFramework="net45" />
+ <package id="System.Reflection.Metadata" version="1.4.1" targetFramework="net45" />
+ <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net45" />
+ <package id="System.Runtime" version="4.3.0" targetFramework="net45" />
+ <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
+ <package id="System.Threading" version="4.3.0" targetFramework="net45" />
</packages>
\ No newline at end of file
More information about the mapguide-commits
mailing list