Fixed ASP.NET Core files and signing.

jexuswebserver · Aug 6, 2024 · ecc56b5 · ecc56b5
1 parent 75396a9
commit ecc56b5
Show file tree

Hide file tree

Showing 9 changed files with 37,095 additions and 6,761 deletions.
diff --git a/JexusManager/Properties/Resources.resx b/JexusManager/Properties/Resources.resx
@@ -266,6 +266,12 @@
     <value>..\Resources\6.0-release.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="7.0-release" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\6.0-release.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\7.0-release.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="8.0-release" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\8.0-release.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="9.0-release" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\9.0-release.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>
diff --git a/JexusManager/Resources/6.0-release.json b/JexusManager/Resources/6.0-release.json
diff --git a/JexusManager/Resources/7.0-release.json b/JexusManager/Resources/7.0-release.json
diff --git a/JexusManager/Resources/8.0-release.json b/JexusManager/Resources/8.0-release.json
diff --git a/JexusManager/Resources/9.0-release.json b/JexusManager/Resources/9.0-release.json
diff --git a/JexusManager/Resources/releases-index.json b/JexusManager/Resources/releases-index.json
@@ -1,43 +1,61 @@
 {
+    "$schema": "https://json.schemastore.org/dotnet-releases-index.json",
     "releases-index": [
-      {
-            "channel-version": "8.0",
-            "latest-release": "8.0.0-preview.4",
-            "latest-release-date": "2023-05-16",
+        {
+            "channel-version": "9.0",
+            "latest-release": "9.0.0-preview.6",
+            "latest-release-date": "2024-07-09",
             "security": false,
-            "latest-runtime": "8.0.0-preview.4.23259.5",
-            "latest-sdk": "8.0.100-preview.4.23260.5",
+            "latest-runtime": "9.0.0-preview.6.24327.7",
+            "latest-sdk": "9.0.100-preview.6.24328.19",
             "product": ".NET",
-            "release-type" : "lts",
             "support-phase": "preview",
-            "eol-date": null,
-            "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/8.0/releases.json"
+            "eol-date": "2026-05-11",
+            "release-type": "sts",
+            "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/9.0/releases.json",
+            "supported-os.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/9.0/supported-os.json"
         },
-          {
-            "channel-version": "7.0",
-            "latest-release": "7.0.5",
-            "latest-release-date": "2023-05-16",
+        {
+            "channel-version": "8.0",
+            "latest-release": "8.0.7",
+            "latest-release-date": "2024-07-09",
             "security": true,
-            "latest-runtime": "7.0.5",
-            "latest-sdk": "7.0.302",
+            "latest-runtime": "8.0.7",
+            "latest-sdk": "8.0.303",
             "product": ".NET",
-            "release-type" : "sts",
             "support-phase": "active",
-            "eol-date": "2024-05-24",
-            "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/7.0/releases.json"
+            "eol-date": "2026-11-10",
+            "release-type": "lts",
+            "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/8.0/releases.json",
+            "supported-os.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/8.0/supported-os.json"
+        },
+        {
+            "channel-version": "7.0",
+            "latest-release": "7.0.20",
+            "latest-release-date": "2024-05-28",
+            "security": true,
+            "latest-runtime": "7.0.20",
+            "latest-sdk": "7.0.410",
+            "product": ".NET",
+            "support-phase": "eol",
+            "eol-date": "2024-05-14",
+            "release-type": "sts",
+            "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/7.0/releases.json",
+            "supported-os.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/7.0/supported-os.json"
         },
         {
             "channel-version": "6.0",
-            "latest-release": "6.0.16",
-            "latest-release-date": "2023-04-11",
+            "latest-release": "6.0.32",
+            "latest-release-date": "2024-07-09",
             "security": true,
-            "latest-runtime": "6.0.16",
-            "latest-sdk": "6.0.408",
+            "latest-runtime": "6.0.32",
+            "latest-sdk": "6.0.424",
             "product": ".NET",
-            "release-type" : "lts",
-            "support-phase": "active",
+            "support-phase": "maintenance",
             "eol-date": "2024-11-12",
-            "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"
+            "release-type": "lts",
+            "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json",
+            "supported-os.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/6.0/supported-os.json"
         },
         {
             "channel-version": "5.0",
@@ -47,9 +65,9 @@
             "latest-runtime": "5.0.17",
             "latest-sdk": "5.0.408",
             "product": ".NET",
-            "release-type" : "sts",
+            "release-type": "sts",
             "support-phase": "eol",
-            "eol-date":"2022-05-10",
+            "eol-date": "2022-05-10",
             "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/5.0/releases.json"
         },
         {
@@ -60,7 +78,7 @@
             "latest-runtime": "3.1.32",
             "latest-sdk": "3.1.426",
             "product": ".NET Core",
-            "release-type" : "lts",
+            "release-type": "lts",
             "support-phase": "eol",
             "eol-date": "2022-12-13",
             "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json"
@@ -73,7 +91,7 @@
             "latest-runtime": "3.0.3",
             "latest-sdk": "3.0.103",
             "product": ".NET Core",
-            "release-type" : "sts",
+            "release-type": "sts",
             "support-phase": "eol",
             "eol-date": "2020-03-03",
             "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json"
@@ -86,7 +104,7 @@
             "latest-runtime": "2.1.30",
             "latest-sdk": "2.1.818",
             "product": ".NET Core",
-            "release-type" : "lts",
+            "release-type": "lts",
             "support-phase": "eol",
             "eol-date": "2021-08-21",
             "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json"
@@ -99,20 +117,20 @@
             "latest-runtime": "2.2.8",
             "latest-sdk": "2.2.207",
             "product": ".NET Core",
-            "release-type" : "sts",
+            "release-type": "sts",
             "support-phase": "eol",
             "eol-date": "2019-12-23",
             "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/releases.json"
-          },
+        },
         {
             "channel-version": "2.0",
             "latest-release": "2.0.9",
-            "latest-release-date":"2018-07-10",
+            "latest-release-date": "2018-07-10",
             "security": true,
             "latest-runtime": "2.0.9",
             "latest-sdk": "2.1.202",
             "product": ".NET Core",
-            "release-type" : "sts",
+            "release-type": "sts",
             "support-phase": "eol",
             "eol-date": "2018-10-01",
             "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.0/releases.json"
@@ -125,7 +143,7 @@
             "latest-runtime": "1.1.13",
             "latest-sdk": "1.1.14",
             "product": ".NET Core",
-            "release-type" : "lts",
+            "release-type": "lts",
             "support-phase": "eol",
             "eol-date": "2019-06-27",
             "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/1.1/releases.json"
@@ -138,7 +156,7 @@
             "latest-runtime": "1.0.16",
             "latest-sdk": "1.1.14",
             "product": ".NET Core",
-            "release-type" : "lts",
+            "release-type": "lts",
             "support-phase": "eol",
             "eol-date": "2019-06-27",
             "releases.json": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/1.0/releases.json"

diff --git a/release.ps1 b/release.ps1
@@ -17,7 +17,7 @@ catch
     Write-Host "MSBuild doesn't exist. Use VSSetup instead."
 
     Install-Module VSSetup -Scope CurrentUser -Force
-    $instance = Get-VSSetupInstance -All -Prerelease | Select-VSSetupInstance -Latest
+    $instance = Get-VSSetupInstance -All -Prerelease | Select-VSSetupInstance -Product * -Latest
     $installDir = $instance.installationPath
     $msBuild = $installDir + '\MSBuild\Current\Bin\MSBuild.exe'
     if (![System.IO.File]::Exists($msBuild))

diff --git a/sign.installers.ps1 b/sign.installers.ps1
@@ -1,12 +1,15 @@
-$foundCert = Test-Certificate -Cert Cert:\CurrentUser\my\8ef9a86dfd4bd0b4db313d55c4be8b837efa7b77 -User
-if(!$foundCert)
-{
-    Write-Host "Certificate doesn't exist. Exit."
-    exit
+if ($env:CI -eq "true") {
+    exit 0
+}
+
+$cert = Get-ChildItem -Path Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1
+if ($null -eq $cert) {
+    Write-Host "No code signing certificate found in MY store. Exit."
+    exit 1
 }
 
 Write-Host "Certificate found. Sign the assemblies."
-$signtool = "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe"
+$signtool = Get-ChildItem -Path "${env:ProgramFiles(x86)}\Windows Kits" -Recurse -Filter "signtool.exe" | Select-Object -First 1 -ExpandProperty FullName
 
 Write-Host "Verify digital signature."
 $files = Get-ChildItem .\* -Include ('*.msi') -File

diff --git a/sign.ps1 b/sign.ps1
@@ -1,12 +1,15 @@
-$foundCert = Test-Certificate -Cert Cert:\CurrentUser\my\8ef9a86dfd4bd0b4db313d55c4be8b837efa7b77 -User
-if(!$foundCert)
-{
-    Write-Host "Certificate doesn't exist. Exit."
-    exit
+if ($env:CI -eq "true") {
+    exit 0
+}
+
+$cert = Get-ChildItem -Path Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1
+if ($null -eq $cert) {
+    Write-Host "No code signing certificate found in MY store. Exit."
+    exit 1
 }
 
 Write-Host "Certificate found. Sign the assemblies."
-$signtool = "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe"
+$signtool = Get-ChildItem -Path "${env:ProgramFiles(x86)}\Windows Kits" -Recurse -Filter "signtool.exe" | Select-Object -First 1 -ExpandProperty FullName
 foreach ($line in Get-Content .\sign.txt) {
     & $signtool sign /tr http://timestamp.digicert.com /td sha256 /fd sha256 /a .\bin\$line | Write-Debug
     if ($LASTEXITCODE -ne 0)