diff --git a/LICENSE b/LICENSE index 0f05796d..7c8b6964 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ Copyright (c) 2012 GitHub, Inc. +Copyright (c) 2021 Caelan Sayler Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/README.md b/README.md index 7b18d5a2..8d20a7fe 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![Discord](https://img.shields.io/discord/767856501477343282?style=flat-square&color=purple)](https://discord.gg/CjrCrNzd3F) [![Build](https://img.shields.io/github/actions/workflow/status/clowd/Clowd.Squirrel/build.yml?branch=develop&style=flat-square)](https://github.com/clowd/Clowd.Squirrel/actions) [![Codecov](https://img.shields.io/codecov/c/github/clowd/Clowd.Squirrel?style=flat-square)](https://app.codecov.io/gh/clowd/Clowd.Squirrel) +[![License](https://img.shields.io/github/license/clowd/Clowd.Squirrel?style=flat-square)](https://github.com/clowd/Clowd.Squirrel/blob/develop/LICENSE) # Clowd.Squirrel diff --git a/Squirrel.sln b/Squirrel.sln index 4035acd6..0a17c88c 100644 --- a/Squirrel.sln +++ b/Squirrel.sln @@ -10,11 +10,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionLevel", "SolutionLevel", "{ED657D2C-F8A0-4012-A64F-7367D41BE4D2}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig - build.ps1 = build.ps1 .github\workflows\build.yml = .github\workflows\build.yml src\Directory.Build.props = src\Directory.Build.props Squirrel.entitlements = Squirrel.entitlements - vendor\wix\template.wxs = vendor\wix\template.wxs version.json = version.json EndProjectSection EndProject @@ -32,7 +30,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squirrel.Packaging.OSX", "s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squirrel.Deployment", "src\Squirrel.Deployment\Squirrel.Deployment.csproj", "{D19EA72C-E7AE-4A7B-924A-E7550901A49C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squirrel.Packaging.Tests", "test\Squirrel.Packaging.Tests\Squirrel.Packaging.Tests.csproj", "{175B06A5-5C09-4DAB-A6AF-C8A2257BD1B6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squirrel.Packaging.Tests", "test\Squirrel.Packaging.Tests\Squirrel.Packaging.Tests.csproj", "{175B06A5-5C09-4DAB-A6AF-C8A2257BD1B6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build.cmd b/build.cmd deleted file mode 100644 index fd63c4cd..00000000 --- a/build.cmd +++ /dev/null @@ -1 +0,0 @@ -powershell -ExecutionPolicy Bypass -File ./build.ps1 \ No newline at end of file diff --git a/push.cmd b/push.cmd deleted file mode 100644 index fb4faed1..00000000 --- a/push.cmd +++ /dev/null @@ -1 +0,0 @@ -dotnet nuget push .\build\Release\*.nupkg -k %1 -s https://nuget.pkg.github.com/clowd/index.json --skip-duplicate \ No newline at end of file diff --git a/vendor/THIRD_PARTY_NOTICES.md b/vendor/THIRD_PARTY_NOTICES.md index 99490597..8e328b52 100644 --- a/vendor/THIRD_PARTY_NOTICES.md +++ b/vendor/THIRD_PARTY_NOTICES.md @@ -1,18 +1,6 @@ # Vendor Binaries This folder contains pre-compiled binaries from a variety of sources. These should be updated periodically. -### singlefilehost.exe -- This is the native exe that has the .net native runtime linked in. -- It is also used for re-packing the `Update.exe` binary. -- Can be found in the dotnet SDK at "C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Host.win-x86\6.0.0\runtimes\win-x86\native\singlefilehost.exe". -- Can also be downloaded from NuGet, from here https://www.nuget.org/packages/Microsoft.NETCore.App.Host.win-x86/6.0.0 -- MIT License: https://github.com/dotnet/runtime/blob/main/LICENSE.TXT - -### nuget.exe -- Used with the `pack` command to bundle an application directory into a nuget package, which is then used to create Squirrel releases -- Can be found at https://www.nuget.org/downloads -- Apache 2.0 License: https://github.com/NuGet/NuGet.Client/blob/dev/LICENSE.txt - ### rcedit.exe - Updates PE resources, like VersionInfo or icons. It is used when generating `Setup.exe` and `Update.exe` to apply the user preferences. - Can be found at https://github.com/electron/rcedit/releases @@ -26,9 +14,4 @@ This folder contains pre-compiled binaries from a variety of sources. These shou ### 7za.exe / 7zz - Incldued because it is much faster at zipping / unzipping than the available managed algorithms. - Can be found at https://www.7-zip.org/ -- License is LGPL & BSD 3: https://www.7-zip.org/license.txt - -### wix -- Can be used to build persistent msi packages for the purposes of AD deployment -- Can be found at https://github.com/wixtoolset/wix3/releases -- MS-RL License: https://github.com/wixtoolset/wix3/blob/develop/LICENSE.TXT \ No newline at end of file +- License is LGPL & BSD 3: https://www.7-zip.org/license.txt \ No newline at end of file diff --git a/vendor/wix/Microsoft.Deployment.Resources.dll b/vendor/wix/Microsoft.Deployment.Resources.dll deleted file mode 100644 index 1ce0ed6d..00000000 Binary files a/vendor/wix/Microsoft.Deployment.Resources.dll and /dev/null differ diff --git a/vendor/wix/Microsoft.Deployment.WindowsInstaller.dll b/vendor/wix/Microsoft.Deployment.WindowsInstaller.dll deleted file mode 100644 index 742169d2..00000000 Binary files a/vendor/wix/Microsoft.Deployment.WindowsInstaller.dll and /dev/null differ diff --git a/vendor/wix/WixNetFxExtension.dll b/vendor/wix/WixNetFxExtension.dll deleted file mode 100644 index 8d8b60e9..00000000 Binary files a/vendor/wix/WixNetFxExtension.dll and /dev/null differ diff --git a/vendor/wix/candle.exe b/vendor/wix/candle.exe deleted file mode 100644 index 61be7aae..00000000 Binary files a/vendor/wix/candle.exe and /dev/null differ diff --git a/vendor/wix/candle.exe.config b/vendor/wix/candle.exe.config deleted file mode 100644 index 91db2350..00000000 --- a/vendor/wix/candle.exe.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - diff --git a/vendor/wix/darice.cub b/vendor/wix/darice.cub deleted file mode 100644 index dab45677..00000000 Binary files a/vendor/wix/darice.cub and /dev/null differ diff --git a/vendor/wix/light.exe b/vendor/wix/light.exe deleted file mode 100644 index 5874d3a0..00000000 Binary files a/vendor/wix/light.exe and /dev/null differ diff --git a/vendor/wix/light.exe.config b/vendor/wix/light.exe.config deleted file mode 100644 index 91db2350..00000000 --- a/vendor/wix/light.exe.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - diff --git a/vendor/wix/template.wxs b/vendor/wix/template.wxs deleted file mode 100644 index 0a7440b1..00000000 --- a/vendor/wix/template.wxs +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vendor/wix/wconsole.dll b/vendor/wix/wconsole.dll deleted file mode 100644 index b5cc7a94..00000000 Binary files a/vendor/wix/wconsole.dll and /dev/null differ diff --git a/vendor/wix/winterop.dll b/vendor/wix/winterop.dll deleted file mode 100644 index f0897060..00000000 Binary files a/vendor/wix/winterop.dll and /dev/null differ diff --git a/vendor/wix/wix.dll b/vendor/wix/wix.dll deleted file mode 100644 index 606abfdb..00000000 Binary files a/vendor/wix/wix.dll and /dev/null differ