Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit62aaa08

Browse files
authored
Merge pull request#23 from utPLSQL/develop
Merge to main
2 parents28e985b +4be4e76 commit62aaa08

23 files changed

+270
-136
lines changed

‎PlsqlDeveloperUtPlsqlPlugin/ColorProgressBar/ColorProgressBar.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
<OutputType>Library</OutputType>
99
<RootNamespace>ColorProgressBar</RootNamespace>
1010
<AssemblyName>ColorProgressBar</AssemblyName>
11-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<Deterministic>true</Deterministic>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
1617
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -21,6 +22,7 @@
2122
<DefineConstants>DEBUG;TRACE</DefineConstants>
2223
<ErrorReport>prompt</ErrorReport>
2324
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
2426
</PropertyGroup>
2527
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
2628
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -30,6 +32,7 @@
3032
<DefineConstants>TRACE</DefineConstants>
3133
<ErrorReport>prompt</ErrorReport>
3234
<WarningLevel>4</WarningLevel>
35+
<Prefer32Bit>false</Prefer32Bit>
3336
</PropertyGroup>
3437
<PropertyGroup>
3538
<StartupObject />
@@ -61,6 +64,7 @@
6164
<CompileInclude="Properties\Resources.Designer.cs">
6265
<AutoGen>True</AutoGen>
6366
<DependentUpon>Resources.resx</DependentUpon>
67+
<DesignTime>True</DesignTime>
6468
</Compile>
6569
<NoneInclude="Properties\Settings.settings">
6670
<Generator>SettingsSingleFileGenerator</Generator>

‎PlsqlDeveloperUtPlsqlPlugin/ColorProgressBar/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
usingSystem.Reflection;
1+
usingSystem.Reflection;
22
usingSystem.Runtime.CompilerServices;
33
usingSystem.Runtime.InteropServices;
44

@@ -10,7 +10,7 @@
1010
[assembly:AssemblyConfiguration("")]
1111
[assembly:AssemblyCompany("utPLSQL.org")]
1212
[assembly:AssemblyProduct("ColorProgressBar")]
13-
[assembly:AssemblyCopyright("Copyright © 2021")]
13+
[assembly:AssemblyCopyright("Copyright © 2021")]
1414
[assembly:AssemblyTrademark("")]
1515
[assembly:AssemblyCulture("")]
1616

@@ -31,5 +31,5 @@
3131
//
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
34-
[assembly:AssemblyVersion("1.2.3.0")]
35-
[assembly:AssemblyFileVersion("1.2.3.0")]
34+
[assembly:AssemblyVersion("1.2.4.0")]
35+
[assembly:AssemblyFileVersion("1.2.4.0")]

‎PlsqlDeveloperUtPlsqlPlugin/ColorProgressBar/Properties/Resources.Designer.cs

Lines changed: 30 additions & 37 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎PlsqlDeveloperUtPlsqlPlugin/ColorProgressBar/Properties/Settings.Designer.cs

Lines changed: 13 additions & 16 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntimeversion="v4.0"sku=".NETFramework,Version=v4.5"/></startup></configuration>
3+
<startup><supportedRuntimeversion="v4.0"sku=".NETFramework,Version=v4.8"/></startup></configuration>

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.cs

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public class PlsqlDeveloperUtPlsqlPlugin
4343

4444
privateconstintPluginMenuIndexAllTests=3;
4545
privateconstintPluginMenuIndexAllTestsWithCoverage=4;
46+
privateconstintPluginMenuIndexPath=5;
4647
privateconstintPluginPopupIndex=1;
4748
privateconstintPluginPopupIndexWithCoverage=2;
4849

@@ -107,6 +108,14 @@ public static void OnActivate()
107108
}
108109
}
109110

