diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..fae94e9 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,82 @@ +init: +- ps: if ($env:APPVEYOR_REPO_TAG -eq "true") { $env:TAG_VERSION = "$env:APPVEYOR_REPO_TAG_NAME.$env:APPVEYOR_BUILD_NUMBER" } else { $env:TAG_VERSION = "v1.0.0.$env:APPVEYOR_BUILD_NUMBER-alpha" } +- ps: $env:TAG_VERSION = $env:TAG_VERSION -replace 'v','' +- ps: Write-Host "Setting version to '$env:TAG_VERSION'" +- ps: Update-AppveyorBuild -Version "$env:TAG_VERSION" + +image: +- Visual Studio 2017 +- Ubuntu + +configuration: Release + +platform: +- x64 + +pull_requests: + do_not_increment_build_number: false + +nuget: + disable_publish_on_pr: true + +skip_commits: + files: + - doc/* + - README.md + - .gitignore + - LICENSE + +cache: +- packages -> **\packages.config +- '%LocalAppData%\NuGet\Cache' + +assembly_info: + patch: true + assembly_version: '{version}' + assembly_file_version: '{version}' + assembly_informational_version: '{version}' + +before_build: +- ps: | + if ($isLinux) { + $env:EDITION = "mono" + } else { + $env:EDITION = "dotnet" + } +- nuget restore HalcyonImportExport.sln + +build: + project: HalcyonImportExport.sln + parallel: true + verbosity: minimal + publish_nuget: false + publish_nuget_symbols: false +for: +- + matrix: + only: + - image: Ubuntu + build_script: + - msbuild HalcyonImportExport.sln + +after_build: +- ps: Set-Location "$env:APPVEYOR_BUILD_FOLDER" +- ps: Rename-Item -Path bin -NewName halcyon-import-export + +# No tests for now. +test: off + +artifacts: +- path: halcyon-import-export + name: halcyon-import-export-$(APPVEYOR_BUILD_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(EDITION) + type: zip + +deploy: + provider: GitHub + auth_token: + secure: DlRS0U90AATbPkzxigCLwaGe1vguHFeC3a0YhMZRA/OYEbLQ8+ybp2OGfqgwpbW4 + artifact: halcyon-import-export-$(APPVEYOR_BUILD_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(EDITION) + draft: true + prerelease: false + on: + APPVEYOR_REPO_TAG: true diff --git a/HcImportExport/HcImportExport.sln b/HalcyonImportExport.sln similarity index 54% rename from HcImportExport/HcImportExport.sln rename to HalcyonImportExport.sln index 97c1f49..d8d18d3 100644 --- a/HcImportExport/HcImportExport.sln +++ b/HalcyonImportExport.sln @@ -1,38 +1,40 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2048 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InWorldz.Halcyon.OpenSim.ImpExp", "InWorldz.Halcyon.OpenSim.ImpExp\InWorldz.Halcyon.OpenSim.ImpExp.csproj", "{9683B2E3-80CD-4321-9E64-1BA2968A1892}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InWorldz.Halcyon.OpenSim.ImpExp", "Source\InWorldz.Halcyon.OpenSim.ImpExp\InWorldz.Halcyon.OpenSim.ImpExp.csproj", "{9683B2E3-80CD-4321-9E64-1BA2968A1892}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "hc-import", "hc-import\hc-import.csproj", "{D2CBD3D5-F7A8-4E71-A58E-071382879B8B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "hc-import", "Source\hc-import\hc-import.csproj", "{D2CBD3D5-F7A8-4E71-A58E-071382879B8B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{290A21F2-BAA6-42DE-97A0-A32946E30CF0}" + ProjectSection(SolutionItems) = preProject + .appveyor.yml = .appveyor.yml + .gitattributes = .gitattributes + .gitignore = .gitignore + LICENSE = LICENSE + README.md = README.md + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9683B2E3-80CD-4321-9E64-1BA2968A1892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9683B2E3-80CD-4321-9E64-1BA2968A1892}.Debug|Any CPU.Build.0 = Debug|Any CPU {9683B2E3-80CD-4321-9E64-1BA2968A1892}.Debug|x64.ActiveCfg = Debug|x64 {9683B2E3-80CD-4321-9E64-1BA2968A1892}.Debug|x64.Build.0 = Debug|x64 - {9683B2E3-80CD-4321-9E64-1BA2968A1892}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9683B2E3-80CD-4321-9E64-1BA2968A1892}.Release|Any CPU.Build.0 = Release|Any CPU {9683B2E3-80CD-4321-9E64-1BA2968A1892}.Release|x64.ActiveCfg = Release|x64 {9683B2E3-80CD-4321-9E64-1BA2968A1892}.Release|x64.Build.0 = Release|x64 - {D2CBD3D5-F7A8-4E71-A58E-071382879B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2CBD3D5-F7A8-4E71-A58E-071382879B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU {D2CBD3D5-F7A8-4E71-A58E-071382879B8B}.Debug|x64.ActiveCfg = Debug|x64 {D2CBD3D5-F7A8-4E71-A58E-071382879B8B}.Debug|x64.Build.0 = Debug|x64 - {D2CBD3D5-F7A8-4E71-A58E-071382879B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2CBD3D5-F7A8-4E71-A58E-071382879B8B}.Release|Any CPU.Build.0 = Release|Any CPU {D2CBD3D5-F7A8-4E71-A58E-071382879B8B}.Release|x64.ActiveCfg = Release|x64 {D2CBD3D5-F7A8-4E71-A58E-071382879B8B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D16A6E81-EA2F-4A74-9AE9-E61F540783A8} + EndGlobalSection EndGlobal diff --git a/HcImportExport/InWorldz.Halcyon.OpenSim.ImpExp/InWorldz.Halcyon.OpenSim.ImpExp.csproj b/HcImportExport/InWorldz.Halcyon.OpenSim.ImpExp/InWorldz.Halcyon.OpenSim.ImpExp.csproj deleted file mode 100644 index 4f6a080..0000000 --- a/HcImportExport/InWorldz.Halcyon.OpenSim.ImpExp/InWorldz.Halcyon.OpenSim.ImpExp.csproj +++ /dev/null @@ -1,99 +0,0 @@ - - - - - Debug - AnyCPU - {9683B2E3-80CD-4321-9E64-1BA2968A1892} - Library - Properties - InWorldz.Halcyon.OpenSim.ImpExp - InWorldz.Halcyon.OpenSim.ImpExp - v4.5.2 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - - - - ..\packages\AppDomainToolkit.1.0.4.3\lib\net\AppDomainToolkit.dll - True - - - ..\..\..\halcyon\bin\InWorldz.Region.Data.Thoosa.dll - - - False - ..\..\..\halcyon\bin\OpenMetaverse.dll - - - False - ..\..\..\halcyon\bin\OpenMetaverse.StructuredData.dll - - - False - ..\..\..\halcyon\bin\OpenMetaverseTypes.dll - - - False - ..\..\..\halcyon\bin\OpenSim.Framework.dll - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/HcImportExport/InWorldz.Halcyon.OpenSim.ImpExp/packages.config b/HcImportExport/InWorldz.Halcyon.OpenSim.ImpExp/packages.config deleted file mode 100644 index f095451..0000000 --- a/HcImportExport/InWorldz.Halcyon.OpenSim.ImpExp/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/HcImportExport/hc-import/App.config b/HcImportExport/hc-import/App.config deleted file mode 100644 index 88fa402..0000000 --- a/HcImportExport/hc-import/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/HcImportExport/hc-import/Program.cs b/HcImportExport/hc-import/Program.cs deleted file mode 100644 index 517d22d..0000000 --- a/HcImportExport/hc-import/Program.cs +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2015, InWorldz Halcyon Developers - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * * Neither the name of halcyon nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using InWorldz.Halcyon.OpenSim.ImpExp; - -namespace InWorldz.Halcyon.Importer -{ - class Program - { - static void Main(string[] args) - { - SceneObjectConverter soc = new SceneObjectConverter("C:\\Projects\\InWorldz\\opensim\\bin"); - soc.SOGSnapshotFromOpenSimXml2("false47704d5f-910f-46ac-a685-7dcdf7bad9f353e7448e-9a77-4451-98c7-b79e0b340e3d053e7448e-9a77-4451-98c7-b79e0b340e3d2574477159Babys Breath3falsefalse10995116280320000149.3031128.888523.219690000001000000000000255000SIoAY0krTaGlNpr+UIuR6QAAAAAAAAAAAEAAAACAQQAAQAAAQAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAEQAAAM4u+b5GuEYTmG5TBM7AJK8D032000100150000000090000CircleSamece2ef9be-46b8-4613-986e-5304cec024af30000000000010001falsefalsetrue1.4173821.25011.4869590001000000000101357053677000000000000-0000-0000-0000-00000000000047704d5f-910f-46ac-a685-7dcdf7bad9f347704d5f-910f-46ac-a685-7dcdf7bad9f364716864716800581632Phantom00000000-0000-0000-0000-0000000000000-2-2-2-2-2"); - } - } -} diff --git a/HcImportExport/InWorldz.Halcyon.OpenSim.ImpExp/IAssetResolver.cs b/Source/InWorldz.Halcyon.OpenSim.ImpExp/IAssetResolver.cs similarity index 100% rename from HcImportExport/InWorldz.Halcyon.OpenSim.ImpExp/IAssetResolver.cs rename to Source/InWorldz.Halcyon.OpenSim.ImpExp/IAssetResolver.cs diff --git a/Source/InWorldz.Halcyon.OpenSim.ImpExp/InWorldz.Halcyon.OpenSim.ImpExp.csproj b/Source/InWorldz.Halcyon.OpenSim.ImpExp/InWorldz.Halcyon.OpenSim.ImpExp.csproj new file mode 100644 index 0000000..fa84e92 --- /dev/null +++ b/Source/InWorldz.Halcyon.OpenSim.ImpExp/InWorldz.Halcyon.OpenSim.ImpExp.csproj @@ -0,0 +1,129 @@ + + + + + Debug + x64 + {9683B2E3-80CD-4321-9E64-1BA2968A1892} + Library + Properties + InWorldz.Halcyon.OpenSim.ImpExp + InWorldz.Halcyon.OpenSim.ImpExp + v4.7.1 + 512 + + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + + + ..\packages\AppDomainToolkit.1.0.4.3\lib\net\AppDomainToolkit.dll + True + + + ..\..\..\halcyon\bin\InWorldz.Region.Data.Thoosa.dll + + + ..\..\packages\LibreMetaverse.1.2.5.188\lib\net461\LibreMetaverse.dll + + + ..\..\packages\LibreMetaverse.StructuredData.1.2.5.188\lib\net461\LibreMetaverse.StructuredData.dll + + + ..\..\packages\LibreMetaverse.Types.1.2.5.188\lib\net461\LibreMetaverse.Types.dll + + + ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll + + + False + ..\..\..\halcyon\bin\OpenSim.Framework.dll + + + ..\..\packages\protobuf-net.2.3.5\lib\net40\protobuf-net.dll + + + + + + + ..\..\packages\System.IO.4.3.0\lib\net462\System.IO.dll + True + True + + + ..\..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll + + + ..\..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll + True + True + + + + ..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll + True + True + + + ..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + ..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + + + + + + + + + ..\..\packages\XmlRpcCs.2.1.1.2\lib\net461\XmlRpcCs.dll + + + ..\..\packages\zlib.net-mutliplatform.1.0.4\lib\net47\zlib.net.dll + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HcImportExport/InWorldz.Halcyon.OpenSim.ImpExp/Properties/AssemblyInfo.cs b/Source/InWorldz.Halcyon.OpenSim.ImpExp/Properties/AssemblyInfo.cs similarity index 100% rename from HcImportExport/InWorldz.Halcyon.OpenSim.ImpExp/Properties/AssemblyInfo.cs rename to Source/InWorldz.Halcyon.OpenSim.ImpExp/Properties/AssemblyInfo.cs diff --git a/HcImportExport/InWorldz.Halcyon.OpenSim.ImpExp/SceneObjectConverter.cs b/Source/InWorldz.Halcyon.OpenSim.ImpExp/SceneObjectConverter.cs similarity index 100% rename from HcImportExport/InWorldz.Halcyon.OpenSim.ImpExp/SceneObjectConverter.cs rename to Source/InWorldz.Halcyon.OpenSim.ImpExp/SceneObjectConverter.cs diff --git a/Source/InWorldz.Halcyon.OpenSim.ImpExp/app.config b/Source/InWorldz.Halcyon.OpenSim.ImpExp/app.config new file mode 100644 index 0000000..7fe9dac --- /dev/null +++ b/Source/InWorldz.Halcyon.OpenSim.ImpExp/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Source/InWorldz.Halcyon.OpenSim.ImpExp/packages.config b/Source/InWorldz.Halcyon.OpenSim.ImpExp/packages.config new file mode 100644 index 0000000..e7f7796 --- /dev/null +++ b/Source/InWorldz.Halcyon.OpenSim.ImpExp/packages.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/hc-import/App.config b/Source/hc-import/App.config new file mode 100644 index 0000000..5fdef2b --- /dev/null +++ b/Source/hc-import/App.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/Source/hc-import/Program.cs b/Source/hc-import/Program.cs new file mode 100644 index 0000000..46440b9 --- /dev/null +++ b/Source/hc-import/Program.cs @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2015, InWorldz Halcyon Developers + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * * Neither the name of halcyon nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using InWorldz.Halcyon.OpenSim.ImpExp; + +namespace InWorldz.Halcyon.Importer +{ + class Program + { + static void Main(string[] args) + { + // TODO: doesn't compile at the moment... + // TODO: Should be pulling the path from a CLI parameter... + //SceneObjectConverter soc = new SceneObjectConverter("C:\\Projects\\InWorldz\\opensim\\bin"); + //soc.SOGSnapshotFromOpenSimXml2("false47704d5f-910f-46ac-a685-7dcdf7bad9f353e7448e-9a77-4451-98c7-b79e0b340e3d053e7448e-9a77-4451-98c7-b79e0b340e3d2574477159Babys Breath3falsefalse10995116280320000149.3031128.888523.219690000001000000000000255000SIoAY0krTaGlNpr+UIuR6QAAAAAAAAAAAEAAAACAQQAAQAAAQAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAEQAAAM4u+b5GuEYTmG5TBM7AJK8D032000100150000000090000CircleSamece2ef9be-46b8-4613-986e-5304cec024af30000000000010001falsefalsetrue1.4173821.25011.4869590001000000000101357053677000000000000-0000-0000-0000-00000000000047704d5f-910f-46ac-a685-7dcdf7bad9f347704d5f-910f-46ac-a685-7dcdf7bad9f364716864716800581632Phantom00000000-0000-0000-0000-0000000000000-2-2-2-2-2"); + } + } +} diff --git a/HcImportExport/hc-import/Properties/AssemblyInfo.cs b/Source/hc-import/Properties/AssemblyInfo.cs similarity index 100% rename from HcImportExport/hc-import/Properties/AssemblyInfo.cs rename to Source/hc-import/Properties/AssemblyInfo.cs diff --git a/HcImportExport/hc-import/hc-import.csproj b/Source/hc-import/hc-import.csproj similarity index 77% rename from HcImportExport/hc-import/hc-import.csproj rename to Source/hc-import/hc-import.csproj index 3034daa..d479178 100644 --- a/HcImportExport/hc-import/hc-import.csproj +++ b/Source/hc-import/hc-import.csproj @@ -3,34 +3,16 @@ Debug - AnyCPU + x64 {D2CBD3D5-F7A8-4E71-A58E-071382879B8B} Exe Properties hc_import hc-import - v4.5.2 + v4.7.1 512 true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + true