From 9a0dd282adf625378dc44dada7758747bb908217 Mon Sep 17 00:00:00 2001 From: Matthew Asplund Date: Tue, 4 Jan 2022 00:15:42 -0800 Subject: [PATCH] Add Code Signing (#111) * Update OpenSSL * Move soup exe to sub folder * Add signing scripts --- Dependencies/openssl | 2 +- Docs/Developer-Setup.md | 6 +- Docs/Samples/CSharp/Build-Extension.md | 2 +- Docs/Samples/Cpp/Build-Extension.md | 2 +- .../BuildExtension/Extension/Recipe.toml | 2 +- .../Cpp/BuildExtension/Extension/Recipe.toml | 2 +- Scripts/Install/soup.cmd | 4 ++ Scripts/SignInstaller.cmd | 9 +++ Scripts/SignRuntime.cmd | 19 ++++++ Scripts/soup.cmd | 14 ++--- Scripts/soupd.cmd | 14 ++--- Source/Client/CLI/Recipe.toml | 2 +- .../CLI/Source/Commands/VersionCommand.h | 2 +- Source/Client/Core/Recipe.toml | 4 +- .../Build.Extensions/Recipe.toml | 2 +- .../Build.Extensions/SharedOperations.cs | 4 +- .../CSharp/Compiler/Core/Recipe.toml | 4 +- .../CSharp/Compiler/Roslyn/Recipe.toml | 6 +- .../Extensions/CSharp/Extension/Recipe.toml | 6 +- .../Extensions/Cpp/Compiler/Core/Recipe.toml | 4 +- .../Extensions/Cpp/Compiler/MSVC/Recipe.toml | 6 +- .../Extensions/Cpp/Extension/Recipe.toml | 6 +- Source/Installer/SoupInstaller/App.config | 6 +- .../SoupInstaller/Properties/AssemblyInfo.cs | 2 +- Source/Installer/SoupInstaller/Setup.cs | 58 +++++++++---------- .../SoupInstaller/SoupInstaller.csproj | 28 +-------- .../Installer/SoupInstaller/packages.config | 5 -- 27 files changed, 111 insertions(+), 110 deletions(-) create mode 100644 Scripts/Install/soup.cmd create mode 100644 Scripts/SignInstaller.cmd create mode 100644 Scripts/SignRuntime.cmd delete mode 100644 Source/Installer/SoupInstaller/packages.config diff --git a/Dependencies/openssl b/Dependencies/openssl index 6f8922960..ee8a61e15 160000 --- a/Dependencies/openssl +++ b/Dependencies/openssl @@ -1 +1 @@ -Subproject commit 6f892296038490a7fa24b32ac6f7305687634fb0 +Subproject commit ee8a61e158c42c327c3303101083422b9a7cc504 diff --git a/Docs/Developer-Setup.md b/Docs/Developer-Setup.md index dbe3e786b..189c8f3bf 100644 --- a/Docs/Developer-Setup.md +++ b/Docs/Developer-Setup.md @@ -9,7 +9,7 @@ * [Latest Release](https://github.com/mwasplund/Soup/releases) ### OpenSSL Requirements -* Perl. We recommend Strawberry http://strawberryperl.com/ +* Perl. We recommend Strawberry https://strawberryperl.com/download/5.30.3.1/strawberry-perl-5.30.3.1-64bit.msi * Netwide Assembler, a.k.a. NASM, available from https://www.nasm.us ## Setup @@ -22,10 +22,10 @@ git clone --recursive https://github.com/mwasplund/Soup.git ## Build ### Build openssl -using x64 Native Tools Command Prompt for VS 2019 +using x64 Native Tools Command Prompt for VS 2022 ``` cd Dependencies/openssl -PATH=%PATH%;"C:\Program Files\NASM" +PATH=%PATH%;"C:\NASM" perl Configure VC-WIN64A nmake nmake test diff --git a/Docs/Samples/CSharp/Build-Extension.md b/Docs/Samples/CSharp/Build-Extension.md index b50fd0fd8..7e5452d53 100644 --- a/Docs/Samples/CSharp/Build-Extension.md +++ b/Docs/Samples/CSharp/Build-Extension.md @@ -16,7 +16,7 @@ Source = [ [Dependencies] Runtime = [ { Reference = "Soup.Build@0.1.3", ExcludeRuntime = true }, - { Reference = "Soup.Build.Extensions@0.1.7" }, + { Reference = "Soup.Build.Extensions@0.1.8" }, { Reference = "Opal@1.0.1" }, ] ``` diff --git a/Docs/Samples/Cpp/Build-Extension.md b/Docs/Samples/Cpp/Build-Extension.md index 73944d9a2..9318ae70e 100644 --- a/Docs/Samples/Cpp/Build-Extension.md +++ b/Docs/Samples/Cpp/Build-Extension.md @@ -16,7 +16,7 @@ Source = [ [Dependencies] Runtime = [ { Reference = "Soup.Build@0.1.3", ExcludeRuntime = true }, - { Reference = "Soup.Build.Extensions@0.1.7" }, + { Reference = "Soup.Build.Extensions@0.1.8" }, { Reference = "Opal@1.0.1" }, ] ``` diff --git a/Samples/CSharp/BuildExtension/Extension/Recipe.toml b/Samples/CSharp/BuildExtension/Extension/Recipe.toml index 9ad4fc9f6..823f0f631 100644 --- a/Samples/CSharp/BuildExtension/Extension/Recipe.toml +++ b/Samples/CSharp/BuildExtension/Extension/Recipe.toml @@ -8,6 +8,6 @@ Source = [ [Dependencies] Runtime = [ { Reference = "Soup.Build@0.1.3", ExcludeRuntime = true }, - { Reference = "Soup.Build.Extensions@0.1.7" }, + { Reference = "Soup.Build.Extensions@0.1.8" }, { Reference = "Opal@1.0.1" }, ] \ No newline at end of file diff --git a/Samples/Cpp/BuildExtension/Extension/Recipe.toml b/Samples/Cpp/BuildExtension/Extension/Recipe.toml index 4f623de1a..179d1afe2 100644 --- a/Samples/Cpp/BuildExtension/Extension/Recipe.toml +++ b/Samples/Cpp/BuildExtension/Extension/Recipe.toml @@ -8,6 +8,6 @@ Source = [ [Dependencies] Runtime = [ { Reference = "Soup.Build@0.1.3", ExcludeRuntime = true }, - { Reference = "Soup.Build.Extensions@0.1.7" }, + { Reference = "Soup.Build.Extensions@0.1.8" }, { Reference = "Opal@1.0.1" }, ] \ No newline at end of file diff --git a/Scripts/Install/soup.cmd b/Scripts/Install/soup.cmd new file mode 100644 index 000000000..b081845ab --- /dev/null +++ b/Scripts/Install/soup.cmd @@ -0,0 +1,4 @@ +@echo off +SET ScriptsDir=%~dp0 + +"%ScriptsDir%\Soup\soup.exe" %* \ No newline at end of file diff --git a/Scripts/SignInstaller.cmd b/Scripts/SignInstaller.cmd new file mode 100644 index 000000000..e9bbe9e92 --- /dev/null +++ b/Scripts/SignInstaller.cmd @@ -0,0 +1,9 @@ +@echo off +SET ScriptsDir=%~dp0 +SET SourceDir=%ScriptsDir%..\Source +SET InstallerDir=%SourceDir%\Installer\SoupInstaller\msi + +SET CertPath=[SECRET] +SET Password=[SECRET] + +signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath% /p %Password% %InstallerDir%\*.msi \ No newline at end of file diff --git a/Scripts/SignRuntime.cmd b/Scripts/SignRuntime.cmd new file mode 100644 index 000000000..e7ee5b8e4 --- /dev/null +++ b/Scripts/SignRuntime.cmd @@ -0,0 +1,19 @@ +@echo off +SET ScriptsDir=%~dp0 +SET RootDir=%ScriptsDir%.. +SET OutDir=%RootDir%\out +SET RunDir=%OutDir%\run + +SET CertPath=[SECRET] +SET Password=[SECRET] + +signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath% /p %Password% %RunDir%\Soup\*.dll +signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath% /p %Password% %RunDir%\Soup\*.exe +signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath% /p %Password% %RunDir%\Soup\Generate\*.dll +signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath% /p %Password% %RunDir%\Soup\Generate\*.exe +signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath% /p %Password% %RunDir%\Soup\Generate\Extensions\Soup.Cpp\*.dll +signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath% /p %Password% %RunDir%\Soup\Generate\Extensions\Soup.CSharp\*.dll +signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath% /p %Password% %RunDir%\Soup\PackageManager\*.dll +signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath% /p %Password% %RunDir%\Soup\PackageManager\*.exe +signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath% /p %Password% %RunDir%\Swhere\*.dll +signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath% /p %Password% %RunDir%\Swhere\*.exe \ No newline at end of file diff --git a/Scripts/soup.cmd b/Scripts/soup.cmd index 598af288b..aa363ec59 100644 --- a/Scripts/soup.cmd +++ b/Scripts/soup.cmd @@ -4,11 +4,11 @@ SET RootDir=%ScriptsDir%.. SET OutDir=%RootDir%\out SET RunDir=%OutDir%\run REM - Use a copy of the final binary in case we are re-buiding itself -robocopy %OutDir%\C++\Soup\1281a639dd5d393781f4188942c6bc05544b7c2c0124eae4cc59236248e36\bin\ %RunDir%\ /MIR /NJH /NJS /NDL > NUL -robocopy %ScriptsDir%\Install\ %RunDir%\ /NJH /NJS /NDL > NUL -robocopy %OutDir%\msbuild\bin\Soup.Build.Generate\Release\net5.0\ %RunDir%\Generate\ /MIR /NJH /NJS /NDL > NUL -robocopy %OutDir%\C#\Soup.Cpp\1281a639dd5d393781f4188942c6bc05544b7c2c0124eae4cc59236248e36\bin %RunDir%\Generate\Extensions\Soup.Cpp\ /MIR /NJH /NJS /NDL > NUL -robocopy %OutDir%\C#\Soup.CSharp\1281a639dd5d393781f4188942c6bc05544b7c2c0124eae4cc59236248e36\bin %RunDir%\Generate\Extensions\Soup.CSharp\ /MIR /NJH /NJS /NDL > NUL -robocopy %OutDir%\msbuild\bin\Soup.Build.PackageManager\Release\net5-windows10.0.17763.0\ %RunDir%\PackageManager\ /MIR /NJH /NJS /NDL > NUL +robocopy %ScriptsDir%\Install\ %RunDir%\ /MIR /NJH /NJS /NDL > NUL +robocopy %OutDir%\C++\Soup\1281a639dd5d393781f4188942c6bc05544b7c2c0124eae4cc59236248e36\bin\ %RunDir%\Soup\ /MIR /NJH /NJS /NDL > NUL +robocopy %OutDir%\msbuild\bin\Soup.Build.Generate\Release\net5.0\ %RunDir%\Soup\Generate\ /MIR /NJH /NJS /NDL > NUL +robocopy %OutDir%\C#\Soup.Cpp\1281a639dd5d393781f4188942c6bc05544b7c2c0124eae4cc59236248e36\bin %RunDir%\Soup\Generate\Extensions\Soup.Cpp\ /MIR /NJH /NJS /NDL > NUL +robocopy %OutDir%\C#\Soup.CSharp\1281a639dd5d393781f4188942c6bc05544b7c2c0124eae4cc59236248e36\bin %RunDir%\Soup\Generate\Extensions\Soup.CSharp\ /MIR /NJH /NJS /NDL > NUL +robocopy %OutDir%\msbuild\bin\Soup.Build.PackageManager\Release\net5-windows10.0.17763.0\ %RunDir%\Soup\PackageManager\ /MIR /NJH /NJS /NDL > NUL robocopy %OutDir%\msbuild\bin\Swhere\Release\net5-windows10.0.17763.0\ %RunDir%\Swhere\ /MIR /NJH /NJS /NDL > NUL -%RunDir%\Soup.exe %* \ No newline at end of file +%RunDir%\Soup.cmd %* \ No newline at end of file diff --git a/Scripts/soupd.cmd b/Scripts/soupd.cmd index 8086084bc..6ee9fc426 100644 --- a/Scripts/soupd.cmd +++ b/Scripts/soupd.cmd @@ -4,11 +4,11 @@ SET RootDir=%ScriptsDir%.. SET OutDir=%RootDir%\out SET RunDir=%OutDir%\run REM - Use a copy of the final binary in case we are re-buiding itself -robocopy %OutDir%\C++\Soup\3d80717e7d2695f0a7aa5c38e2849624beeaa5714331ca96898fe4b8b8023fe\bin\ %RunDir%\ /MIR /NJH /NJS /NDL > NUL -robocopy %ScriptsDir%\Install\ %RunDir%\ /NJH /NJS /NDL > NUL -robocopy %OutDir%\msbuild\bin\Soup.Build.Generate\Debug\net5.0\ %RunDir%\Generate\ /MIR /NJH /NJS /NDL > NUL -robocopy %OutDir%\C#\Soup.Cpp\3d80717e7d2695f0a7aa5c38e2849624beeaa5714331ca96898fe4b8b8023fe\bin %RunDir%\Generate\Extensions\Soup.Cpp\ /MIR /NJH /NJS /NDL > NUL -robocopy %OutDir%\C#\Soup.CSharp\3d80717e7d2695f0a7aa5c38e2849624beeaa5714331ca96898fe4b8b8023fe\bin %RunDir%\Generate\Extensions\Soup.CSharp\ /MIR /NJH /NJS /NDL > NUL -robocopy %OutDir%\msbuild\bin\Soup.Build.PackageManager\Debug\net5-windows10.0.17763.0\ %RunDir%\PackageManager\ /MIR /NJH /NJS /NDL > NUL +robocopy %ScriptsDir%\Install\ %RunDir%\ /MIR /NJH /NJS /NDL > NUL +robocopy %OutDir%\C++\Soup\3d80717e7d2695f0a7aa5c38e2849624beeaa5714331ca96898fe4b8b8023fe\bin\ %RunDir%\Soup\ /MIR /NJH /NJS /NDL > NUL +robocopy %OutDir%\msbuild\bin\Soup.Build.Generate\Debug\net5.0\ %RunDir%\Soup\Generate\ /MIR /NJH /NJS /NDL > NUL +robocopy %OutDir%\C#\Soup.Cpp\3d80717e7d2695f0a7aa5c38e2849624beeaa5714331ca96898fe4b8b8023fe\bin %RunDir%\Soup\Generate\Extensions\Soup.Cpp\ /MIR /NJH /NJS /NDL > NUL +robocopy %OutDir%\C#\Soup.CSharp\3d80717e7d2695f0a7aa5c38e2849624beeaa5714331ca96898fe4b8b8023fe\bin %RunDir%\Soup\Generate\Extensions\Soup.CSharp\ /MIR /NJH /NJS /NDL > NUL +robocopy %OutDir%\msbuild\bin\Soup.Build.PackageManager\Debug\net5-windows10.0.17763.0\ %RunDir%\Soup\PackageManager\ /MIR /NJH /NJS /NDL > NUL robocopy %OutDir%\msbuild\bin\Swhere\Debug\net5-windows10.0.17763.0\ %RunDir%\Swhere\ /MIR /NJH /NJS /NDL > NUL -%RunDir%\Soup.exe %* \ No newline at end of file +%RunDir%\Soup.cmd %* \ No newline at end of file diff --git a/Source/Client/CLI/Recipe.toml b/Source/Client/CLI/Recipe.toml index cc2efaaa7..bf181fc25 100644 --- a/Source/Client/CLI/Recipe.toml +++ b/Source/Client/CLI/Recipe.toml @@ -1,6 +1,6 @@ Name = "Soup" Language = "C++" -Version = "0.16.0" +Version = "0.16.1" Type = "Executable" Source = [ diff --git a/Source/Client/CLI/Source/Commands/VersionCommand.h b/Source/Client/CLI/Source/Commands/VersionCommand.h index c33de95eb..28577b7cc 100644 --- a/Source/Client/CLI/Source/Commands/VersionCommand.h +++ b/Source/Client/CLI/Source/Commands/VersionCommand.h @@ -31,7 +31,7 @@ namespace Soup::Client // TODO var version = Assembly.GetExecutingAssembly().GetName().Version; // Log::Message($"{version.Major}.{version.Minor}.{version.Build}"); - Log::HighPriority("0.16.0"); + Log::HighPriority("0.16.2"); } private: diff --git a/Source/Client/Core/Recipe.toml b/Source/Client/Core/Recipe.toml index 328d7df25..ead8f7a54 100644 --- a/Source/Client/Core/Recipe.toml +++ b/Source/Client/Core/Recipe.toml @@ -21,8 +21,8 @@ LinkLibraries = [ ] RuntimeDependencies = [ # Copy the dynamic libraries - "../../../Dependencies/OpenSSL/libcrypto-3.dll", - "../../../Dependencies/OpenSSL/libssl-3.dll", + "../../../Dependencies/OpenSSL/libcrypto-3-x64.dll", + "../../../Dependencies/OpenSSL/libssl-3-x64.dll", ] [Dependencies] diff --git a/Source/GenerateSharp/Build.Extensions/Recipe.toml b/Source/GenerateSharp/Build.Extensions/Recipe.toml index bfbfb93f4..f5576dcd5 100644 --- a/Source/GenerateSharp/Build.Extensions/Recipe.toml +++ b/Source/GenerateSharp/Build.Extensions/Recipe.toml @@ -1,6 +1,6 @@ Name = "Soup.Build.Extensions" Language = "C#" -Version = "0.1.7" +Version = "0.1.8" Source = [ "BuildOperation.cs", "IBuildStateExtensions.cs", diff --git a/Source/GenerateSharp/Build.Extensions/SharedOperations.cs b/Source/GenerateSharp/Build.Extensions/SharedOperations.cs index 738edaa3d..6064dc7f1 100644 --- a/Source/GenerateSharp/Build.Extensions/SharedOperations.cs +++ b/Source/GenerateSharp/Build.Extensions/SharedOperations.cs @@ -25,7 +25,7 @@ public static BuildOperation CreateCopyFileOperation( var title = $"Copy [{source}] -> [{destination}]"; var moduleName = LifetimeManager.Get().GetCurrentProcessFileName(); - var moduleFolder = moduleName.GetParent().GetParent(); + var moduleFolder = moduleName.GetParent().GetParent().GetParent().GetParent(); var program = moduleFolder + new Path("copy.exe"); var inputFiles = new List() @@ -62,7 +62,7 @@ public static BuildOperation CreateCreateDirectoryOperation( var title = $"MakeDir [{directory}]"; var moduleName = LifetimeManager.Get().GetCurrentProcessFileName(); - var moduleFolder = moduleName.GetParent().GetParent(); + var moduleFolder = moduleName.GetParent().GetParent().GetParent().GetParent(); var program = moduleFolder + new Path("mkdir.exe"); var inputFiles = new List() diff --git a/Source/GenerateSharp/Extensions/CSharp/Compiler/Core/Recipe.toml b/Source/GenerateSharp/Extensions/CSharp/Compiler/Core/Recipe.toml index 423863303..a81c01a4e 100644 --- a/Source/GenerateSharp/Extensions/CSharp/Compiler/Core/Recipe.toml +++ b/Source/GenerateSharp/Extensions/CSharp/Compiler/Core/Recipe.toml @@ -1,6 +1,6 @@ Name = "Soup.CSharp.Compiler" Language = "C#" -Version = "0.1.4" +Version = "0.1.5" Source = [ "BuildArguments.cs", "BuildEngine.cs", @@ -14,5 +14,5 @@ Source = [ Runtime = [ { Reference = "Opal@1.0.1" }, { Reference = "Soup.Build@0.1.3", ExcludeRuntime = true }, - { Reference = "Soup.Build.Extensions@0.1.7" }, + { Reference = "Soup.Build.Extensions@0.1.8" }, ] \ No newline at end of file diff --git a/Source/GenerateSharp/Extensions/CSharp/Compiler/Roslyn/Recipe.toml b/Source/GenerateSharp/Extensions/CSharp/Compiler/Roslyn/Recipe.toml index 4efe0dc19..f928dbc54 100644 --- a/Source/GenerateSharp/Extensions/CSharp/Compiler/Roslyn/Recipe.toml +++ b/Source/GenerateSharp/Extensions/CSharp/Compiler/Roslyn/Recipe.toml @@ -1,6 +1,6 @@ Name = "Soup.CSharp.Compiler.Roslyn" Language = "C#" -Version = "0.1.5" +Version = "0.1.6" Source = [ "ArgumentBuilder.cs", "Compiler.cs", @@ -9,6 +9,6 @@ Source = [ [Dependencies] Runtime = [ "Opal@1.0.1", - "Soup.CSharp.Compiler@0.1.4", - "Soup.Build.Extensions@0.1.7", + "Soup.CSharp.Compiler@0.1.5", + "Soup.Build.Extensions@0.1.8", ] \ No newline at end of file diff --git a/Source/GenerateSharp/Extensions/CSharp/Extension/Recipe.toml b/Source/GenerateSharp/Extensions/CSharp/Extension/Recipe.toml index 7dac9949b..0423c3c3a 100644 --- a/Source/GenerateSharp/Extensions/CSharp/Extension/Recipe.toml +++ b/Source/GenerateSharp/Extensions/CSharp/Extension/Recipe.toml @@ -13,7 +13,7 @@ Source = [ Runtime = [ { Reference = "Opal@1.0.1" }, { Reference = "Soup.Build@0.1.3", ExcludeRuntime = true }, - { Reference = "Soup.Build.Extensions@0.1.7" }, - { Reference = "Soup.CSharp.Compiler@0.1.4" }, - { Reference = "Soup.CSharp.Compiler.Roslyn@0.1.5" }, + { Reference = "Soup.Build.Extensions@0.1.8" }, + { Reference = "Soup.CSharp.Compiler@0.1.5" }, + { Reference = "Soup.CSharp.Compiler.Roslyn@0.1.6" }, ] \ No newline at end of file diff --git a/Source/GenerateSharp/Extensions/Cpp/Compiler/Core/Recipe.toml b/Source/GenerateSharp/Extensions/Cpp/Compiler/Core/Recipe.toml index 90916a9f7..b09968ce4 100644 --- a/Source/GenerateSharp/Extensions/Cpp/Compiler/Core/Recipe.toml +++ b/Source/GenerateSharp/Extensions/Cpp/Compiler/Core/Recipe.toml @@ -1,6 +1,6 @@ Name = "Soup.Cpp.Compiler" Language = "C#" -Version = "0.1.5" +Version = "0.1.6" Source = [ "BuildArguments.cs", "BuildEngine.cs", @@ -15,5 +15,5 @@ Source = [ Runtime = [ { Reference = "Opal@1.0.1" }, { Reference = "Soup.Build@0.1.3", ExcludeRuntime = true }, - { Reference = "Soup.Build.Extensions@0.1.7" }, + { Reference = "Soup.Build.Extensions@0.1.8" }, ] \ No newline at end of file diff --git a/Source/GenerateSharp/Extensions/Cpp/Compiler/MSVC/Recipe.toml b/Source/GenerateSharp/Extensions/Cpp/Compiler/MSVC/Recipe.toml index 4b62ea572..edcd67aff 100644 --- a/Source/GenerateSharp/Extensions/Cpp/Compiler/MSVC/Recipe.toml +++ b/Source/GenerateSharp/Extensions/Cpp/Compiler/MSVC/Recipe.toml @@ -1,6 +1,6 @@ Name = "Soup.Cpp.Compiler.MSVC" Language = "C#" -Version = "0.1.6" +Version = "0.1.7" Source = [ "ArgumentBuilder.cs", "Compiler.cs", @@ -9,6 +9,6 @@ Source = [ [Dependencies] Runtime = [ "Opal@1.0.1", - "Soup.Cpp.Compiler@0.1.5", - "Soup.Build.Extensions@0.1.7", + "Soup.Cpp.Compiler@0.1.6", + "Soup.Build.Extensions@0.1.8", ] \ No newline at end of file diff --git a/Source/GenerateSharp/Extensions/Cpp/Extension/Recipe.toml b/Source/GenerateSharp/Extensions/Cpp/Extension/Recipe.toml index 974cbe093..aaaecbfd9 100644 --- a/Source/GenerateSharp/Extensions/Cpp/Extension/Recipe.toml +++ b/Source/GenerateSharp/Extensions/Cpp/Extension/Recipe.toml @@ -12,7 +12,7 @@ Source = [ Runtime = [ { Reference = "Opal@1.0.1" }, { Reference = "Soup.Build@0.1.3", ExcludeRuntime = true }, - { Reference = "Soup.Build.Extensions@0.1.7" }, - { Reference = "Soup.Cpp.Compiler@0.1.5" }, - { Reference = "Soup.Cpp.Compiler.MSVC@0.1.6" }, + { Reference = "Soup.Build.Extensions@0.1.8" }, + { Reference = "Soup.Cpp.Compiler@0.1.6" }, + { Reference = "Soup.Cpp.Compiler.MSVC@0.1.7" }, ] \ No newline at end of file diff --git a/Source/Installer/SoupInstaller/App.config b/Source/Installer/SoupInstaller/App.config index 4bfa00561..033746a4a 100644 --- a/Source/Installer/SoupInstaller/App.config +++ b/Source/Installer/SoupInstaller/App.config @@ -1,6 +1,6 @@ - + - + - + \ No newline at end of file diff --git a/Source/Installer/SoupInstaller/Properties/AssemblyInfo.cs b/Source/Installer/SoupInstaller/Properties/AssemblyInfo.cs index c159914ca..05526b5bb 100644 --- a/Source/Installer/SoupInstaller/Properties/AssemblyInfo.cs +++ b/Source/Installer/SoupInstaller/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SoupInstaller")] -[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyCopyright("Copyright © 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Source/Installer/SoupInstaller/Setup.cs b/Source/Installer/SoupInstaller/Setup.cs index e38a2e035..68103b837 100644 --- a/Source/Installer/SoupInstaller/Setup.cs +++ b/Source/Installer/SoupInstaller/Setup.cs @@ -5,47 +5,43 @@ class Script { static public void Main() { - var soupScriptsFolder = @"..\..\..\Scripts\Install\"; - var soupBinFolder = @"..\..\..\out\C++\Soup\1281a639dd5d393781f4188942c6bc05544b7c2c0124eae4cc59236248e36\bin\"; - var soupExtensionCppBinFolder = @"..\..\..\out\C#\Soup.Cpp\1281a639dd5d393781f4188942c6bc05544b7c2c0124eae4cc59236248e36\bin\"; - var soupExtensionCSharpBinFolder = @"..\..\..\out\C#\Soup.CSharp\1281a639dd5d393781f4188942c6bc05544b7c2c0124eae4cc59236248e36\bin\"; - var soupBinGenerateFolder = @"..\..\..\out\msbuild\bin\Soup.Build.Generate\Release\net5.0\"; - var soupBinPackageManagerFolder = @"..\..\..\out\msbuild\bin\Soup.Build.PackageManager\Release\net5-windows10.0.17763.0\"; - var soupBinSwhereFolder = @"..\..\..\out\msbuild\bin\Swhere\Release\net5-windows10.0.17763.0\"; + var soupRunFolder = @"../../../out/run"; var project = new Project( "Soup Build", new Dir( @"%ProgramFiles%\SoupBuild\Soup", - new DirFiles(System.IO.Path.Combine(soupScriptsFolder, "*.*")), - new DirFiles(System.IO.Path.Combine(soupBinFolder, "*.*")), + new DirFiles($"{soupRunFolder}/*.*"), new Dir( - @"Generate", - new DirFiles(System.IO.Path.Combine(soupBinGenerateFolder, "*.*")), + @"Soup", + new DirFiles($"{soupRunFolder}/Soup/*.*"), new Dir( - @"Extensions", + @"Generate", + new DirFiles($"{soupRunFolder}/Soup/Generate/*.*"), new Dir( - @"Soup.Cpp", - new DirFiles(System.IO.Path.Combine(soupExtensionCppBinFolder, "*.*"))), - new Dir( - @"Soup.CSharp", - new DirFiles(System.IO.Path.Combine(soupExtensionCSharpBinFolder, "*.*"))))), - new Dir( - @"PackageManager", - new DirFiles(System.IO.Path.Combine(soupBinPackageManagerFolder, "*.*")), + @"Extensions", + new Dir( + @"Soup.Cpp", + new DirFiles($"{soupRunFolder}/Soup/Generate/Extensions/Soup.Cpp/*.*")), + new Dir( + @"Soup.CSharp", + new DirFiles($"{soupRunFolder}/Soup/Generate/Extensions/Soup.CSharp/*.*")))), new Dir( - @"runtimes", - new Dir( - @"win-arm64\native", - new DirFiles(System.IO.Path.Combine(soupBinPackageManagerFolder, @"runtimes\win-arm64\native\", "*.*"))), - new Dir( - @"win-x64\native", - new DirFiles(System.IO.Path.Combine(soupBinPackageManagerFolder, @"runtimes\win-x64\native\", "*.*"))), + @"PackageManager", + new DirFiles($"{soupRunFolder}/Soup/PackageManager/*.*"), new Dir( - @"win-x86\native", - new DirFiles(System.IO.Path.Combine(soupBinPackageManagerFolder, @"runtimes\win-x86\native\", "*.*"))))), + @"runtimes", + new Dir( + @"win-arm64\native", + new DirFiles($"{soupRunFolder}/Soup/PackageManager/runtimes/win-arm64/native/*.*")), + new Dir( + @"win-x64\native", + new DirFiles($"{soupRunFolder}/Soup/PackageManager/runtimes/win-x64/native/*.*")), + new Dir( + @"win-x86\native", + new DirFiles($"{soupRunFolder}/Soup/PackageManager/runtimes/win-x86/native/*.*"))))), new Dir( @"Swhere", - new DirFiles(System.IO.Path.Combine(soupBinSwhereFolder, "*.*")))), + new DirFiles($"{soupRunFolder}/Swhere/*.*"))), new EnvironmentVariable("PATH", "[INSTALLDIR]") { System = true, @@ -69,7 +65,7 @@ static public void Main() }; // Upgrade values - project.Version = new Version(0, 16, 0); + project.Version = new Version(0, 16, 2); Compiler.BuildMsi(project); } diff --git a/Source/Installer/SoupInstaller/SoupInstaller.csproj b/Source/Installer/SoupInstaller/SoupInstaller.csproj index ceaf2c3f5..50ce1c93a 100644 --- a/Source/Installer/SoupInstaller/SoupInstaller.csproj +++ b/Source/Installer/SoupInstaller/SoupInstaller.csproj @@ -38,12 +38,6 @@ false - - ..\packages\WixSharp.bin.1.14.8\lib\BootstrapperCore.dll - - - ..\packages\WixSharp.bin.1.14.8\lib\Microsoft.Deployment.WindowsInstaller.dll - @@ -51,33 +45,17 @@ - - ..\packages\WixSharp.bin.1.14.8\lib\WixSharp.dll - - - ..\packages\WixSharp.bin.1.14.8\lib\WixSharp.Msi.dll - - - ..\packages\WixSharp.bin.1.14.8\lib\WixSharp.UI.dll - - + + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/Source/Installer/SoupInstaller/packages.config b/Source/Installer/SoupInstaller/packages.config deleted file mode 100644 index 40fa389e9..000000000 --- a/Source/Installer/SoupInstaller/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file