mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.10.0.47

Browse Source 
Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mcs/class/System.ServiceModel/Test/MetadataTests/TestContext.cs
View File

@ -23,7 +23,7 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#if !MOBILE && !XAMMAC_4_5
using System;
using System.IO;
using System.Text;
@ -138,7 +138,10 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
if (!name.EndsWith (".xml"))
name = name + ".xml";
var uri = new Uri (asm.CodeBase);
// Run from mcs/class/lib/<profile>
var path = Path.GetDirectoryName (uri.AbsolutePath);
path = Directory.GetParent (path).Parent.Parent.FullName;
path = Path.Combine (path, "System.ServiceModel");
path = Path.Combine (path, "Test");
path = Path.Combine (path, "MetadataTests");
path = Path.Combine (path, "Resources");
@ -172,6 +175,8 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
name = name + ".config";
var uri = new Uri (asm.CodeBase);
var path = Path.GetDirectoryName (uri.AbsolutePath);
path = Directory.GetParent (path).Parent.Parent.FullName;
path = Path.Combine (path, "System.ServiceModel");
path = Path.Combine (path, "Test");
path = Path.Combine (path, "MetadataTests");
path = Path.Combine (path, "Resources");
@ -317,4 +322,6 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
#endregion
}
}
#endif