Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": true,
"currentLanguage": "cpp",
"projectYear": "2025",
"projectYear": "2026beta",
"teamNumber": -1
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": true,
"currentLanguage": "cpp",
"projectYear": "2025",
"projectYear": "2026beta",
"teamNumber": -1
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": true,
"currentLanguage": "cpp",
"projectYear": "2025",
"projectYear": "2026beta",
"teamNumber": -1
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": true,
"currentLanguage": "cpp",
"projectYear": "2025",
"projectYear": "2026beta",
"teamNumber": -1
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": true,
"currentLanguage": "cpp",
"projectYear": "2025",
"projectYear": "2026beta",
"teamNumber": -1
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": false,
"currentLanguage": "java",
"projectYear": "2025",
"projectYear": "2026beta",
"teamNumber": -1
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": false,
"currentLanguage": "java",
"projectYear": "2025",
"projectYear": "2026beta",
"teamNumber": -1
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": false,
"currentLanguage": "java",
"projectYear": "2025",
"projectYear": "2026beta",
"teamNumber": -1
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": false,
"currentLanguage": "java",
"projectYear": "2025",
"projectYear": "2026beta",
"teamNumber": -1
}
2 changes: 1 addition & 1 deletion vscode-wpilib/resources/gradle/shared/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
String frcYear = '2025'
String frcYear = '2026'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')
Expand Down
6 changes: 3 additions & 3 deletions vscode-wpilib/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -258,17 +258,17 @@ async function handleAfterTrusted(
continue;
}

if (prefs.getProjectYear() !== '2025') {
if (prefs.getProjectYear() !== '2026beta') {
const importPersistantState = new PersistentFolderState(
'wpilib.2025persist',
'wpilib.2026betapersist',
false,
w.uri.fsPath
);
if (importPersistantState.Value === false) {
const upgradeResult = await vscode.window.showInformationMessage(
i18n(
'message',
'This project is not compatible with this version of the extension. Would you like to import this project into 2025?'
'This project is not compatible with this version of the extension. Would you like to import this project into 2026 beta?'
),
{
modal: true,
Expand Down
2 changes: 1 addition & 1 deletion vscode-wpilib/src/shared/utilitiesapi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export class UtilitiesAPI implements IUtilitiesAPI {
private wpilibHome: string | undefined;

public getFrcYear(): string {
return '2025';
return '2026beta';
}
public getWPILibHomeDir(): string {
if (this.wpilibHome) {
Expand Down