diff --git a/README.md b/README.md index a72acab..291d87e 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,10 @@ The latest release version (v2.0) is available [here](https://github.com/SonarSo ### Compatibility v1.0 of the SDK generates plugins that are compatible with SonarQube v4.5.2 -> v6.7. -v2.0 generates plugins that are compatible versions of SonarQube from v6.7 (tested with the current latest available version, v7.3alpha1). +v2.0 generates plugins that are compatible with versions of SonarQube from v6.7 (tested with the current latest available version, v7.3alpha1). + +v3.0 generates plugins that are compatible with versions of SonarQube from v7.9.6 (tested with the current latest available version, v9.1). + If you have an existing plugin that was generated with v1.0 of the SDK and want to use the plugin with SonarQube 7.0 or later, you will need to create a new plugin using v2.0 of the SDK. If you customized the _SQALE.xml_ file for your v1.0 plugin, you will need to move the remediation information to the _rules.xml_ file for the v2.0 plugin. diff --git a/RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.2.0.73.jar b/RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.2.0.76.jar similarity index 99% rename from RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.2.0.73.jar rename to RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.2.0.76.jar index dbefaaf..0aba3e7 100644 Binary files a/RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.2.0.73.jar and b/RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.2.0.76.jar differ diff --git a/RoslynPluginGenerator/RoslynPluginJarBuilder.cs b/RoslynPluginGenerator/RoslynPluginJarBuilder.cs index ecbfcab..254bdb5 100644 --- a/RoslynPluginGenerator/RoslynPluginJarBuilder.cs +++ b/RoslynPluginGenerator/RoslynPluginJarBuilder.cs @@ -34,7 +34,7 @@ public class RoslynPluginJarBuilder /// /// Name of the embedded resource that contains the .jar file to update /// - private const string TemplateJarResourceName = "SonarQube.Plugins.Roslyn.Resources.sonar-roslyn-sdk-template-plugin-1.2.0.73.jar"; + private const string TemplateJarResourceName = "SonarQube.Plugins.Roslyn.Resources.sonar-roslyn-sdk-template-plugin-1.2.0.76.jar"; // Locations in the jar archive where various file should be embedded. // Using forward-slash since that is the separator used by Java for archive entry names. diff --git a/RoslynPluginGenerator/SonarQube.Plugins.Roslyn.PluginGenerator.csproj b/RoslynPluginGenerator/SonarQube.Plugins.Roslyn.PluginGenerator.csproj index 0f47337..0244da0 100644 --- a/RoslynPluginGenerator/SonarQube.Plugins.Roslyn.PluginGenerator.csproj +++ b/RoslynPluginGenerator/SonarQube.Plugins.Roslyn.PluginGenerator.csproj @@ -54,10 +54,10 @@ - + diff --git a/RoslynPluginGenerator/UIResources.Designer.cs b/RoslynPluginGenerator/UIResources.Designer.cs index 3f53cfa..cb1ae31 100644 --- a/RoslynPluginGenerator/UIResources.Designer.cs +++ b/RoslynPluginGenerator/UIResources.Designer.cs @@ -19,7 +19,7 @@ namespace SonarQube.Plugins.Roslyn { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class UIResources { @@ -473,7 +473,7 @@ public static string Program_SupportedRoslynVersion { } /// - /// Looks up a localized string similar to Minimum supported SonarQube version: 6.7 (highest version tested against: 7.3-alpha1). + /// Looks up a localized string similar to Minimum supported SonarQube version: 7.9.6 (highest version tested against: 9.1). /// public static string Program_SupportedSonarQubeVersions { get { diff --git a/RoslynPluginGenerator/UIResources.resx b/RoslynPluginGenerator/UIResources.resx index 6f700bd..2f8f914 100644 --- a/RoslynPluginGenerator/UIResources.resx +++ b/RoslynPluginGenerator/UIResources.resx @@ -260,7 +260,7 @@ The conflict will be ignored. Maximum supported Roslyn version: - Minimum supported SonarQube version: 6.7 (highest version tested against: 7.3-alpha1) + Minimum supported SonarQube version: 7.9.6 (highest version tested against: 9.1) Skipping rule in analyzer {0}: Duplicate key. diff --git a/Tests/IntegrationTests/Roslyn/RoslynGenTests.cs b/Tests/IntegrationTests/Roslyn/RoslynGenTests.cs index 7ff54b2..3f6ffe5 100644 --- a/Tests/IntegrationTests/Roslyn/RoslynGenTests.cs +++ b/Tests/IntegrationTests/Roslyn/RoslynGenTests.cs @@ -402,7 +402,7 @@ private static void AssertPackagePropertiesInManifest(IPackage package, JarManif private static void AssertFixedValuesInManifest(JarManifestReader reader) { - reader.FindValue("Sonar-Version").Should().Be("6.7"); + reader.FindValue("Sonar-Version").Should().Be("7.9"); reader.FindValue("Plugin-Class").Should().Be("org.sonar.plugins.roslynsdk.RoslynSdkGeneratedPlugin"); reader.FindValue("SonarLint-Supported").Should().Be("false"); reader.FindValue("Plugin-Dependencies").Should().Be("META-INF/lib/jsr305-1.3.9.jar META-INF/lib/commons-io-2.6.jar META-INF/lib/stax2-api-3.1.4.jar META-INF/lib/staxmate-2.0.1.jar META-INF/lib/stax-api-1.0.1.jar");