Several small CR comment fixups

AArnott · AArnott · commit 400cb37680f4 · 2017-04-23T22:10:32.000-07:00
diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -23,7 +23,6 @@
     <PackageReference Include="xunit.skippablefact" Version="1.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
     <PackageReference Include="xunit.runner.console" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.msbuild" Version="2.2.0" Condition=" '$(TargetFramework)' == 'net46' " />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/LibGit2Sharp.Tests/VisualStudio.Tests.targets b/LibGit2Sharp.Tests/VisualStudio.Tests.targets
diff --git a/LibGit2Sharp.sln b/LibGit2Sharp.sln
@@ -12,7 +12,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0CA739FD-DA4D-4F64-9834-DA14A3ECD04B}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
-		LibGit2Sharp\CodeGenerator.targets = LibGit2Sharp\CodeGenerator.targets
 		nuget.config = nuget.config
 		version.json = version.json
 	EndProjectSection
diff --git a/LibGit2Sharp/CodeGenerator.targets b/LibGit2Sharp/CodeGenerator.targets
@@ -34,7 +34,9 @@
     </PropertyGroup>
   </Target>
 
-  <Target Name="GenerateNativeDllNameCs">
+  <Target Name="GenerateNativeDllNameCs"
+          Inputs="@(EmbeddedResource)"
+          Outputs="$(NativeDllNamePath)">
     <ReadLinesFromFile File="@(EmbeddedResource)"
                                Condition=" '%(Filename)%(Extension)' == 'libgit2_filename.txt' ">
       <Output TaskParameter="Lines" PropertyName="libgit2FileName" />
@@ -60,10 +62,10 @@ namespace LibGit2Sharp.Core
   </Target>
 
   <!-- This target runs if any of the projects or .cs files for the project have changed since the last time
-      the UniqueIdentifier.cs file was generated. -->
+       the UniqueIdentifier.cs file was generated. -->
   <Target Name="GenerateUniqueIdentifierCs"
-           Inputs="$(MSBuildThisFileFullPath);$(MSBuildAllProjects);@(Compile)"
-           Outputs="$(UniqueIdentifierPath)">
+          Inputs="$(MSBuildThisFileFullPath);$(MSBuildAllProjects);@(Compile)"
+          Outputs="$(UniqueIdentifierPath)">
     <PropertyGroup>
       <UniqueIdSourceLines>
 namespace LibGit2Sharp.Core
diff --git a/LibGit2Sharp/Core/EncodingMarshaler.cs b/LibGit2Sharp/Core/EncodingMarshaler.cs
@@ -45,7 +45,7 @@ public virtual IntPtr MarshalManagedToNative(Object managedObj)
             {
                 throw new MarshalDirectiveException(string.Format(CultureInfo.InvariantCulture,
                                                                   "{0} must be used on a string.",
-                                                                  this.GetType().Name));
+                                                                  GetType().Name));
             }
 
             return FromManaged(encoding, str);
diff --git a/LibGit2Sharp/Core/Utf8Marshaler.cs b/LibGit2Sharp/Core/Utf8Marshaler.cs
@@ -71,7 +71,7 @@ public override Object MarshalNativeToManaged(IntPtr pNativeData)
         {
             throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture,
                                                               "{0} cannot be used to retrieve data from libgit2.",
-                                                              this.GetType().Name));
+                                                              GetType().Name));
         }
 
         #endregion
@@ -107,7 +107,7 @@ public override IntPtr MarshalManagedToNative(object managedObj)
         {
             throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture,
                                                               "{0} cannot be used to pass data to libgit2.",
-                                                              this.GetType().Name));
+                                                              GetType().Name));
         }
 
         #endregion
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -32,15 +32,17 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[1.0.165]" />
-    <PackageReference Include="System.Security.SecureString" Version="4.0.0" Condition=" '$(TargetFramework)' == 'netstandard1.3' " />
-    <PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.0.1" Condition=" '$(TargetFramework)' == 'netstandard1.3' " />
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" Condition=" '$(TargetFramework)' == 'netstandard1.3' " />
     <PackageReference Include="SourceLink.Create.GitHub" Version="2.0.2" PrivateAssets="all" />
     <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.0.2" />
 
     <PackageReference Include="CodeGeneration.Roslyn.BuildTime" Version="$(CodeGenerationRoslynVersion)" PrivateAssets="all" />
     <DotNetCliToolReference Include="dotnet-codegen" Version="$(CodeGenerationRoslynVersion)" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <PackageReference Include="System.Security.SecureString" Version="4.0.0" />
+    <PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.0.1" />
+    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
+  </ItemGroup>
   <Import Project="CodeGenerator.targets" />
   <Import Project="ExtraDefine.targets" />
   <Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
diff --git a/nuget.config b/nuget.config
@@ -1,12 +1,8 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <config>
-    <add key="repositorypath" value="packages" />
-  </config>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="CodeGeneration.Roslyn" value="https://ci.appveyor.com/nuget/codegeneration-roslyn" />
-    <add key="nerdbank-gitversioning" value="https://ci.appveyor.com/nuget/nerdbank-gitversioning" />
     <add key="corefxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" />
   </packageSources>
 </configuration>

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public virtual IntPtr MarshalManagedToNative(Object managedObj)`
`45`	`45`	`{`
`46`	`46`	`throw new MarshalDirectiveException(string.Format(CultureInfo.InvariantCulture,`
`47`	`47`	`"{0} must be used on a string.",`
`48`		`- this.GetType().Name));`
	`48`	`+ GetType().Name));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`return FromManaged(encoding, str);`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public override Object MarshalNativeToManaged(IntPtr pNativeData)`
`71`	`71`	`{`
`72`	`72`	`throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture,`
`73`	`73`	`"{0} cannot be used to retrieve data from libgit2.",`
`74`		`- this.GetType().Name));`
	`74`	`+ GetType().Name));`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`#endregion`
`@@ -107,7 +107,7 @@ public override IntPtr MarshalManagedToNative(object managedObj)`
`107`	`107`	`{`
`108`	`108`	`throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture,`
`109`	`109`	`"{0} cannot be used to pass data to libgit2.",`
`110`		`- this.GetType().Name));`
	`110`	`+ GetType().Name));`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`#endregion`