diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2018-11-19 15:41:35 -0500 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2018-11-19 15:41:35 -0500 |
| commit | 4cd9eda1591c3908bf80b60c2902491a7595ee27 (patch) | |
| tree | 89029142622f76a5b4cde4adb6c98844f2f2b0c3 /build | |
| parent | 593723b7940ba72a786fc4c7366c56f9813d977b (diff) | |
| parent | 5de81464cea4b70b68d1ed344b89a161f88bc213 (diff) | |
| download | SMAPI-4cd9eda1591c3908bf80b60c2902491a7595ee27.tar.gz SMAPI-4cd9eda1591c3908bf80b60c2902491a7595ee27.tar.bz2 SMAPI-4cd9eda1591c3908bf80b60c2902491a7595ee27.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'build')
| -rw-r--r-- | build/GlobalAssemblyInfo.cs | 4 | ||||
| -rw-r--r-- | build/lib/System.Numerics.dll | bin | 0 -> 54272 bytes | |||
| -rw-r--r-- | build/lib/System.Runtime.Caching.dll | bin | 0 -> 71168 bytes | |||
| -rw-r--r-- | build/prepare-install-package.targets | 7 |
4 files changed, 8 insertions, 3 deletions
diff --git a/build/GlobalAssemblyInfo.cs b/build/GlobalAssemblyInfo.cs index c022afda..7a6de93c 100644 --- a/build/GlobalAssemblyInfo.cs +++ b/build/GlobalAssemblyInfo.cs @@ -1,5 +1,5 @@ using System.Reflection; [assembly: AssemblyProduct("SMAPI")] -[assembly: AssemblyVersion("2.8.1")] -[assembly: AssemblyFileVersion("2.8.1")] +[assembly: AssemblyVersion("2.8.2")] +[assembly: AssemblyFileVersion("2.8.2")] diff --git a/build/lib/System.Numerics.dll b/build/lib/System.Numerics.dll Binary files differnew file mode 100644 index 00000000..fed0f92c --- /dev/null +++ b/build/lib/System.Numerics.dll diff --git a/build/lib/System.Runtime.Caching.dll b/build/lib/System.Runtime.Caching.dll Binary files differnew file mode 100644 index 00000000..a062391d --- /dev/null +++ b/build/lib/System.Runtime.Caching.dll diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index aeed101d..3a870bd2 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -7,7 +7,8 @@ --> <Target Name="AfterBuild"> <PropertyGroup> - <CompiledRootPath>$(SolutionDir)\..\bin\$(Configuration)</CompiledRootPath> + <RootPath>$(SolutionDir)\..</RootPath> + <CompiledRootPath>$(RootPath)\bin\$(Configuration)</CompiledRootPath> <CompiledSmapiPath>$(CompiledRootPath)\SMAPI</CompiledSmapiPath> <CompiledToolkitPath>$(CompiledRootPath)\SMAPI.Toolkit\net4.5</CompiledToolkitPath> <PackagePath>$(SolutionDir)\..\bin\SMAPI installer</PackagePath> @@ -53,6 +54,10 @@ <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\System.Numerics.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\System.Runtime.Caching.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> + <!-- fix errors on Linux/Mac (sample: https://log.smapi.io/mMdFUpgB) --> + <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(RootPath)\build\lib\System.Numerics.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> + <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(RootPath)\build\lib\System.Runtime.Caching.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" /> + <!-- fix Linux/Mac permissions --> <Exec Condition="$(OS) != 'Windows_NT'" Command="chmod 755 "$(PackagePath)\install on Linux.sh"" /> <Exec Condition="$(OS) != 'Windows_NT'" Command="chmod 755 "$(PackagePath)\install on Mac.command"" /> |