Merge branch 'main' of https://github.com/wpilibsuite/WPILibInstaller-Avalonia into cli

Author: vramaiah

WPILibInstaller-Avalonia/ViewModels/FinalPageViewModel.cs

@@ -22,6 +22,10 @@ public class FinalPageViewModel : PageViewModelBase
 
         public ReactiveCommand<Unit, Unit> OpenChangelog { get; }
 
+        public ReactiveCommand<Unit, Unit> OpenBetaSite { get; }
+
+        public ReactiveCommand<Unit, Unit> OpenBetaDocs { get; }
+
         public FinalPageViewModel(IProgramWindow progWindow, IConfigurationProvider configurationProvider, IVsCodeInstallLocationProvider vsCodeProvider,
                 ICatchableButtonFactory buttonFactory)
             : base("Finish", "")
@@ -45,6 +49,8 @@ public FinalPageViewModel(IProgramWindow progWindow, IConfigurationProvider conf
 
             OpenKnownIssues = buttonFactory.CreateCatchableButton(OpenKnownIssuesFunc);
             OpenChangelog = buttonFactory.CreateCatchableButton(OpenChangelogFunc);
+            OpenBetaDocs = buttonFactory.CreateCatchableButton(OpenBetaDocsFunc);
+            OpenBetaSite = buttonFactory.CreateCatchableButton(OpenBetaSiteFunc);
 
             this.progWindow = progWindow;
             this.configurationProvider = configurationProvider;
@@ -56,6 +62,18 @@ public Task OpenKnownIssuesFunc()
             return Task.CompletedTask;
         }
 
+        public Task OpenBetaDocsFunc()
+        {
+            OpenBrowser("https://docs.wpilib.org/en/latest/docs/beta/beta-getting-started/welcome.html");
+            return Task.CompletedTask;
+        }
+
+        public Task OpenBetaSiteFunc()
+        {
+            OpenBrowser("https://github.com/wpilibsuite/2026Beta");
+            return Task.CompletedTask;
+        }
+
         public Task OpenChangelogFunc()
         {
             string? verString = null;

WPILibInstaller-Avalonia/Views/FinalPage.xaml

@@ -10,7 +10,14 @@
     </TextBlock>
   <Button FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Content="Open Known Issues" Command="{Binding OpenKnownIssues}"></Button>
   <Button FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Content="Open Changelog" Command="{Binding OpenChangelog}"></Button>
-  <TextBlock FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding FinishText}">
+      <TextBlock FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,20,0,0">
+          Thank you for beta testing the 2026 WPILib!
+      </TextBlock>
+      <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+          <Button FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Content="Open Beta Instructions" Command="{Binding OpenBetaDocs}"></Button>
+          <Button FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Content="Open Beta Feedback Site" Command="{Binding OpenBetaSite}"></Button>
+      </StackPanel>
+      <TextBlock FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding FinishText}">
   </TextBlock>
   </StackPanel>
 

apps/MavenMetaDataFixer/build.gradle

@@ -16,6 +16,6 @@ repositories {
 }
 
 dependencies {
-  implementation 'org.apache.maven:maven-repository-metadata:3.5.4'
-  implementation 'org.apache.maven:maven-model:3.5.4'
+  implementation 'org.apache.maven:maven-repository-metadata:3.9.11'
+  implementation 'org.apache.maven:maven-model:3.9.11'
 }

build.gradle