111+
using(varstream=assembly.GetManifestResourceStream("utPLSQL.utPLSQL.bmp"))
112+
{
113+
if(stream!=null)
114+
{
115+
createToolButton(pluginId,PluginMenuIndexPath,"utPLSQL","utPLSQL.bmp",newBitmap(stream).GetHbitmap().ToInt64());
116+
}
117+
}
118+
110119
using(varstream=assembly.GetManifestResourceStream("utPLSQL.utPLSQL.bmp"))
111120
{
112121
if(stream!=null)
@@ -210,6 +219,8 @@ public static string CreateMenuItem(int index)
210219
return"LARGEITEM=Run all tests of current user";
211220
casePluginMenuIndexAllTestsWithCoverage:
212221
return"LARGEITEM=Run code coverage for current user";
222+
casePluginMenuIndexPath:
223+
return"LARGEITEM=Run tests for specific path";
213224
default:
214225
return"";
215226
}
@@ -226,7 +237,7 @@ public static void OnMenuClick(int index)
226237
{
227238
vartestResultWindow=newTestRunnerWindow(_plugin,username,password,database,connectAs,oracleHome);
228239
Windows.Add(testResultWindow);
229-
testResultWindow.RunTestsAsync("_ALL",username,null,null,false);
240+
testResultWindow.RunTestsAsync("_ALL",username,null,null,false,false);
230241
}
231242
}
232243
elseif(index==PluginMenuIndexAllTestsWithCoverage)
@@ -235,7 +246,16 @@ public static void OnMenuClick(int index)
235246
{
236247
vartestResultWindow=newTestRunnerWindow(_plugin,username,password,database,connectAs,oracleHome);
237248
Windows.Add(testResultWindow);
238-
testResultWindow.RunTestsAsync("_ALL",username,null,null,true);
249+
testResultWindow.RunTestsAsync("_ALL",username,null,null,true,false);
250+
}
251+
}
252+
elseif(index==PluginMenuIndexPath)
253+
{
254+
if(isConnected()&&!isSydba())
255+
{
256+
vartestResultWindow=newTestRunnerWindow(_plugin,username,password,database,connectAs,oracleHome);
257+
Windows.Add(testResultWindow);
258+
testResultWindow.RunTestsAsync(null,null,null,null,false,true);
239259
}
240260
}
241261
elseif(index==PluginPopupIndex)
@@ -247,7 +267,7 @@ public static void OnMenuClick(int index)
247267
vartestResultWindow=newTestRunnerWindow(_plugin,username,password,database,connectAs,oracleHome);
248268
Windows.Add(testResultWindow);
249269
testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type),Marshal.PtrToStringAnsi(owner),
250-
Marshal.PtrToStringAnsi(name),Marshal.PtrToStringAnsi(subType),false);
270+
Marshal.PtrToStringAnsi(name),Marshal.PtrToStringAnsi(subType),false,false);
251271
}
252272
}
253273
elseif(index==PluginPopupIndexWithCoverage)
@@ -259,7 +279,7 @@ public static void OnMenuClick(int index)
259279
vartestResultWindow=newTestRunnerWindow(_plugin,username,password,database,connectAs,oracleHome);
260280
Windows.Add(testResultWindow);
261281
testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type),Marshal.PtrToStringAnsi(owner),
262-
Marshal.PtrToStringAnsi(name),Marshal.PtrToStringAnsi(subType),true);
282+
Marshal.PtrToStringAnsi(name),Marshal.PtrToStringAnsi(subType),true,false);
263283
}
264284
}
265285
}

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>utPLSQL</RootNamespace>
1212
<AssemblyName>PlsqlDeveloperUtPlsqlPlugin</AssemblyName>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<Deterministic>true</Deterministic>
1616
<TargetFrameworkProfile />

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
usingSystem.Reflection;
1+
usingSystem.Reflection;
22
usingSystem.Runtime.InteropServices;
33

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

@@ -28,5 +28,5 @@
2828
// Build Number
2929
// Revision
3030
//
31-
[assembly:AssemblyVersion("1.2.3.0")]
32-
[assembly:AssemblyFileVersion("1.2.3.0")]
31+
[assembly:AssemblyVersion("1.2.4.0")]
32+
[assembly:AssemblyFileVersion("1.2.4.0")]

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/Properties/Resources.Designer.cs

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<packageid="Costura.Fody"version="4.1.0"targetFramework="net40" />
44
<packageid="Fody"version="6.3.0"targetFramework="net45"developmentDependency="true" />
55
<packageid="UnmanagedExports"version="1.2.7"targetFramework="net40" />
6-
<packageid="UnmanagedExports.Repack"version="1.0.4"targetFramework="net40" />
6+
<packageid="UnmanagedExports.Repack"version="1.0.4"targetFramework="net40"requireReinstallation="true"/>
77
</packages>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp