Merge branch 'main' into microwin-2025-preparation

ChrisTitusTech · Dec 6, 2024 · aa71783 · aa71783
2 parents 40c7a1b + 1d0e3bf
commit aa71783
Show file tree

Hide file tree

Showing 38 changed files with 818 additions and 1,782 deletions.
diff --git a/.github/workflows/issue-slash-commands.yaml b/.github/workflows/issue-slash-commands.yaml
@@ -28,7 +28,7 @@ jobs:
           else
             echo "label_command=false" >> $GITHUB_ENV
           fi
-      
+
       - name: Check for /unlabel command
         id: check_unlabel_command
         run: |
@@ -86,7 +86,7 @@ jobs:
           else
             gh issue close $ISSUE_NUMBER --repo ${{ github.repository }}
           fi
-      
+
       - name: Reopen issue
         if: env.reopen_command == 'true'
         env:
@@ -104,12 +104,12 @@ jobs:
         run: |
           echo Labeling the issue...
           gh issue edit $ISSUE_NUMBER --repo ${{ github.repository }} --add-label "${{ env.label_name }}"
-      
+
       - name: Remove labels
         if: env.unlabel_command == 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ISSUE_NUMBER: ${{ github.event.issue.number }}
         run: |
           echo Unlabeling the issue...
-          gh issue edit $ISSUE_NUMBER --repo ${{ github.repository }} --remove-label "${{ env.unlabel_name }}"
+          gh issue edit $ISSUE_NUMBER --repo ${{ github.repository }} --remove-label "${{ env.unlabel_name }}"
diff --git a/Test-WingetInstall.ps1 b/Test-WingetInstall.ps1
@@ -0,0 +1,28 @@
+# Import the function (adjust the path according to your setup)
+. "./functions/private/Get-WinUtilWingetLatest.ps1"
+
+# Set up Information stream to be visible
+$InformationPreference = "Continue"
+
+Write-Host "Starting Winget installation test..." -ForegroundColor Cyan
+
+try {
+    # Test the function with verbose output
+    Write-Host "Attempting to run Get-WinUtilWingetLatest..." -ForegroundColor Cyan
+    Get-WinUtilWingetLatest -Verbose
+
+    # Verify Winget is working
+    if (Get-Command winget -ErrorAction SilentlyContinue) {
+        Write-Host "Success! Winget is installed and accessible." -ForegroundColor Green
+
+        # Display Winget version
+        Write-Host "`nWinget version:" -ForegroundColor Cyan
+        winget --version
+    } else {
+        Write-Host "Warning: Winget is installed but not accessible in the current session. You may need to restart your terminal." -ForegroundColor Yellow
+    }
+} catch {
+    Write-Host "Error occurred during testing: $($_.Exception.Message)" -ForegroundColor Red
+    Write-Host "Stack Trace:" -ForegroundColor Red
+    $_.ScriptStackTrace
+}
diff --git a/config/applications.json b/config/applications.json
@@ -439,6 +439,14 @@
         "link": "https://dotnet.microsoft.com/download/dotnet/8.0",
         "winget": "Microsoft.DotNet.DesktopRuntime.8"
     },
+    "dotnet9": {
+        "category": "Microsoft Tools",
+        "choco": "dotnet-9.0-runtime",
+        "content": ".NET Desktop Runtime 9",
+        "description": ".NET Desktop Runtime 9 is a runtime environment required for running applications developed with .NET 9.",
+        "link": "https://dotnet.microsoft.com/download/dotnet/9.0",
+        "winget": "Microsoft.DotNet.DesktopRuntime.9"
+    },
     "dmt": {
         "winget": "GNE.DualMonitorTools",
         "choco": "dual-monitor-tools",

diff --git a/config/themes.json b/config/themes.json
@@ -2,12 +2,12 @@
     "shared":{
         "CustomDialogFontSize":       "12",
         "CustomDialogFontSizeHeader": "14",
-        "CustomDialogIconSize":       "25",
+        "CustomDialogLogoSize":       "25",
         "CustomDialogWidth":          "400",
         "CustomDialogHeight":         "200",
         "FontSize":         "12",
         "FontFamily":       "Arial",
-        "FontSizeHeading":  "16",
+        "HeadingFontSize":  "16",
         "HeaderFontFamily": "Consolas, Monaco",
         "CheckBoxBulletDecoratorSize": "14",
         "CheckBoxMargin": "15,0,0,2",
@@ -27,7 +27,7 @@
         "ButtonFontFamily": "Arial",
         "ButtonWidth":      "200",
         "ButtonHeight":     "25",
-        "ConfigTabButtonFontSize":      "16",
+        "ConfigUpdateButtonFontSize":   "14",
         "SearchBarWidth":               "200",
         "SearchBarHeight":              "26",
         "SearchBarTextBoxFontSize":     "12",
@@ -44,7 +44,7 @@
         "MainForegroundColor":  "#232629",
         "MainBackgroundColor":  "#F7F7F7",
         "LabelBackgroundColor":  "#F7F7F7",
-        "LinkForegroundColor":  "#232629",
+        "LinkForegroundColor":  "#484848",
         "LinkHoverForegroundColor":  "#232629",
         "ScrollBarBackgroundColor": "#4A4D52",
         "ScrollBarHoverColor": "#5A5D62",