Commit5097342

committed

Merge branch 'release/1.1.2' into main

2 parents3e1b0ea +62164a4 commit5097342Copy full SHA for 5097342

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,5 @@`
`31`	`31`	`// You can specify all the values or you can default the Build and Revision Numbers`
`32`	`32`	`// by using the '*' as shown below:`
`33`	`33`	`// [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")]`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@`
`32`	`32`	`// You can specify all the values or you can default the Build and Revision Numbers`
`33`	`33`	`// by using the '*' as shown below:`
`34`	`34`	`// [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")]`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@`
`32`	`32`	`// You can specify all the values or you can default the Build and Revision Numbers`
`33`	`33`	`// by using the '*' as shown below:`
`34`	`34`	`// [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")]`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public async Task RunTestsAsync(string type, string owner, string name, string p`
`77`	`77`
`78`	`78`	`try`
`79`	`79`	`{`
`80`		`-if(oracleHome!=null)`
	`80`	`+if(oracleHome!=null&&Environment.GetEnvironmentVariable("ORACLE_HOME")==null)`
`81`	`81`	`{`
`82`	`82`	`Environment.SetEnvironmentVariable("ORACLE_HOME",oracleHome);`
`83`	`83`	`}`

Comments

(0)