Random cleanup (#134)

* Random cleanup * Fix swhere properties * Bump version Co-authored-by: Matthew Asplund <[email protected]>
soup-build · Sep 16, 2022 · 6c06719 · 6c06719
1 parent 86864ff
commit 6c06719
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 69 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Matthew Asplund
+Copyright (c) 2022 Matthew Asplund
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Scripts/SignRuntime.cmd b/Scripts/SignRuntime.cmd
@@ -6,13 +6,11 @@ SET RunDir=%OutDir%\run
 
 SET CertPath=%1
 
+signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\*.exe
 signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\*.dll
 signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\*.exe
+signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\Extensions\Soup.Cpp\0.3.0\*.dll
+signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\Extensions\Soup.CSharp\0.6.0\*.dll
 signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\Generate\*.dll
 signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\Generate\*.exe
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\Generate\Extensions\Soup.Cpp\0.2.2\*.dll
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\Generate\Extensions\Soup.CSharp\0.5.1\*.dll
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\PackageManager\*.dll
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\PackageManager\*.exe
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Swhere\*.dll
-signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Swhere\*.exe
+signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f %CertPath%  %RunDir%\Soup\PackageManager\*.exe
diff --git a/Scripts/build.cmd b/Scripts/build.cmd
@@ -10,7 +10,7 @@ SET PackageManagerDir=%SourceDir%\GenerateSharp\PackageManager
 SET GenerateDir=%SourceDir%\GenerateSharp\Generate
 if %Flavor% == release (SET OutputX64DirectorPath=txTMowfPh1V3rPmbvNBmBW9Z8Jg) else (SET OutputX64DirectorPath=J3mu4cpISw6nDaCPED8gkqZ-q84)
 if %Flavor% == release (SET OutputX86DirectorPath=ci_UJP5zJKyF-O0VVSVDMNi1Wwg) else (SET OutputX86DirectorPath=9fr4dmE4CrAXgS2yFzcvYJXkGDg)
-SET ClientCLIOutputDirectory=%OutputDir%\C++\Soup\0.20.0\%OutputX64DirectorPath%
+SET ClientCLIOutputDirectory=%OutputDir%\C++\Soup\0.20.1\%OutputX64DirectorPath%
 SET MonitorClientOutputX64Directory=%OutputDir%\C++\Monitor.Client\1.0.0\%OutputX64DirectorPath%
 SET MonitorClientOutputX86Directory=%OutputDir%\C++\Monitor.Client\1.0.0\%OutputX86DirectorPath%
 

diff --git a/Scripts/soup.cmd b/Scripts/soup.cmd
@@ -5,7 +5,7 @@ SET OutDir=%RootDir%\out
 SET RunDir=%OutDir%\run
 REM - Use a copy of the final binary in case we are re-buiding itself
 robocopy %ScriptsDir%\Install\ %RunDir%\ /MIR /NJH /NJS /NDL > NUL
-robocopy %OutDir%\C++\Soup\0.20.0\txTMowfPh1V3rPmbvNBmBW9Z8Jg\bin\ %RunDir%\Soup\ /MIR /NJH /NJS /NDL > NUL
+robocopy %OutDir%\C++\Soup\0.20.1\txTMowfPh1V3rPmbvNBmBW9Z8Jg\bin\ %RunDir%\Soup\ /MIR /NJH /NJS /NDL > NUL
 robocopy %OutDir%\msbuild\bin\Soup.Build.Generate\Release\net6.0\win-x64\publish\ %RunDir%\Soup\Generate\ /MIR /NJH /NJS /NDL > NUL
 robocopy C:\Users\mwasp\.soup\out\C#\Soup.Cpp\0.3.0\txTMowfPh1V3rPmbvNBmBW9Z8Jg\bin\ %RunDir%\Soup\Extensions\Soup.Cpp\0.3.0\ /MIR /NJH /NJS /NDL > NUL
 robocopy C:\Users\mwasp\.soup\out\C#\Soup.CSharp\0.6.0\txTMowfPh1V3rPmbvNBmBW9Z8Jg\bin\ %RunDir%\Soup\Extensions\Soup.CSharp\0.6.0\ /MIR /NJH /NJS /NDL > NUL

diff --git a/Scripts/soupd.cmd b/Scripts/soupd.cmd
@@ -5,7 +5,7 @@ SET OutDir=%RootDir%\out
 SET RunDir=%OutDir%\run
 REM - Use a copy of the final binary in case we are re-buiding itself
 robocopy %ScriptsDir%\Install\ %RunDir%\ /MIR /NJH /NJS /NDL > NUL
-robocopy %OutDir%\C++\Soup\0.20.0\J3mu4cpISw6nDaCPED8gkqZ-q84\bin\ %RunDir%\Soup\ /MIR /NJH /NJS /NDL > NUL
+robocopy %OutDir%\C++\Soup\0.20.1\J3mu4cpISw6nDaCPED8gkqZ-q84\bin\ %RunDir%\Soup\ /MIR /NJH /NJS /NDL > NUL
 robocopy %OutDir%\msbuild\bin\Soup.Build.Generate\Debug\net6.0\win-x64\publish\ %RunDir%\Soup\Generate\ /MIR /NJH /NJS /NDL > NUL
 robocopy C:\Users\mwasp\.soup\out\C#\Soup.Cpp\0.3.0\J3mu4cpISw6nDaCPED8gkqZ-q84\bin\ %RunDir%\Soup\Extensions\Soup.Cpp\0.3.0\ /MIR /NJH /NJS /NDL > NUL
 robocopy C:\Users\mwasp\.soup\out\C#\Soup.CSharp\0.6.0\J3mu4cpISw6nDaCPED8gkqZ-q84\bin\ %RunDir%\Soup\Extensions\Soup.CSharp\0.6.0\ /MIR /NJH /NJS /NDL > NUL

diff --git a/Source/Client/CLI/Recipe.sml b/Source/Client/CLI/Recipe.sml
@@ -1,5 +1,5 @@
 Name: "Soup"
-Version: "0.20.0"
+Version: "0.20.1"
 Language: "C++|0.1"
 
 Type: "Executable"

diff --git 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.20.0");
+			Log::HighPriority("0.20.1");
 		}
 
 	private:

