diff --git a/.gitignore b/.gitignore index d6a74afd..9c222bac 100644 --- a/.gitignore +++ b/.gitignore @@ -77,7 +77,6 @@ msbuild.wrn # Visual Studio 2015 .vs/ - # Test caches .pytest_cache/ .tox/ diff --git a/.travis.yml b/.travis.yml index 895df691..cc011a0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,13 @@ python: sudo: false env: - PYTHONPATH: plugin.video.vrt.nu + PYTHONPATH: . install: - pip install -r requirements.txt script: - tox -- pylint plugin.video.vrt.nu/*.py -- pylint plugin.video.vrt.nu/resources/lib/*/*.py -- python plugin.video.vrt.nu/vrtnutests/vrtplayertests.py +- pylint *.py +- pylint resources/lib/*/*.py +- python test/vrtplayertests.py diff --git a/Build-Zip.ps1 b/Build-Zip.ps1 new file mode 100755 index 00000000..23d63d8b --- /dev/null +++ b/Build-Zip.ps1 @@ -0,0 +1,45 @@ +#!/usr/bin/env pwsh + +Set-StrictMode -Version 5.0 + +$include_files = @( 'addon.py', 'addon.xml', 'LICENSE', 'README.md', 'service.py' ) +$include_paths = @( 'resources/' ) +$exclude_files = @( '*.new', '*.orig', '*.pyc' ) + +# Get addon metadata +[xml]$XmlDocument = Get-Content -LiteralPath 'addon.xml' +$name = $XmlDocument.addon.id +$version = $XmlDocument.addon.version +$git_hash = Invoke-Expression 'git rev-parse --short HEAD' +$zip_name = "$name-$version-$git_hash.zip" + +# Remove file if it exists +if (Test-Path -LiteralPath $zip_name) { + Remove-Item -LiteralPath $zip_name +} + +# Ensure .NET's current directory is Powershell's working directory +# NOTE: This is to ensure .NET can find our files correctly +[System.IO.Directory]::SetCurrentDirectory($PWD) + +Add-Type -AssemblyName System.IO.Compression.FileSystem + +# Create ZIP file +Write-Host -fore blue '= Building new package' +$zip_file = [System.IO.Compression.ZipFile]::Open($zip_name, 'Create') +ForEach ($relative_file in $include_files) { + # NOTE: Avoid Windows path-separator in ZIP files + $archive_file = (Join-Path -Path $name -ChildPath $relative_file).Replace('\', '/') + [System.IO.Compression.ZipFileExtensions]::CreateEntryFromFile($zip_file, $relative_file, $archive_file) +} +ForEach ($path in $include_paths) { + Get-ChildItem -Recurse -File -Path $path -Exclude $exclude_files | ForEach-Object { + $relative_file = Resolve-Path -Path $_.FullName -Relative + # NOTE: Powershell lacks functionality to normalize a path and uses Windows path-separator in ZIP files + $archive_file = (Join-Path -Path $name -ChildPath $relative_file).Replace('\', '/').Replace('/./', '/') + [System.IO.Compression.ZipFileExtensions]::CreateEntryFromFile($zip_file, $relative_file, $archive_file) + } +} +$zip_file.Dispose() +Write-Host "= Successfully wrote package as: " -ForegroundColor:Blue -NoNewLine +Write-Host "$zip_name" -ForegroundColor:Cyan diff --git a/MakeZipWindows.bat b/MakeZipWindows.bat deleted file mode 100644 index 0f0678d5..00000000 --- a/MakeZipWindows.bat +++ /dev/null @@ -1 +0,0 @@ -dotnet %~dp0/windowszipmaker/Packagemaker.dll \ No newline at end of file diff --git a/Makefile b/Makefile index 046015bb..03b41f5d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ENVS := py27,py36 -addon_xml = plugin.video.vrt.nu/addon.xml +addon_xml = addon.xml # Collect information to build as sensible package name name = $(shell xmllint --xpath 'string(/addon/@id)' $(addon_xml)) @@ -8,36 +8,35 @@ version = $(shell xmllint --xpath 'string(/addon/@version)' $(addon_xml)) git_hash = $(shell git rev-parse --short HEAD) zip_name = $(name)-$(version)-$(git_hash).zip -exclude_files = $(name).pyproj vrtnutests/ vrtnutests/* -exclude_paths = $(patsubst %,$(name)/%,$(exclude_files)) -include_files = LICENSE README.md +include_files = addon.py addon.xml LICENSE README.md resources/ service.py +include_paths = $(patsubst %,$(name)/%,$(include_files)) +exclude_files = \*.new \*.orig \*.pyc zip_dir = $(name)/ +blue = \e[1;34m +white = \e[1;37m +reset = \e[0m + .PHONY: test package: zip -clean: - @echo -e "\e[1;37m=\e[1;34m Clean up project directory\e[0m" - find . -name '*.pyc' -delete - @echo -e "\e[1;37m=\e[1;34m Finished cleaning up.\e[0m" +test: sanity unit -test: unittest - @echo -e "\e[1;37m=\e[1;34m Starting tests\e[0m" - pylint $(name)/*.py - pylint $(name)/resources/lib/*/*.py +sanity: + @echo -e "$(white)=$(blue) Starting sanity tests$(reset)" + pylint *.py + pylint resources/lib/*/*.py tox -e $(ENVS) - @echo -e "\e[1;37m=\e[1;34m Tests finished successfully.\e[0m" - -unittest: - @echo -e "\e[1;37m=\e[1;34m Starting unit tests\e[0m" - PYTHONPATH=$(name) python $(name)/vrtnutests/vrtplayertests.py - @echo -e "\e[1;37m=\e[1;34m Unit tests finished successfully.\e[0m" - -zip: test clean - @echo -e "\e[1;37m=\e[1;34m Building new package\e[0m" - rm -f $(zip_name) - cp -v $(include_files) $(zip_dir) - zip -r $(zip_name) $(zip_dir) -x $(exclude_paths) - cd $(zip_dir); rm -vf $(include_files) - @echo -e "\e[1;37m=\e[1;34m Successfully wrote package as: \e[1;37m$(zip_name)\e[0m" + @echo -e "$(white)=$(blue) Sanity tests finished successfully.$(reset)" + +unit: + @echo -e "$(white)=$(blue) Starting unit tests$(reset)" + PYTHONPATH=$(pwd) python test/vrtplayertests.py + @echo -e "$(white)=$(blue) Unit tests finished successfully.$(reset)" + +zip: test + @echo -e "$(white)=$(blue) Building new package$(reset)" + @rm -f ../$(zip_name) + cd ..; zip -r $(zip_name) $(include_paths) -x $(exclude_files) + @echo -e "$(white)=$(blue) Successfully wrote package as: $(white)../$(zip_name)$(reset)" diff --git a/plugin.video.vrt.nu/addon.py b/addon.py similarity index 100% rename from plugin.video.vrt.nu/addon.py rename to addon.py diff --git a/plugin.video.vrt.nu/addon.xml b/addon.xml similarity index 100% rename from plugin.video.vrt.nu/addon.xml rename to addon.xml diff --git a/packagemaker/Packagemaker.csproj b/packagemaker/Packagemaker.csproj deleted file mode 100644 index 4e65fa88..00000000 --- a/packagemaker/Packagemaker.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - Exe - netcoreapp2.1 - - - - - - - diff --git a/packagemaker/Program.cs b/packagemaker/Program.cs deleted file mode 100644 index e5d32445..00000000 --- a/packagemaker/Program.cs +++ /dev/null @@ -1,129 +0,0 @@ - using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.IO.Compression; -using System.Linq; -using System.Reflection; - -namespace plugin.video.vrt.nu.packagemaker -{ - class Program - { - private const string ZipfileName = "plugin.video.vrt.nu.zip"; - private const string SubFolderName = "plugin.video.vrt.nu"; - private const string ZipFolderName = "zip"; - - static void Main(string[] args) - { - var dllLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - - var rootFolder = Path.Combine(dllLocation, @".."); -#if DEBUG - rootFolder = Path.Combine(dllLocation, @"..", @"..", @"..", @".."); -#endif - rootFolder = Path.GetFullPath(rootFolder);//gives nicer output in logs - - var destination = Path.Combine(rootFolder, ZipFolderName, SubFolderName); - - var zipDestination = Path.Combine(rootFolder, ZipFolderName, ZipfileName); - RemoveDestinationZip(zipDestination); - - var vrtPluginRoot = Path.Combine(rootFolder, SubFolderName); - - var copiedFiles = CopyFilesToDestination(rootFolder, vrtPluginRoot, destination); - DeleteUnecesaryFiles(destination, copiedFiles); - - CreateZipFile(zipDestination, destination); - - RemoveDestinationDirectory(destination); - - Console.WriteLine($"Created zip at {Path.GetFullPath(zipDestination)}"); - Console.WriteLine("Type any key to exit"); - Console.ReadLine(); - } - - private static void CreateZipFile(string zipfileName, string destination) - { - Console.WriteLine("Creating zipfile"); - ZipFile.CreateFromDirectory(destination, zipfileName, CompressionLevel.NoCompression, true); - } - - private static void DeleteUnecesaryFiles(string destination, IEnumerable copiedFiles) - { - foreach (var itemToDelete in copiedFiles.Where(x => x.EndsWith("pyc") || x.EndsWith("pyproj") || x.EndsWith("user"))) - { - Console.WriteLine($"Deleting {itemToDelete}"); - File.Delete(itemToDelete); - } - - Console.WriteLine("Deletings tests folder"); - Directory.Delete(Path.Combine(destination, "vrtnutests"), true); - } - - private static string[] CopyFilesToDestination(string root, string pluginVideoVrtNuRoot, string destination) - { - DirectoryCopy(pluginVideoVrtNuRoot, destination, true); - - File.Copy(Path.Combine(root, "LICENSE"), Path.Combine(destination, "LICENSE")); - var copiedFiles = Directory.GetFiles(destination, string.Empty, SearchOption.AllDirectories); - return copiedFiles; - } - - private static void RemoveDestinationZip(string zipfileName) - { - if (File.Exists(zipfileName)) - { - Console.WriteLine("Removing Zipfile"); - File.Delete(zipfileName); - } - } - - private static void RemoveDestinationDirectory(string destination) - { - if (Directory.Exists(destination)) - { - Console.WriteLine("Removing Directory"); - Directory.Delete(destination, true); - } - } - - private static void DirectoryCopy(string sourceDirName, string destDirName, bool copySubDirs) - { - // Get the subdirectories for the specified directory. - DirectoryInfo dir = new DirectoryInfo(sourceDirName); - - if (!dir.Exists) - { - throw new DirectoryNotFoundException( - "Source directory does not exist or could not be found: " - + sourceDirName); - } - - DirectoryInfo[] dirs = dir.GetDirectories(); - // If the destination directory doesn't exist, create it. - if (!Directory.Exists(destDirName)) - { - Directory.CreateDirectory(destDirName); - } - - // Get the files in the directory and copy them to the new location. - FileInfo[] files = dir.GetFiles(); - foreach (FileInfo file in files) - { - string temppath = Path.Combine(destDirName, file.Name); - file.CopyTo(temppath, false); - } - - // If copying subdirectories, copy them and their contents to new location. - if (copySubDirs) - { - foreach (DirectoryInfo subdir in dirs) - { - string temppath = Path.Combine(destDirName, subdir.Name); - DirectoryCopy(subdir.FullName, temppath, copySubDirs); - } - } - } - } -} diff --git a/packagemaker/Properties/PublishProfiles/FolderProfile.pubxml b/packagemaker/Properties/PublishProfiles/FolderProfile.pubxml deleted file mode 100644 index ee5cc98c..00000000 --- a/packagemaker/Properties/PublishProfiles/FolderProfile.pubxml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - FileSystem - Release - Any CPU - netcoreapp2.1 - bin\Debug\netcoreapp2.1\publish\ - false - <_IsPortable>true - - \ No newline at end of file diff --git a/plugin.video.vrt.nu/plugin.video.vrt.nu.pyproj b/plugin.video.vrt.nu.pyproj similarity index 100% rename from plugin.video.vrt.nu/plugin.video.vrt.nu.pyproj rename to plugin.video.vrt.nu.pyproj diff --git a/plugin.video.vrt.nu.sln b/plugin.video.vrt.nu.sln index d41b63fe..d8a48ff6 100644 --- a/plugin.video.vrt.nu.sln +++ b/plugin.video.vrt.nu.sln @@ -11,9 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject -Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "plugin.video.vrt.nu", "plugin.video.vrt.nu\plugin.video.vrt.nu.pyproj", "{0360D216-8FEA-4853-AEF8-EBD17CD8B763}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Packagemaker", "packagemaker\Packagemaker.csproj", "{0400C90D-4756-4811-8AF1-CB921F0A83E9}" +Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "plugin.video.vrt.nu.pyproj", "plugin.video.vrt.nu.pyproj", "{0360D216-8FEA-4853-AEF8-EBD17CD8B763}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/plugin.video.vrt.nu/resources/__init__.py b/resources/__init__.py similarity index 100% rename from plugin.video.vrt.nu/resources/__init__.py rename to resources/__init__.py diff --git a/plugin.video.vrt.nu/resources/fanart.jpg b/resources/fanart.jpg similarity index 100% rename from plugin.video.vrt.nu/resources/fanart.jpg rename to resources/fanart.jpg diff --git a/plugin.video.vrt.nu/resources/icon.png b/resources/icon.png similarity index 100% rename from plugin.video.vrt.nu/resources/icon.png rename to resources/icon.png diff --git a/plugin.video.vrt.nu/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po similarity index 100% rename from plugin.video.vrt.nu/resources/language/resource.language.en_gb/strings.po rename to resources/language/resource.language.en_gb/strings.po diff --git a/plugin.video.vrt.nu/resources/language/resource.language.nl_nl/strings.po b/resources/language/resource.language.nl_nl/strings.po similarity index 100% rename from plugin.video.vrt.nu/resources/language/resource.language.nl_nl/strings.po rename to resources/language/resource.language.nl_nl/strings.po diff --git a/plugin.video.vrt.nu/resources/lib/__init__.py b/resources/lib/__init__.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/__init__.py rename to resources/lib/__init__.py diff --git a/plugin.video.vrt.nu/resources/lib/helperobjects/__init__.py b/resources/lib/helperobjects/__init__.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/helperobjects/__init__.py rename to resources/lib/helperobjects/__init__.py diff --git a/plugin.video.vrt.nu/resources/lib/helperobjects/apidata.py b/resources/lib/helperobjects/apidata.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/helperobjects/apidata.py rename to resources/lib/helperobjects/apidata.py diff --git a/plugin.video.vrt.nu/resources/lib/helperobjects/helperobjects.py b/resources/lib/helperobjects/helperobjects.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/helperobjects/helperobjects.py rename to resources/lib/helperobjects/helperobjects.py diff --git a/plugin.video.vrt.nu/resources/lib/helperobjects/streamurls.py b/resources/lib/helperobjects/streamurls.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/helperobjects/streamurls.py rename to resources/lib/helperobjects/streamurls.py diff --git a/plugin.video.vrt.nu/resources/lib/kodiwrappers/__init__.py b/resources/lib/kodiwrappers/__init__.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/kodiwrappers/__init__.py rename to resources/lib/kodiwrappers/__init__.py diff --git a/plugin.video.vrt.nu/resources/lib/kodiwrappers/kodiwrapper.py b/resources/lib/kodiwrappers/kodiwrapper.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/kodiwrappers/kodiwrapper.py rename to resources/lib/kodiwrappers/kodiwrapper.py diff --git a/plugin.video.vrt.nu/resources/lib/kodiwrappers/sortmethod.py b/resources/lib/kodiwrappers/sortmethod.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/kodiwrappers/sortmethod.py rename to resources/lib/kodiwrappers/sortmethod.py diff --git a/plugin.video.vrt.nu/resources/lib/vrtplayer/__init__.py b/resources/lib/vrtplayer/__init__.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/vrtplayer/__init__.py rename to resources/lib/vrtplayer/__init__.py diff --git a/plugin.video.vrt.nu/resources/lib/vrtplayer/actions.py b/resources/lib/vrtplayer/actions.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/vrtplayer/actions.py rename to resources/lib/vrtplayer/actions.py diff --git a/plugin.video.vrt.nu/resources/lib/vrtplayer/metadatacollector.py b/resources/lib/vrtplayer/metadatacollector.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/vrtplayer/metadatacollector.py rename to resources/lib/vrtplayer/metadatacollector.py diff --git a/plugin.video.vrt.nu/resources/lib/vrtplayer/metadatacreator.py b/resources/lib/vrtplayer/metadatacreator.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/vrtplayer/metadatacreator.py rename to resources/lib/vrtplayer/metadatacreator.py diff --git a/plugin.video.vrt.nu/resources/lib/vrtplayer/statichelper.py b/resources/lib/vrtplayer/statichelper.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/vrtplayer/statichelper.py rename to resources/lib/vrtplayer/statichelper.py diff --git a/plugin.video.vrt.nu/resources/lib/vrtplayer/streamservice.py b/resources/lib/vrtplayer/streamservice.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/vrtplayer/streamservice.py rename to resources/lib/vrtplayer/streamservice.py diff --git a/plugin.video.vrt.nu/resources/lib/vrtplayer/tokenresolver.py b/resources/lib/vrtplayer/tokenresolver.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/vrtplayer/tokenresolver.py rename to resources/lib/vrtplayer/tokenresolver.py diff --git a/plugin.video.vrt.nu/resources/lib/vrtplayer/vrtapihelper.py b/resources/lib/vrtplayer/vrtapihelper.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/vrtplayer/vrtapihelper.py rename to resources/lib/vrtplayer/vrtapihelper.py diff --git a/plugin.video.vrt.nu/resources/lib/vrtplayer/vrtplayer.py b/resources/lib/vrtplayer/vrtplayer.py similarity index 100% rename from plugin.video.vrt.nu/resources/lib/vrtplayer/vrtplayer.py rename to resources/lib/vrtplayer/vrtplayer.py diff --git a/plugin.video.vrt.nu/resources/media/canvas.png b/resources/media/canvas.png similarity index 100% rename from plugin.video.vrt.nu/resources/media/canvas.png rename to resources/media/canvas.png diff --git a/plugin.video.vrt.nu/resources/media/een.png b/resources/media/een.png similarity index 100% rename from plugin.video.vrt.nu/resources/media/een.png rename to resources/media/een.png diff --git a/plugin.video.vrt.nu/resources/media/ketnet.png b/resources/media/ketnet.png similarity index 100% rename from plugin.video.vrt.nu/resources/media/ketnet.png rename to resources/media/ketnet.png diff --git a/plugin.video.vrt.nu/resources/media/sporza.png b/resources/media/sporza.png similarity index 100% rename from plugin.video.vrt.nu/resources/media/sporza.png rename to resources/media/sporza.png diff --git a/plugin.video.vrt.nu/resources/settings.xml b/resources/settings.xml similarity index 100% rename from plugin.video.vrt.nu/resources/settings.xml rename to resources/settings.xml diff --git a/plugin.video.vrt.nu/service.py b/service.py similarity index 100% rename from plugin.video.vrt.nu/service.py rename to service.py diff --git a/plugin.video.vrt.nu/vrtnutests/__init__.py b/test/__init__.py similarity index 100% rename from plugin.video.vrt.nu/vrtnutests/__init__.py rename to test/__init__.py diff --git a/plugin.video.vrt.nu/vrtnutests/apihelpertests.py b/test/apihelpertests.py similarity index 100% rename from plugin.video.vrt.nu/vrtnutests/apihelpertests.py rename to test/apihelpertests.py diff --git a/plugin.video.vrt.nu/vrtnutests/streamservicetests.py b/test/streamservicetests.py similarity index 100% rename from plugin.video.vrt.nu/vrtnutests/streamservicetests.py rename to test/streamservicetests.py diff --git a/plugin.video.vrt.nu/vrtnutests/vrtplayertests.py b/test/vrtplayertests.py similarity index 100% rename from plugin.video.vrt.nu/vrtnutests/vrtplayertests.py rename to test/vrtplayertests.py diff --git a/windowszipmaker/Packagemaker.deps.json b/windowszipmaker/Packagemaker.deps.json deleted file mode 100644 index 1fa5b884..00000000 --- a/windowszipmaker/Packagemaker.deps.json +++ /dev/null @@ -1,328 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v2.1", - "signature": "21f5a0be07c42fcb985ccd5538b94fab62aaa33f" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v2.1": { - "Packagemaker/1.0.0": { - "dependencies": { - "System.IO.Compression.ZipFile": "4.3.0" - }, - "runtime": { - "Packagemaker.dll": {} - } - }, - "runtime.native.System/4.3.0": {}, - "runtime.native.System.IO.Compression/4.3.0": {}, - "System.Buffers/4.3.0": { - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Collections/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.Debug/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.Tracing/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Globalization/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.IO/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.Compression/4.3.0": { - "dependencies": { - "System.Buffers": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.IO.Compression": "4.3.0" - }, - "runtimeTargets": { - "runtime/unix/lib/_._": { - "rid": "unix", - "assetType": "runtime" - }, - "runtime/win/lib/_._": { - "rid": "win", - "assetType": "runtime" - } - } - }, - "System.IO.Compression.ZipFile/4.3.0": { - "dependencies": { - "System.Buffers": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.IO.FileSystem/4.3.0": { - "dependencies": { - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.FileSystem.Primitives/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Reflection/4.3.0": { - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Resources.ResourceManager/4.3.0": { - "dependencies": { - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime/4.3.0": {}, - "System.Runtime.Extensions/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices/4.3.0": { - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Text.Encoding/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Threading/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Threading.Tasks/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0" - } - } - } - }, - "libraries": { - "Packagemaker/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "runtime.native.System/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "path": "runtime.native.system/4.3.0", - "hashPath": "runtime.native.system.4.3.0.nupkg.sha512" - }, - "runtime.native.System.IO.Compression/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==", - "path": "runtime.native.system.io.compression/4.3.0", - "hashPath": "runtime.native.system.io.compression.4.3.0.nupkg.sha512" - }, - "System.Buffers/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ratu44uTIHgeBeI0dE8DWvmXVBSo4u7ozRZZHOMmK/JPpYyo0dAfgSiHlpiObMQ5lEtEyIXA40sKRYg5J6A8uQ==", - "path": "system.buffers/4.3.0", - "hashPath": "system.buffers.4.3.0.nupkg.sha512" - }, - "System.Collections/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", - "path": "system.collections/4.3.0", - "hashPath": "system.collections.4.3.0.nupkg.sha512" - }, - "System.Diagnostics.Debug/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", - "path": "system.diagnostics.debug/4.3.0", - "hashPath": "system.diagnostics.debug.4.3.0.nupkg.sha512" - }, - "System.Diagnostics.Tracing/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", - "path": "system.diagnostics.tracing/4.3.0", - "hashPath": "system.diagnostics.tracing.4.3.0.nupkg.sha512" - }, - "System.Globalization/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", - "path": "system.globalization/4.3.0", - "hashPath": "system.globalization.4.3.0.nupkg.sha512" - }, - "System.IO/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "path": "system.io/4.3.0", - "hashPath": "system.io.4.3.0.nupkg.sha512" - }, - "System.IO.Compression/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==", - "path": "system.io.compression/4.3.0", - "hashPath": "system.io.compression.4.3.0.nupkg.sha512" - }, - "System.IO.Compression.ZipFile/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-G4HwjEsgIwy3JFBduZ9quBkAu+eUwjIdJleuNSgmUojbH6O3mlvEIme+GHx/cLlTAPcrnnL7GqvB9pTlWRfhOg==", - "path": "system.io.compression.zipfile/4.3.0", - "hashPath": "system.io.compression.zipfile.4.3.0.nupkg.sha512" - }, - "System.IO.FileSystem/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", - "path": "system.io.filesystem/4.3.0", - "hashPath": "system.io.filesystem.4.3.0.nupkg.sha512" - }, - "System.IO.FileSystem.Primitives/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", - "path": "system.io.filesystem.primitives/4.3.0", - "hashPath": "system.io.filesystem.primitives.4.3.0.nupkg.sha512" - }, - "System.Reflection/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "path": "system.reflection/4.3.0", - "hashPath": "system.reflection.4.3.0.nupkg.sha512" - }, - "System.Reflection.Primitives/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "path": "system.reflection.primitives/4.3.0", - "hashPath": "system.reflection.primitives.4.3.0.nupkg.sha512" - }, - "System.Resources.ResourceManager/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", - "path": "system.resources.resourcemanager/4.3.0", - "hashPath": "system.resources.resourcemanager.4.3.0.nupkg.sha512" - }, - "System.Runtime/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "path": "system.runtime/4.3.0", - "hashPath": "system.runtime.4.3.0.nupkg.sha512" - }, - "System.Runtime.Extensions/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "path": "system.runtime.extensions/4.3.0", - "hashPath": "system.runtime.extensions.4.3.0.nupkg.sha512" - }, - "System.Runtime.Handles/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "path": "system.runtime.handles/4.3.0", - "hashPath": "system.runtime.handles.4.3.0.nupkg.sha512" - }, - "System.Runtime.InteropServices/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "path": "system.runtime.interopservices/4.3.0", - "hashPath": "system.runtime.interopservices.4.3.0.nupkg.sha512" - }, - "System.Text.Encoding/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "path": "system.text.encoding/4.3.0", - "hashPath": "system.text.encoding.4.3.0.nupkg.sha512" - }, - "System.Threading/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", - "path": "system.threading/4.3.0", - "hashPath": "system.threading.4.3.0.nupkg.sha512" - }, - "System.Threading.Tasks/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "path": "system.threading.tasks/4.3.0", - "hashPath": "system.threading.tasks.4.3.0.nupkg.sha512" - } - } -} \ No newline at end of file diff --git a/windowszipmaker/Packagemaker.dll b/windowszipmaker/Packagemaker.dll deleted file mode 100644 index 4fdc2efd..00000000 Binary files a/windowszipmaker/Packagemaker.dll and /dev/null differ diff --git a/windowszipmaker/Packagemaker.pdb b/windowszipmaker/Packagemaker.pdb deleted file mode 100644 index 59dccc5f..00000000 Binary files a/windowszipmaker/Packagemaker.pdb and /dev/null differ diff --git a/windowszipmaker/Packagemaker.runtimeconfig.json b/windowszipmaker/Packagemaker.runtimeconfig.json deleted file mode 100644 index 79949366..00000000 --- a/windowszipmaker/Packagemaker.runtimeconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "netcoreapp2.1", - "framework": { - "name": "Microsoft.NETCore.App", - "version": "2.1.0" - } - } -} \ No newline at end of file