Use .CodeBase instead of .Location

jamesholcomb · Nov 12, 2015 · dc34740 · dc34740
1 parent 457dd05
commit dc34740
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/Postman.WebApi.MsBuildTask.Tests/GeneratorTests.cs b/Postman.WebApi.MsBuildTask.Tests/GeneratorTests.cs
@@ -26,7 +26,8 @@ public class GeneratorTests
 		public void creates_postman_collection()
 		{
 			// Arrange
-			var assemblyFilePath = Assembly.GetExecutingAssembly().Location;
+			var codeBase = new Uri(Assembly.GetExecutingAssembly().CodeBase);
+			var assemblyFilePath = codeBase.LocalPath;
 
 			var generator = new CollectionGenerator();
 
@@ -48,9 +49,12 @@ public void executes_postman_generatetask()
 		{
 			// Arrange
 			var mock = new Mock<IBuildEngine>();
+			var codeBase = new Uri(Assembly.GetExecutingAssembly().CodeBase);
+			var assemblyFilePath = codeBase.LocalPath;
+
 			var task = new GenerateTask
 			{
-				AssemblyFilePath = Assembly.GetExecutingAssembly().Location,
+				AssemblyFilePath = assemblyFilePath,
 				OutputDirectory = @".\",
 				BuildEngine = mock.Object
 			};
@@ -71,15 +75,18 @@ public void executes_postman_generatetask()
 		public void throws_filenotfoundexception_when_no_xml_doc_file_found()
 		{
 			// Arrange
+			var codeBase = new Uri(Assembly.GetExecutingAssembly().CodeBase);
+			var assemblyFilePath = codeBase.LocalPath;
+
 			var mock = new Mock<IBuildEngine>();
 			GenerateTask task = new GenerateTask
 			{
-				AssemblyFilePath = Assembly.GetExecutingAssembly().Location,
+				AssemblyFilePath = assemblyFilePath,
 				OutputDirectory = @".\",
 				BuildEngine = mock.Object
 			};
 
-			var xmlFile = Assembly.GetExecutingAssembly().Location.Replace(Resources.DllFileExtension, Resources.XmlFileExtension);
+			var xmlFile = task.AssemblyFilePath.Replace(Resources.DllFileExtension, Resources.XmlFileExtension);
 			var tmpFile = @"tmp.xml";
 			File.Move(xmlFile, tmpFile);
 

diff --git a/Postman.WebApi.MsBuildTask/CollectionGenerator.cs b/Postman.WebApi.MsBuildTask/CollectionGenerator.cs
@@ -80,7 +80,9 @@ public PostmanCollection Create(string assemblyFilePath, string environmentKey,
 
 			var baseUrl = "{{" + environmentKey + "}}/";
 			var assemblyName = Path.GetFileNameWithoutExtension(assemblyFilePath);
-			var xmlPath = assemblyFilePath.Replace(Resources.DllFileExtension, Resources.XmlFileExtension);
+			var xmlPath = assemblyFilePath
+				.ToLowerInvariant()
+				.Replace(Resources.DllFileExtension, Resources.XmlFileExtension);
 
 			if (!File.Exists(xmlPath))
 			{

diff --git a/Postman.WebApi.MsBuildTask/GenerateTask.cs b/Postman.WebApi.MsBuildTask/GenerateTask.cs
@@ -28,7 +28,7 @@ static GenerateTask()
 		{
 			// When executed as a task by MSBuild.exe, the configuration file is msbuild.exe.config
 			// Manually redirect assembly bindings in case the host project has dependencies on differing versions
-			var configFile = Assembly.GetExecutingAssembly().Location + Resources.ConfigFileExtension;
+			var configFile = Assembly.GetExecutingAssembly().CodeBase + Resources.ConfigFileExtension;
 
 			var appConfig = new AppConfig();
 			appConfig.Load(configFile);

diff --git a/appveyor.yml b/appveyor.yml
@@ -39,12 +39,8 @@ build:
 before_build: nuget restore
 
 on_finish:
-- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 #---------------------------------#
 #       tests configuration       #
 #---------------------------------#
-
-test:
-  assemblies:
-    - '**\*.UnitTests.dll'