diff --git a/Source/GenerateSharp/PackageManager/Soup.Build.PackageManager.csproj b/Source/GenerateSharp/PackageManager/Soup.Build.PackageManager.csproj
@@ -9,7 +9,7 @@
 		<PublishTrimmed>false</PublishTrimmed>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Identity.Client" Version="4.46.1" />
+		<PackageReference Include="Microsoft.Identity.Client" Version="4.46.2" />
 		<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="6.0.0" />
 	</ItemGroup>
 	<ItemGroup>

diff --git a/Source/GenerateSharp/Swhere/Swhere.csproj b/Source/GenerateSharp/Swhere/Swhere.csproj
@@ -2,11 +2,6 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net6.0</TargetFramework>
-		<PublishSingleFile>true</PublishSingleFile>
-		<SelfContained>true</SelfContained>
-		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
-		<PublishReadyToRun>true</PublishReadyToRun>
-		<PublishTrimmed>true</PublishTrimmed>
 	</PropertyGroup>
 	<ItemGroup>
 		<TrimmableAssembly Include="Antlr4.Runtime.Standard" />

diff --git a/Source/GenerateSharp/Utilities/LocalUserConfig/SDKConfig.cs b/Source/GenerateSharp/Utilities/LocalUserConfig/SDKConfig.cs
@@ -221,43 +221,10 @@ public void SetProperties(IDictionary<string, string> value)
 			}
 
 			// Add the new syntax to the parent table syntax
-			// values.();
-			////switch (values.MirrorSyntax)
-			////{
-			////	case InlineTableSyntax tableSyntax:
-			////		// Replace all items
-			////		while (tableSyntax.Items.ChildrenCount > 0)
-			////			tableSyntax.Items.RemoveChildAt(0);
-
-			////		var index = 0;
-			////		foreach (var item in value)
-			////		{
-			////			bool isLastItem = index == value.Keys.Count - 1;
-			////			var equalToken = SyntaxFactory.Token(TokenKind.Equal);
-			////			equalToken.AddLeadingWhitespace();
-			////			equalToken.AddTrailingWhitespace();
-			////			var newKeyValue = new KeyValueSyntax()
-			////			{
-			////				Key = new KeySyntax(item.Key),
-			////				EqualToken = equalToken,
-			////				Value = new StringValueSyntax(item.Value),
-			////			};
-			////			var newInlineTableItem = new InlineTableItemSyntax(newKeyValue)
-			////			{
-			////			};
-			////			if (!isLastItem)
-			////			{
-			////				newInlineTableItem.Comma = SyntaxFactory.Token(TokenKind.Comma);
-			////			}
-
-			////			// newInlineTableItem.LeadingTrivia = new List<SyntaxTrivia>() { SyntaxFactory.Whitespace() };
-			////			tableSyntax.Items.Add(newInlineTableItem);
-			////			index++;
-			////		}
-			////		break;
-			////	default:
-			////		throw new InvalidOperationException("Unknown Syntax on ValueList");
-			////}
+			foreach (var item in value)
+			{
+				values.GetValue().Add(item.Key, new SMLValue(item.Value));
+			}
 		}
 
 		/// <summary>

diff --git a/Source/Installer/SoupInstaller/Setup.cs b/Source/Installer/SoupInstaller/Setup.cs
@@ -55,7 +55,7 @@ static public void Main()
 		};
 
 		// Upgrade values
-		project.Version = new Version(0, 20, 0);
+		project.Version = new Version(0, 20, 1);
 
 		Compiler.BuildMsi(project);
 	}

diff --git a/Source/Monitor/Client/PackageLock.sml b/Source/Monitor/Client/PackageLock.sml
@@ -1,16 +1,35 @@
 Version: 2
 Closures: {
-	Root: {
-		C++: [
-			{ Name: "Monitor.Client", Version: "../Client", Build: "Build0", }
-			{ Name: "Detours", Version: "4.0.4", Build: "Build0", }
-			{ Name: "Monitor.Shared", Version: "../Shared/", Build: "Build0", }
-			{ Name: "Opal", Version: "0.4.1", Build: "Build0", }
-		]
-	}
-	Build0: {
-		C#: [
-			{ Name: "C++", Version: "0.1.0", }
-		]
-	}
+Root: {
+C++: [
+{
+Name: "Detours"
+Version: "4.0.4"
+Build: "Build0"
+}
+{
+Name: "Monitor.Client"
+Version: "../Client"
+Build: "Build0"
+}
+{
+Name: "Monitor.Shared"
+Version: "../Shared/"
+Build: "Build0"
+}
+{
+Name: "Opal"
+Version: "0.5.0"
+Build: "Build0"
+}
+]
+}
+Build0: {
+C#: [
+{
+Name: "C++"
+Version: "0.1.0"
+}
+]
+}
 }