Skip to content

Commit 5097342

Browse files
committed
Merge branch 'release/1.1.2' into main
2 parents 3e1b0ea + 62164a4 commit 5097342

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.1.1.0")]
35-
[assembly: AssemblyFileVersion("1.1.1.0")]
34+
[assembly: AssemblyVersion("1.1.2.0")]
35+
[assembly: AssemblyFileVersion("1.1.2.0")]

PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1.1.0")]
36-
[assembly: AssemblyFileVersion("1.1.1.0")]
35+
[assembly: AssemblyVersion("1.1.2.0")]
36+
[assembly: AssemblyFileVersion("1.1.2.0")]

PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1.1.0")]
36-
[assembly: AssemblyFileVersion("1.1.1.0")]
35+
[assembly: AssemblyVersion("1.1.2.0")]
36+
[assembly: AssemblyFileVersion("1.1.2.0")]

PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public async Task RunTestsAsync(string type, string owner, string name, string p
7777

7878
try
7979
{
80-
if (oracleHome != null)
80+
if (oracleHome != null && Environment.GetEnvironmentVariable("ORACLE_HOME") == null)
8181
{
8282
Environment.SetEnvironmentVariable("ORACLE_HOME", oracleHome);
8383
}

0 commit comments

Comments
 (0)