Merge pull request #2 from icsharpcode/master

Sync fork back

src/AddIns/Misc/PackageManagement/Project/Src/ProcessPackageAction.cs

@@ -45,7 +45,12 @@ namespace ICSharpCode.PackageManagement
 		public bool AllowPrereleaseVersions { get; set; }
 		
 		public FrameworkName ProjectTargetFramework {
-			get { return Project.TargetFramework; }
+			get {
+				if (Project != null) {
+					return Project.TargetFramework;
+				}
+				return null;
+			}
 		}
 		
 		public virtual bool HasPackageScriptsToRun()

src/AddIns/Misc/PackageManagement/Project/Src/Scripting/MSBuildProjectPropertiesMerger.cs

@@ -93,7 +93,7 @@ namespace ICSharpCode.PackageManagement.Scripting
 		
 		void SetPropertyInSharpDevelopProject(ProjectPropertyElement msbuildProjectProperty)
 		{
-			sharpDevelopProject.SetProperty(msbuildProjectProperty.Name, msbuildProjectProperty.Value);
+			sharpDevelopProject.SetProperty(msbuildProjectProperty.Name, msbuildProjectProperty.Value, treatPropertyValueAsLiteral: false);
 		}
 		
 		bool HasMSBuildProjectPropertyBeenUpdated(ProjectPropertyElement msbuildProjectProperty, ProjectPropertyElement sharpDevelopProjectProperty)

src/AddIns/Misc/PackageManagement/Test/Src/ProcessPackageActionTests.cs

@@ -183,5 +183,15 @@ namespace PackageManagement.Tests
 			
 			Assert.AreEqual(expectedTargetFramework, targetFramework);
 		}
+		
+		[Test]
+		public void ProjectTargetFramework_NullProject_ReturnsNull()
+		{
+			var installAction = new InstallPackageAction(null, new FakePackageManagementEvents());
+			
+			FrameworkName targetFramework = installAction.ProjectTargetFramework;
+			
+			Assert.IsNull(targetFramework);
+		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/Src/Scripting/MSBuildProjectPropertiesMergerTests.cs

@@ -260,5 +260,17 @@ namespace PackageManagement.Tests.Scripting
 			
 			Assert.IsFalse(propertiesMerger.Result.AnyPropertiesChanged());
 		}
+		
+		[Test]
+		public void Merge_MSBuildProjectHasNewPropertyAddedWithEncodableCharacters_PropertyAddedToSharpDevelopProjectWithoutEncodingCharacters()
+		{
+			var propertyGroup = msbuildProject.Xml.AddPropertyGroup();
+			propertyGroup.SetProperty("Test", "$(Value)");
+			
+			Merge();
+			
+			string value = sharpDevelopProject.GetUnevalatedProperty("Test");
+			Assert.AreEqual("$(Value)", value);
+		}
 	}
 }