Fixed NuGet installation

Author: Robert Va?an

Content/ToBeDeleted.txt

@@ -5,4 +5,4 @@
 [assembly: AssemblyProduct("FodyDependencyProperty")]
 [assembly: AssemblyCompany("Robert Važan")]
 [assembly: AssemblyCopyright("Copyright © 2014 Robert Važan")]
-[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.1.0.0")]

FodyDependencyProperty/AssemblyInfo.cs

@@ -32,4 +32,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.1.0.0")]

FodyDependencyPropertyMarker/Properties/AssemblyInfo.cs

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata minClientVersion="2.8">
-    <id>FodyDependencyProperty</id>
+    <id>FodyDependencyProperty.Fody</id>
     <version>$version$</version>
     <title>FodyDependencyProperty</title>
     <authors>Robert Važan</authors>

NuGet/FodyDependencyProperty.nuspec

@@ -20,7 +20,6 @@
       <SubType>Designer</SubType>
     </None>
     <None Include="uninstall.ps1" />
-    <Content Include="Fody_ToBeDeleted.txt" />
   </ItemGroup>
   <Target Name="Clean">
     <RemoveDir Directories="$(SolutionDir)NuGetBuild" />
@@ -29,10 +28,10 @@
   <Target Name="ReBuild" DependsOnTargets="NuGetBuild" />
   <Target Name="NuGetBuild" DependsOnTargets="Clean">
     <MakeDir Directories="$(SolutionDir)NuGetBuild" />
+    <MakeDir Directories="$(SolutionDir)NuGetBuild\lib\net40" />
     <Copy SourceFiles="$(SolutionDir)NuGet\FodyDependencyProperty.nuspec" DestinationFolder="$(SolutionDir)NuGetBuild" />
     <Copy SourceFiles="$(SolutionDir)FodyDependencyProperty\bin\$(ConfigurationName)\FodyDependencyProperty.Fody.dll" DestinationFolder="$(SolutionDir)NuGetBuild" />
-    <Copy SourceFiles="$(SolutionDir)FodyDependencyPropertyMarker\bin\$(ConfigurationName)\FodyDependencyPropertyMarker.dll" DestinationFolder="$(SolutionDir)NuGetBuild" />
-    <Copy SourceFiles="$(SolutionDir)NuGet\Fody_ToBeDeleted.txt" DestinationFolder="$(SolutionDir)NuGetBuild\Content" />
+    <Copy SourceFiles="$(SolutionDir)FodyDependencyPropertyMarker\bin\$(ConfigurationName)\FodyDependencyPropertyMarker.dll" DestinationFolder="$(SolutionDir)NuGetBuild\lib\net40" />
     <Copy SourceFiles="$(ProjectDir)install.ps1" DestinationFolder="$(SolutionDir)NuGetBuild\Tools" />
     <Copy SourceFiles="$(ProjectDir)uninstall.ps1" DestinationFolder="$(SolutionDir)NuGetBuild\Tools" />
     <PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetBuild" MetadataAssembly="$(SolutionDir)FodyDependencyProperty\bin\$(ConfigurationName)\FodyDependencyProperty.Fody.dll" />

NuGet/Nuget.csproj

@@ -1,18 +1,6 @@
 param($installPath, $toolsPath, $package, $project)
 
 
-function RemoveForceProjectLevelHack($project)
-{
-    Write-Host "RemoveForceProjectLevelHack" 
-	Foreach ($item in $project.ProjectItems) 
-	{
-		if ($item.Name -eq "Fody_ToBeDeleted.txt")
-		{
-			$item.Delete()
-		}
-	}
-}
-
 function FlushVariables()
 {
     Write-Host "Flushing environment variables"
@@ -87,8 +75,6 @@ function UnlockWeaversXml($project)
 
 UnlockWeaversXml($project)
 
-RemoveForceProjectLevelHack $project
-
 Update-FodyConfig $package.Id.Replace(".Fody", "") $project
 
 Fix-ReferencesCopyLocal $package $project