Merge pull request #1483 from libgit2/netstandard2.0

Move to .NET Standard 2.0

Author: ethomson

.editorconfig

@@ -13,3 +13,6 @@ insert_final_newline = true
 [*.{sln,csroj}]
 trim_trailing_whitespace = false
 insert_final_newline = false
+
+[*.{props,targets}]
+indent_size = 2

.travis.yml

@@ -3,8 +3,9 @@
 
 language: csharp
 dist: trusty
-dotnet: 1.0.1
+dotnet: 2.0.0
 mono: none
+osx_image: xcode8.3
 
 os:
  - osx

CodeGeneration/CodeGeneration.csproj

@@ -1,12 +1,13 @@
 <Project>
+
   <PropertyGroup>
     <OutputPath>$(MSBuildThisFileDirectory)bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
     <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-
-    <CodeGenerationRoslynVersion>0.4.11</CodeGenerationRoslynVersion>
+    <DefineConstants Condition=" '$(ExtraDefine)' != '' ">$(DefineConstants);$(ExtraDefine)</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.37-beta" PrivateAssets="all" />
   </ItemGroup>
+
 </Project>

CodeGeneration/OfferFriendlyInteropOverloadsGenerator.cs

@@ -1,5 +1,14 @@
 <Project>
+
   <PropertyGroup>
     <PublicSign Condition=" '$(AssemblyOriginatorKeyFile)' != '' and '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludePDBsInPackage</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
+
+  <Target Name="IncludePDBsInPackage">
+    <ItemGroup>
+      <TfmSpecificPackageFile Include="$(OutputPath)\$(AssemblyName).pdb" PackagePath="lib/$(TargetFramework)" />
+    </ItemGroup>
+  </Target>
+
 </Project>

CodeGenerationAttributes/CodeGenerationAttributes.csproj

@@ -19,25 +19,25 @@ public void CanGetMinimumCompiledInFeatures()
         public void CanRetrieveValidVersionString()
         {
             // Version string format is:
-            //      Major.Minor.Patch[-somePreleaseTag]-libgit2_abbrev_hash (x86|x64 - features)
+            //      Major.Minor.Patch[-previewTag]+g{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64 - features)
             // Example output:
-            //      "0.17.0[-beta]+gdeadcafeee.LibGit2-06d772d (x86 - Threads, Https)"
+            //      "0.25.0-preview.52+g871d13a67f.libgit2-15e1193 (x86 - Threads, Https)"
 
             string versionInfo = GlobalSettings.Version.ToString();
 
             // The GlobalSettings.Version returned string should contain :
-            //      version: '0.17.0[-somePreleaseTag]+[gSomeGitCommit.]LibGit2-06d772d' LibGit2Sharp version number.
-            //      git2hash: '06d772d' LibGit2 library hash.
-            //      arch: 'x86' or 'x64' LibGit2 target.
-            //      git2Features: 'Threads, Ssh' LibGit2 features compiled with.
-            string regex = @"^(?<version>\d+\.\d+\.\d+(-[\w\-\.]+)?\+(g(?<git2SharpHash>[a-f0-9]{10})\.)?LibGit2-[a-f0-9]{7}) \((?<arch>\w+) - (?<git2Features>(?:\w*(?:, )*\w+)*)\)$";
+            //      version: '0.25.0[-previewTag]' LibGit2Sharp version number.
+            //      git2SharpHash: '871d13a67f' LibGit2Sharp hash.
+            //      arch: 'x86' or 'x64' libgit2 target.
+            //      git2Features: 'Threads, Ssh' libgit2 features compiled with.
+            string regex = @"^(?<version>\d+\.\d+\.\d+(-[\w\-\.]+)?\+(g(?<git2SharpHash>[a-f0-9]{10})\.)?libgit2-[a-f0-9]{7}) \((?<arch>\w+) - (?<git2Features>(?:\w*(?:, )*\w+)*)\)$";
 
             Assert.NotNull(versionInfo);
 
             Match regexResult = Regex.Match(versionInfo, regex);
 
             Assert.True(regexResult.Success, "The following version string format is enforced:" +
-                                             "Major.Minor.Patch[-somePreleaseTag]+[gSomeGitCommit].LibGit2-abbrev_hash (x86|x64 - features). " +
+                                             "Major.Minor.Patch[-previewTag]+g{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64 - features). " +
                                              "But found \"" + versionInfo + "\" instead.");
         }