@@ -11,7 +11,7 @@ buildscript {
 plugins {
     id 'java'
     id 'cpp'
-    id "de.undercouch.download" version "4.1.2" apply false
+    id "de.undercouch.download" version "5.6.0" apply false
     id "com.github.johnrengelman.shadow" version "7.1.2" apply false
 }
 

gradle.properties

@@ -1 +1 @@
-gradleRioVersion: 2025.3.2
+gradleRioVersion: 2026.0.0-alpha-1

scripts/maven.gradle

@@ -280,7 +280,7 @@ ext.mavenZipSetup = { AbstractArchiveTask zip->
   }
 
   zip.from(project.zipTree(downloadReadTheDocs.get().outputFiles.first())) {
-    into '/documentation/rtd'
+    into '/documentation'
   }
 
   zip.from(project.zipTree(downloadPythonAPI.get().outputFiles.first())) {

scripts/versions.gradle

@@ -1,18 +1,19 @@
-ext.vsCodeVersion = '1.96.2'
+ext.vsCodeVersion = '1.105.1'
 
-ext.vscodeLinuxHash = '2681040089faf143bed37246f2b0bc0787f6d342d878b1ec4b3737b38833c088'
-ext.vscodeMacHash = '28159393558c4065e72b3c61ff8e0b8c74f3d2060ec5f046a91122aa8819c232'
-ext.vscodeWindowsHash = 'c6c2f97e5cb25a8b576b345f6b8f2021cc168f1726ee370f29d1dbd136ffe9f8'
-ext.vscodeLinuxArm64Hash = '33e93e2899f7a9c20d882d07b157d5fde6f1419f21c6bb95cd676d7a0412690e'
+ext.vscodeLinuxHash = '32a650f1a111df00354ad9571f57d12268376777677dd5af2162ead921067a89'
+ext.vscodeMacHash = '7adfbeb55ef3c2da0afae5d25fe6aaf4fd79cf66b4f781d81bd20b88837938fe'
+ext.vscodeWindowsHash = '18ff74b3b4bdc6763e27ba296d359b3332f9a6c1f5cf67aaa9189ed12698b06d'
+ext.vscodeLinuxArm64Hash = '4579e52664fe2df2d80724b420abab1827d30520f0e766f7608403dba2fe94bd'
 
-ext.cppToolsVersion = '1.23.2'
+ext.cppToolsVersion = '1.28.3'
 ext.javaExtVersion = '1.38.0'
-ext.javaDebugVersion = '0.58.1'
+ext.javaExtPatchVersion = '403'
+ext.javaDebugVersion = '0.58.2'
 ext.javaDependencyVersion = '0.24.1'
 ext.pythonExtVersion = '2024.22.1'
 ext.pylanceVersion = '2024.12.1'
 ext.isortVersion = '2023.10.1'
-ext.blackVersion = '2024.4.0'
+ext.blackVersion = '2025.2.0'
 
 ext.wpilibVersion = gradleRioVersion
 
@@ -21,7 +22,7 @@ ext.toolchainGitTag = 'v2025-1'
 
 ext.jdkVersion = '17.0.16+8'
 
-ext.advantagescopeGitTag = 'v4.1.5'
+ext.advantagescopeGitTag = 'v26.0.0-beta-1'
 
 ext.elasticGitTag = 'v2026.0.0-beta-1'
 

scripts/vscode.gradle

@@ -15,15 +15,15 @@ def vscodeLinuxArm64Url = "https://update.code.visualstudio.com/${vsCodeVersion}
 
 def vscodeMacUrl = "https://update.code.visualstudio.com/${vsCodeVersion}/darwin-universal/stable".toString()
 
-def cppWindowsUrl = "https://frcmaven.wpi.edu/api/download/vscode-extensions/ms-vscode/cpptools/ms-vscode.cpptools-${cppToolsVersion}@win32-x64.vsix"
+def cppWindowsUrl = "https://github.com/microsoft/vscode-cpptools/releases/download/v${cppToolsVersion}/cpptools-windows-x64.vsix"
 
-def cppMacUrl = "https://frcmaven.wpi.edu/api/download/vscode-extensions/ms-vscode/cpptools/ms-vscode.cpptools-${cppToolsVersion}@darwin-x64.vsix"
+def cppMacUrl = "https://github.com/microsoft/vscode-cpptools/releases/download/v${cppToolsVersion}/cpptools-macOS-x64.vsix"
 
-def cppMacArmUrl = "https://frcmaven.wpi.edu/api/download/vscode-extensions/ms-vscode/cpptools/ms-vscode.cpptools-${cppToolsVersion}@darwin-arm64.vsix"
+def cppMacArmUrl = "https://github.com/microsoft/vscode-cpptools/releases/download/v${cppToolsVersion}/cpptools-macOS-arm64.vsix"
 
-def cppLinuxUrl = "https://frcmaven.wpi.edu/api/download/vscode-extensions/ms-vscode/cpptools/ms-vscode.cpptools-${cppToolsVersion}@linux-x64.vsix"
+def cppLinuxUrl = "https://github.com/microsoft/vscode-cpptools/releases/download/v${cppToolsVersion}/cpptools-linux-x64.vsix"
 
-def cppLinuxArm64Url = "https://frcmaven.wpi.edu/api/download/vscode-extensions/ms-vscode/cpptools/ms-vscode.cpptools-${cppToolsVersion}@linux-arm64.vsix"
+def cppLinuxArm64Url = "https://github.com/microsoft/vscode-cpptools/releases/download/v${cppToolsVersion}/cpptools-linux-arm64.vsix"
 
 def pythonWindowsUrl = "https://frcmaven.wpi.edu/api/download/vscode-extensions/ms-python/python/ms-python.python-${pythonExtVersion}@win32-x64.vsix"
 
@@ -37,9 +37,9 @@ def pythonLinuxArm64Url = "https://frcmaven.wpi.edu/api/download/vscode-extensio
 
 def pylanceUrl = "https://frcmaven.wpi.edu/artifactory/vscode-extensions/ms-python/vscode-pylance/ms-python.vscode-pylance-${pylanceVersion}.vsix"
 
-def isortUrl = "https://frcmaven.wpi.edu/artifactory/vscode-extensions/ms-python/isort/ms-python.isort-${isortVersion}.vsix"
+def isortUrl = "https://open-vsx.org/api/ms-python/isort/${isortVersion}/file/ms-python.isort-${isortVersion}.vsix"
 
-def blackUrl = "https://frcmaven.wpi.edu/artifactory/vscode-extensions/ms-python/black-formatter/ms-python.black-formatter-${blackVersion}.vsix"
+def blackUrl = "https://open-vsx.org/api/ms-python/black-formatter/${blackVersion}/file/ms-python.black-formatter-${blackVersion}.vsix"
 
 def wpilibExtensionUrl = "https://github.com/wpilibsuite/vscode-wpilib/releases/download/v${wpilibVersion}/vscode-wpilib-${wpilibVersion}.vsix"
 
@@ -49,11 +49,11 @@ def wpilibUtilLinuxUrl = "https://github.com/wpilibsuite/vscode-wpilib/releases/
 
 def wpilibUtilMacUrl = "https://github.com/wpilibsuite/vscode-wpilib/releases/download/v${wpilibVersion}/wpilibutility-mac.tar.gz"
 
-def javaDebugUrl = "https://frcmaven.wpi.edu/api/download/vscode-extensions/vscjava/vscode-java-debug/vscjava.vscode-java-debug-${javaDebugVersion}.vsix"
+def javaDebugUrl = "https://open-vsx.org/api/vscjava/vscode-java-debug/${javaDebugVersion}/file/vscjava.vscode-java-debug-${javaDebugVersion}.vsix"
 
-def javaLangUrl = "https://frcmaven.wpi.edu/api/download/vscode-extensions/redhat/java/redhat.java-${javaExtVersion}.vsix"
+def javaLangUrl = "https://github.com/redhat-developer/vscode-java/releases/download/v${javaExtVersion}/vscode-java-${javaExtVersion}-${javaExtPatchVersion}.vsix"
 
-def javaDepUrl = "https://frcmaven.wpi.edu/api/download/vscode-extensions/vscjava/vscode-java-dependency/vscjava.vscode-java-dependency-${javaDependencyVersion}.vsix"
+def javaDepUrl = "https://open-vsx.org/api/vscjava/vscode-java-dependency/${javaDependencyVersion}/file/vscjava.vscode-java-dependency-${javaDependencyVersion}.vsix"
 
 def vscodeWindowsDownload = tasks.register("vscodeWindowsDownload", Download) {
   src vscodeWindowsUrl