Fixed ilmerge dependency on wrong .net version

Now signing published distributions
mrsharpoblunto · Dec 23, 2023 · 14df1f6 · 14df1f6
1 parent 56834d4
commit 14df1f6
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 6 deletions.
diff --git a/Matchstick/build/build.cake b/Matchstick/build/build.cake
@@ -98,8 +98,41 @@ Task("Clean").Does(() => {
 	}
 });
 
+Task("Sign")
+	.IsDependentOn("BuildX64")
+	.Does(() => {
+    var files = GetFiles($@"../bin/x64/{buildConfiguration}/*.exe");
+    files.Add(GetFiles($@"../vendor/lib/x64/{buildConfiguration}/*.exe"));
+    files.Add(GetFiles($@"../src/GamesManager/GamesManager.PackageGen/bin/{buildConfiguration}/*.exe"));
+		var signSecret = Argument<string>("signsecret");
+    Sign(files, new SignToolSignSettings {
+			TimeStampUri = new Uri("http://timestamp.digicert.com"),
+			DigestAlgorithm = SignToolDigestAlgorithm.Sha256,
+			CertPath = "../straylight.cer",
+			ArgumentCustomization = args => {
+				args.Clear();
+				args.Append("sign")
+        .Append("/fd")
+        .Append("sha256")
+        .Append("/tr")
+        .Append("http://timestamp.digicert.com")
+				.Append("/f")
+				.AppendQuoted("../straylight.cer")
+        .Append("/csp")
+				.AppendQuoted("eToken Base Cryptographic Provider")
+				.Append("/k")
+				.AppendQuoted(signSecret);
+				foreach (var file in files) {
+					args.AppendQuoted(file.FullPath);
+				}
+				return args;
+       }
+    });
+});
+
 Task("Dist")
 	.IsDependentOn("Clean")
+	.IsDependentOn("Sign")	
 	.IsDependentOn("BuildX64")
 	.IsDependentOn("TestGamesManager")
 	.IsDependentOn("TestCoreX64")
@@ -116,6 +149,7 @@ Task("Dist")
 		CopyDirectory($@"../content/resources", "../dist/tmp/x64/resources");
 		DeleteFiles(GetFiles("../dist/tmp/**/core.tests.exe"));
 		DeleteFiles(GetFiles("../dist/tmp/**/*.vshost.exe"));
+
 		Zip("../dist/tmp/x64", $@"../dist/SDK/MGDF_{buildNumber}_x64.zip");
 		CopyFile($@"../dist/SDK/MGDF_{buildNumber}_x64.zip", $@"../dist/MGDF_{buildNumber}_x64.zip");
 		DeleteDirectory("../dist/tmp", new DeleteDirectorySettings() { 

diff --git a/...stick/src/GamesManager/GamesManager.FrameworkUpdater/GamesManager.FrameworkUpdater.csproj b/...stick/src/GamesManager/GamesManager.FrameworkUpdater/GamesManager.FrameworkUpdater.csproj
@@ -145,7 +145,7 @@
       <Output ItemName="AssembliesToMerge" TaskParameter="Include" />
     </CreateItem>
     <PropertyGroup>
-      <ReferenceAssemblies>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6</ReferenceAssemblies>
+      <ReferenceAssemblies>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8</ReferenceAssemblies>
     </PropertyGroup>
     <Message Importance="high" Text="Executing ILMerge with target platform from $(ReferenceAssemblies)" />
     <Exec Condition="'$(Configuration)'=='Debug'" Command="&quot;$(MSBuildProjectPath)..\..\..\packages\ILRepack.2.0.15\tools\ILRepack.exe&quot; /out:@(MainAssembly) /targetplatform:v4,&quot;$(ReferenceAssemblies)&quot; /keyfile:$(AssemblyOriginatorKeyFile) &quot;@(IntermediateAssembly)&quot; @(AssembliesToMerge->'&quot;%(FullPath)&quot;', ' ')" />

diff --git a/Matchstick/src/GamesManager/GamesManager.PackageGen/GamesManager.PackageGen.csproj b/Matchstick/src/GamesManager/GamesManager.PackageGen/GamesManager.PackageGen.csproj
@@ -138,7 +138,7 @@
       <Output ItemName="AssembliesToMerge" TaskParameter="Include" />
     </CreateItem>
     <PropertyGroup>
-      <ReferenceAssemblies>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6</ReferenceAssemblies>
+      <ReferenceAssemblies>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8</ReferenceAssemblies>
     </PropertyGroup>
     <Message Importance="high" Text="Executing ILMerge with target platform from $(ReferenceAssemblies)" />
     <Exec Condition="'$(Configuration)'=='Debug'" Command="&quot;$(MSBuildProjectPath)..\..\..\packages\ILRepack.2.0.15\tools\ILRepack.exe&quot; /out:@(MainAssembly) /targetplatform:v4,&quot;$(ReferenceAssemblies)&quot; /keyfile:$(AssemblyOriginatorKeyFile) &quot;@(IntermediateAssembly)&quot; @(AssembliesToMerge->'&quot;%(FullPath)&quot;', ' ')" />

diff --git a/Matchstick/src/GamesManager/GamesManager/GamesManager.csproj b/Matchstick/src/GamesManager/GamesManager/GamesManager.csproj
@@ -251,7 +251,7 @@
       <Output ItemName="AssembliesToMerge" TaskParameter="Include" />
     </CreateItem>
     <PropertyGroup>
-      <ReferenceAssemblies>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6</ReferenceAssemblies>
+      <ReferenceAssemblies>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8</ReferenceAssemblies>
     </PropertyGroup>
     <Message Importance="high" Text="Executing ILMerge with target platform from $(ReferenceAssemblies)" />
     <Exec Condition="'$(Configuration)'=='Debug'" Command="&quot;$(MSBuildProjectPath)..\..\..\packages\ILRepack.2.0.15\tools\ILRepack.exe&quot; /out:@(MainAssembly) /targetplatform:v4,&quot;$(ReferenceAssemblies)&quot; /keyfile:$(AssemblyOriginatorKeyFile) &quot;@(IntermediateAssembly)&quot; @(AssembliesToMerge->'&quot;%(FullPath)&quot;', ' ')" />

diff --git a/Matchstick/src/GamesManager/solutionInfo.cs b/Matchstick/src/GamesManager/solutionInfo.cs
@@ -7,5 +7,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("0.16.2")]
-[assembly: AssemblyFileVersion("0.16.2")]
+[assembly: AssemblyVersion("0.16.3")]
+[assembly: AssemblyFileVersion("0.16.3")]
diff --git a/Matchstick/src/core/common/MGDFVersionInfo.cpp b/Matchstick/src/core/common/MGDFVersionInfo.cpp
@@ -10,7 +10,7 @@
 namespace MGDF {
 namespace core {
 
-constexpr char _mgdfVersion[] = "0.16.2";
+constexpr char _mgdfVersion[] = "0.16.3";
 
 const char *MGDFVersionInfo::MGDF_VERSION() { return _mgdfVersion; }
 

diff --git a/Matchstick/straylight.cer b/Matchstick/straylight.cer