◐ Shell
reader mode source ↗
Skip to content
Merged

Merge to main #23

Show file tree
Hide file tree
Changes from all commits
File filter
Conversations
Jump to
Diff view
Apply and reload
Show whitespace
Diff view
Apply and reload
6 changes: 5 additions & 1 deletion PlsqlDeveloperUtPlsqlPlugin/ColorProgressBar/ColorProgressBar.csproj
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
<OutputType>Library</OutputType>
<RootNamespace>ColorProgressBar</RootNamespace>
<AssemblyName>ColorProgressBar</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -21,6 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -30,6 +32,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
Expand Down Expand Up @@ -61,6 +64,7 @@
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
Expand Down
67 changes: 30 additions & 37 deletions PlsqlDeveloperUtPlsqlPlugin/ColorProgressBar/Properties/Resources.Designer.cs
View file Edit file Delete file
Open in desktop
4 changes: 2 additions & 2 deletions PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/App.config
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
28 changes: 24 additions & 4 deletions PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.cs
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public class PlsqlDeveloperUtPlsqlPlugin

private const int PluginMenuIndexAllTests = 3;
private const int PluginMenuIndexAllTestsWithCoverage = 4;
private const int PluginPopupIndex = 1;
private const int PluginPopupIndexWithCoverage = 2;

Expand Down Expand Up @@ -107,6 +108,14 @@ public static void OnActivate()
}
}

using (var stream = assembly.GetManifestResourceStream("utPLSQL.utPLSQL.bmp"))
{
if (stream != null)
Expand Down Expand Up @@ -210,6 +219,8 @@ public static string CreateMenuItem(int index)
return "LARGEITEM=Run all tests of current user";
case PluginMenuIndexAllTestsWithCoverage:
return "LARGEITEM=Run code coverage for current user";
default:
return "";
}
Expand All @@ -226,7 +237,7 @@ public static void OnMenuClick(int index)
{
var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);
Windows.Add(testResultWindow);
testResultWindow.RunTestsAsync("_ALL", username, null, null, false);
}
}
else if (index == PluginMenuIndexAllTestsWithCoverage)
Expand All @@ -235,7 +246,16 @@ public static void OnMenuClick(int index)
{
var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);
Windows.Add(testResultWindow);
testResultWindow.RunTestsAsync("_ALL", username, null, null, true);
}
}
else if (index == PluginPopupIndex)
Expand All @@ -247,7 +267,7 @@ public static void OnMenuClick(int index)
var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);
Windows.Add(testResultWindow);
testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),
Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), false);
}
}
else if (index == PluginPopupIndexWithCoverage)
Expand All @@ -259,7 +279,7 @@ public static void OnMenuClick(int index)
var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);
Windows.Add(testResultWindow);
testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),
Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), true);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.csproj
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>utPLSQL</RootNamespace>
<AssemblyName>PlsqlDeveloperUtPlsqlPlugin</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
Expand Down
8 changes: 4 additions & 4 deletions PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/Properties/AssemblyInfo.cs
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
@@ -9,7 +9,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("utPLSQL.org")]
[assembly: AssemblyProduct("PlsqlDeveloperUtPlsqlPlugin")]
[assembly: AssemblyCopyright("Copyright © 2021")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -28,5 +28,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.2.3.0")]
[assembly: AssemblyFileVersion("1.2.3.0")]
30 changes: 15 additions & 15 deletions PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/Properties/Resources.Designer.cs
View file Edit file Delete file
Open in desktop
2 changes: 1 addition & 1 deletion PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/packages.config
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<package id="Costura.Fody" version="4.1.0" targetFramework="net40" />
<package id="Fody" version="6.3.0" targetFramework="net45" developmentDependency="true" />
<package id="UnmanagedExports" version="1.2.7" targetFramework="net40" />
<package id="UnmanagedExports.Repack" version="1.0.4" targetFramework="net40" />
</packages>
Loading
Toggle all file notes Toggle all file annotations