From b7d4dadb27bd96e3bcb5d9e8029017b603b2dc91 Mon Sep 17 00:00:00 2001
From: Vasileios Naskos <vasileios.naskos@sonarsource.com>
Date: Fri, 13 Dec 2024 12:23:54 +0100
Subject: [PATCH] Rename solution to match with the new project name
---
.cirrus.yaml | 4 ++--
SonarLint.VsTargetVersion.props | 2 +-
...VisualStudio.Integration.sln => SonarQube.VisualStudio.sln | 0
....sln.DotSettings => SonarQube.VisualStudio.sln.DotSettings | 0
tools/CleanRebuild.cmd | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)
rename SonarLint.VisualStudio.Integration.sln => SonarQube.VisualStudio.sln (100%)
rename SonarLint.VisualStudio.Integration.sln.DotSettings => SonarQube.VisualStudio.sln.DotSettings (100%)
diff --git a/.cirrus.yaml b/.cirrus.yaml
index 30223effdb..34afcbae80 100644
--- a/.cirrus.yaml
+++ b/.cirrus.yaml
@@ -40,7 +40,7 @@ build_task:
SM_CLIENT_CRT: VAULT[development/team/sonarlint/kv/data/codesigning/2023-2025 data.cert]
SM_HOST: VAULT[development/team/sonarlint/kv/data/codesigning/2023-2025 data.host]
SM_KP: key_525594307
- SOLUTION_PATH: SonarLint.VisualStudio.Integration.sln
+ SOLUTION_PATH: SonarQube.VisualStudio.sln
SONAR_TOKEN: VAULT[development/kv/data/sonarcloud data.token]
SONAR_URL: VAULT[development/kv/data/sonarcloud data.url]
SONARSOURCE_SNK_FILE: ${TMP_DIR}\SonarSource.snk
@@ -90,7 +90,7 @@ build_task:
sbomname="SonarLint.visualstudio.sbom-${PROJECT_VERSION}-2022.json"
gpg --batch --passphrase "$SIGN_PASSPHRASE" --allow-secret-key-import --import <(echo "$SIGN_KEY")
gpg --list-secret-keys
- dotnet CycloneDX SonarLint.VisualStudio.Integration.sln -t -j -o binaries
+ dotnet CycloneDX "${SOLUTION_PATH}" -t -j -o binaries
cd binaries
mv bom.json $sbomname
gpg --pinentry-mode loopback --passphrase "$SIGN_PASSPHRASE" --armor --detach-sig --default-key infra@sonarsource.com "$sbomname"
diff --git a/SonarLint.VsTargetVersion.props b/SonarLint.VsTargetVersion.props
index 03ef6be263..e2e1a76bca 100644
--- a/SonarLint.VsTargetVersion.props
+++ b/SonarLint.VsTargetVersion.props
@@ -17,7 +17,7 @@
Alternatively, you can explicitly specify the version of VS to target e.g.
- msbuild.exe SonarLint.VisualStudio.Integration.sln /p:VsTargetVersion=2022
+ msbuild.exe SonarQube.VisualStudio.sln /p:VsTargetVersion=2022
The allowed value for VsTargetVersion is 2022.
diff --git a/SonarLint.VisualStudio.Integration.sln b/SonarQube.VisualStudio.sln
similarity index 100%
rename from SonarLint.VisualStudio.Integration.sln
rename to SonarQube.VisualStudio.sln
diff --git a/SonarLint.VisualStudio.Integration.sln.DotSettings b/SonarQube.VisualStudio.sln.DotSettings
similarity index 100%
rename from SonarLint.VisualStudio.Integration.sln.DotSettings
rename to SonarQube.VisualStudio.sln.DotSettings
diff --git a/tools/CleanRebuild.cmd b/tools/CleanRebuild.cmd
index 87b1755252..5bd8042ba9 100644
--- a/tools/CleanRebuild.cmd
+++ b/tools/CleanRebuild.cmd
@@ -5,4 +5,4 @@
(for %%a in ("%LOCALAPPDATA%\SLVS_Build_DownloadedJars" "%LOCALAPPDATA%\SLVS_Build_SLOOP" "%LOCALAPPDATA%\SLVS_Build_Dotnet") do rd /s /q "%%~a")
call msbuild.exe %~dp0..\build\DownloadDependencies -t:Rebuild
-call msbuild.exe "%~dp0..\SonarLint.VisualStudio.Integration.sln" -t:Rebuild
+call msbuild.exe "%~dp0..\SonarQube.VisualStudio.sln" -t:Rebuild