Merge pull request #1318 from AArnott/portable

Target .NET Standard 1.3

Author: ethomson

.gitignore

@@ -36,10 +36,5 @@ _ReSharper*/
 *.userprefs
 *.swp
 *.DotSettings
-#Ignore custom generated files
-LibGit2Sharp/Core/UniqueIdentifier.cs
-LibGit2Sharp/Core/NativeDllName.cs
 
-!nuget.package/build/
 _NCrunch_LibGit2Sharp/
-packages/

.nuget/packages.config

@@ -2,31 +2,25 @@
 # see travis-ci.org for details
 
 language: csharp
-mono:
- - 4.8.0
+dist: trusty
+dotnet: 1.0.1
+mono: none
 
 os:
  - osx
  - linux
 
-env:
- global:
-  - MONO_OPTIONS=--debug
-
-install:
-  - curl -L -o nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-  - mono nuget.exe restore LibGit2Sharp.sln
-
 before_install:
  - date -u
  - uname -a
  - env | sort
 
-solution: LibGit2Sharp.sln
+install:
+ - git fetch --unshallow
 
 # Build libgit2, LibGit2Sharp and run the tests
 script:
- - ./build.libgit2sharp.sh 'LEAKS_IDENTIFYING'
+ - ./buildandtest.sh 'LEAKS_IDENTIFYING'
 
 # Only watch the development branch
 branches:

.travis.yml

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard1.5</TargetFramework>
+    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
+    <IsPackable>false</IsPackable>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CodeGeneration.Roslyn" Version="$(CodeGenerationRoslynVersion)" />
+  </ItemGroup>
+</Project>

CI/build.msbuild

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net40;netstandard1.0</TargetFrameworks>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\libgit2sharp.snk</AssemblyOriginatorKeyFile>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CodeGeneration.Roslyn.Attributes" Version="$(CodeGenerationRoslynVersion)" />
+  </ItemGroup>
+</Project>

CodeGeneration/CodeGeneration.csproj

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+
+namespace LibGit2Sharp
+{
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.ReturnValue, AllowMultiple = false)]
+    [Conditional("CodeGeneration")]
+    public class CustomMarshalerAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CustomMarshalerAttribute"/> class.
+        /// </summary>
+        /// <param name="customMarshaler">The type that derives from ICustomMarshaler.</param>
+        /// <param name="friendlyType">The type to expose in the generated overload.</param>
+        public CustomMarshalerAttribute(Type customMarshaler, Type friendlyType)
+        {   
+        }
+    }
+}

CodeGeneration/OfferFriendlyInteropOverloadsGenerator.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Diagnostics;
+using CodeGeneration.Roslyn;
+
+namespace LibGit2Sharp
+{
+    /// <summary>
+    /// Causes generation of an overload of a P/Invoke method that has a more friendly signature.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+    [CodeGenerationAttribute("CodeGeneration.OfferFriendlyInteropOverloadsGenerator, CodeGeneration, Version=" + ThisAssembly.AssemblyVersion + ", Culture=neutral, PublicKeyToken=null")]
+    [Conditional("CodeGeneration")]
+    public class OfferFriendlyInteropOverloadsAttribute : Attribute
+    {
+    }
+}

CodeGenerationAttributes/CodeGenerationAttributes.csproj

@@ -0,0 +1,12 @@
+<Project>
+  <PropertyGroup>
+    <OutputPath>$(MSBuildThisFileDirectory)bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
+    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+
+    <CodeGenerationRoslynVersion>0.3.13-gfce1c8ba1e</CodeGenerationRoslynVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="1.6.25" PrivateAssets="all" />
+  </ItemGroup>
+</Project>

CodeGenerationAttributes/CustomMarshalerAttribute.cs

@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <PublicSign Condition=" '$(AssemblyOriginatorKeyFile)' != '' and '$(OS)' != 'Windows_NT' ">true</PublicSign>
+  </PropertyGroup>
+</Project>

CodeGenerationAttributes/OfferFriendlyInteropOverloadsAttribute.cs

@@ -30,8 +30,8 @@ public void CanArchiveACommitWithDirectoryAsTar()
 
                 repo.ObjectDatabase.Archive(commit, archivePath);
 
-                using (var expectedStream = new StreamReader(Path.Combine(ResourcesDirectory.FullName, "expected_archives/commit_with_directory.tar")))
-                using (var actualStream = new StreamReader(archivePath))
+                using (var expectedStream = new StreamReader(File.OpenRead(Path.Combine(ResourcesDirectory.FullName, "expected_archives/commit_with_directory.tar"))))
+                using (var actualStream = new StreamReader(File.OpenRead(archivePath)))
                 {
                     string expected = expectedStream.ReadToEnd();
                     string actual = actualStream.ReadToEnd();

Directory.Build.props

@@ -1113,7 +1113,7 @@ public void TrackedBranchExistsFromDefaultConfigInEmptyClone()
 
             using (var emptyRepo = new Repository(repoPath))
             {
-                uri = new Uri(emptyRepo.Info.Path);
+                uri = new Uri($"file://{emptyRepo.Info.Path}");
             }
 
             SelfCleaningDirectory scd2 = BuildSelfCleaningDirectory();