Skip to content
This repository was archived by the owner on Jun 27, 2019. It is now read-only.

Commit 8dbab2c

Browse files
dazinatordazinator
authored
Merge pull request #42 from GitTools/feature/netstandard
Added NetStandard and Upgraded solution.
2 parents 43121d6 + 63ee2ac commit 8dbab2c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+335
-4593
lines changed

‎.travis.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
language: csharp
22
solution: src/GitTools.Core.sln
33
sudo: false
4+
dotnet: 1.0.3
5+
dist: trusty
6+
mono: none
7+
addons:
8+
apt:
9+
sources:
10+
- sourceline: 'deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main'
11+
key_url: 'https://apt-mo.trafficmanager.net/keys/microsoft.asc'
12+
packages:
13+
- dotnet-dev-1.0.3
414
install:
515
# - sudo nuget update -self
6-
- nuget restore src/GitTools.Core.sln
7-
- nuget install NUnit.Runners -Version 3.2.1 -OutputDirectory ./src/packages
16+
- dotnet restore "./src/GitTools.Core.sln"
817
script:
9-
- xbuild ./src/GitTools.Core.sln /property:Configuration="Debug" /verbosity:detailed
10-
- mono --debug --runtime=v4.0.30319 ./src/packages/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe ./output/debug/GitTools.Core.Tests/net45/GitTools.Core.Tests.dll -where "cat != NoMono"
18+
- dotnet restore "./src/GitTools.Core.Tests/GitTools.Core.Tests.csproj" /p:TargetFramework=netcoreapp1.1 /verbosity:detailed
19+
- dotnet build "./src/GitTools.Core.Tests/GitTools.Core.Tests.csproj" --configuration Debug --framework netcoreapp1.1 /verbosity:detailed
20+
- dotnet test "./src/GitTools.Core.Tests/GitTools.Core.Tests.csproj" --framework netcoreapp1.1 --filter TestCategory!=NoMono
21+
# - mono --debug --runtime=v4.0.30319 %userprofile%.nuget/packages/nunit.consolerunner/3.6.1/tools/nunit3-console.exe ./output/debug/GitTools.Core.Tests/net45/GitTools.Core.Tests.dll -where "cat != NoMono"

‎appveyor.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
1+
environment:
2+
path_to_sln: src/GitTools.Core.sln
3+
14
install:
25
- choco install gitversion.portable -pre -y
36
- cinst gitlink -y
47

5-
platform:
6-
- Any CPU
7-
8-
configuration:
9-
- Release
8+
platform: Any CPU
9+
configuration: Release
10+
image: Visual Studio 2017
1011

1112
assembly_info:
1213
patch: false
1314

1415
before_build:
15-
- nuget restore src\
1616
- ps: gitversion /l console /output buildserver /updateAssemblyInfo src\SolutionAssemblyInfo.cs
17+
- cmd: msbuild %path_to_sln% /t:restore /p:PackageVersion=%GitVersion_NuGetVersion% /p:Configuration=Release /p:Platform="Any CPU"
1718

18-
build:
19-
project: src\GitTools.Core.sln
19+
build_script:
20+
- cmd: msbuild %path_to_sln% /t:Build /p:Configuration=Release /p:Platform="Any CPU"
2021

2122
after_build:
22-
- cmd: gitlink . -u https://github.com/gittools/gittools.core -b %APPVEYOR_REPO_BRANCH% -s %APPVEYOR_REPO_COMMIT% -f src\GitTools.Core.sln
23-
- cmd: nuget pack src\GitTools.Core\GitTools.Core.nuspec -BasePath output\%CONFIGURATION%\GitTools.Core\ -version "%GitVersion_NuGetVersion%"
23+
- cmd: gitlink . -u https://github.com/gittools/gittools.core -b %APPVEYOR_REPO_BRANCH% -s %APPVEYOR_REPO_COMMIT% -f %path_to_sln%
24+
- cmd: msbuild %path_to_sln% /t:Pack /p:PackageVersion=%GitVersion_NuGetVersion% /p:PackageOutputPath="%APPVEYOR_BUILD_FOLDER%"
2425
- cmd: appveyor PushArtifact "GitTools.Core.%GitVersion_NuGetVersion%.nupkg"
2526

2627
cache:
27-
- src\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
28+
- src\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified

‎src/GitTools.Core.Tests/Git/GitRepositoryHelperTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,10 @@ public void GitHubFlowMajorRelease()
219219
fixture.ApplyTag("2.0.0");
220220
// fixture.AssertFullSemver("2.0.0");
221221
fixture.MakeACommit();
222+
223+
#if !NETCOREAPP1_1
222224
fixture.Repository.DumpGraph();
225+
#endif
223226
// fixture.AssertFullSemver("2.0.1+1");
224227
}
225228
}

‎src/GitTools.Core.Tests/GitTools.Core.Tests.csproj

Lines changed: 38 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,58 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props')" />
4-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project Sdk="Microsoft.NET.Sdk">
53
<PropertyGroup>
64
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}</ProjectGuid>
5+
<Platform Condition=" '$(Platform)' == '' ">Any CPU</Platform>
6+
97
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>GitTools.Tests</RootNamespace>
12-
<AssemblyName>GitTools.Core.Tests</AssemblyName>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
<LangVersion>5</LangVersion>
16-
<NuGetPackageImportStamp>
17-
</NuGetPackageImportStamp>
8+
<TargetFramework>net46</TargetFramework>
9+
<TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
10+
<!--<TargetFramework>netcoreapp1.1;net46</TargetFramework>-->
1811
</PropertyGroup>
1912
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2013
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>..\..\output\debug\GitTools.Core.Tests\net45\</OutputPath>
24-
<DefineConstants>TRACE;DEBUG</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
28-
<NoWarn>1591,1701</NoWarn>
14+
<DebugType>full</DebugType>
15+
<OutputPath>..\..\output\debug\GitTools.Core.Tests\$(TargetFramework)\</OutputPath>
16+
<DefineConstants>TRACE;DEBUG</DefineConstants>
2917
</PropertyGroup>
3018
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3119
<DebugType>pdbonly</DebugType>
3220
<Optimize>true</Optimize>
33-
<OutputPath>..\..\output\release\GitTools.Core.Tests\net45\</OutputPath>
34-
<DefineConstants>TRACE</DefineConstants>
35-
<ErrorReport>prompt</ErrorReport>
36-
<WarningLevel>4</WarningLevel>
37-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
38-
<NoWarn>1591</NoWarn>
21+
<OutputPath>..\..\output\release\GitTools.Core.Tests\$(TargetFramework)\</OutputPath>
22+
<DefineConstants>TRACE</DefineConstants>
3923
</PropertyGroup>
40-
<ItemGroup>
41-
<Reference Include="Atlassian.Jira, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\packages\Atlassian.SDK.2.5.0\lib\Atlassian.Jira.dll</HintPath>
44-
</Reference>
45-
<Reference Include="GitTools.Testing, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\GitTools.Testing.1.1.1-beta0001\lib\net4\GitTools.Testing.dll</HintPath>
47-
<Private>True</Private>
48-
</Reference>
49-
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
50-
<HintPath>..\packages\LibGit2Sharp.0.23.0-pre20160922233542\lib\net40\LibGit2Sharp.dll</HintPath>
51-
<Private>True</Private>
52-
</Reference>
53-
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
54-
<HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
55-
<Private>True</Private>
56-
</Reference>
57-
<Reference Include="Shouldly, Version=2.8.2.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
58-
<HintPath>..\packages\Shouldly.2.8.2\lib\net40\Shouldly.dll</HintPath>
59-
<Private>True</Private>
60-
</Reference>
61-
<Reference Include="System" />
62-
<Reference Include="System.Core" />
63-
<Reference Include="System.Net.Http" />
64-
<Reference Include="System.Xml.Linq" />
65-
<Reference Include="System.Data.DataSetExtensions" />
66-
<Reference Include="Microsoft.CSharp" />
67-
<Reference Include="System.Data" />
68-
<Reference Include="System.Xml" />
24+
25+
<ItemGroup>
26+
<PackageReference Include="Dazinator.GitTools.Testing.Netstandard" Version="1.1.1-beta0001temp" />
27+
<PackageReference Include="NUnit" Version="3.7.1" />
28+
<PackageReference Include="NUnit.ConsoleRunner" Version="3.7.0" />
29+
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.*" />
31+
<PackageReference Include="Shouldly" Version="2.8.3" />
6932
</ItemGroup>
70-
<ItemGroup>
71-
<Compile Include="..\SolutionAssemblyInfo.cs">
72-
<Link>Properties\SolutionAssemblyInfo.cs</Link>
73-
</Compile>
74-
<Compile Include="Git\Extensions\AuthenticationInfoExtensionsTests.cs" />
75-
<Compile Include="Git\GitDirFinderTests.cs" />
76-
<Compile Include="Git\GitRepositoryHelperTests.cs" />
77-
<Compile Include="Git\DynamicRepositoriesTests.cs" />
78-
<Compile Include="GlobalInitialization.cs" />
79-
<Compile Include="Properties\AssemblyInfo.cs" />
33+
34+
<ItemGroup Condition=" '$(Configuration)' == 'netcoreapp1.1' ">
35+
<PackageReference Include="Atlassian.SDK" Version="9.5.0" />
8036
</ItemGroup>
81-
<ItemGroup>
82-
<ProjectReference Include="..\GitTools.Core\GitTools.Core.NET40\GitTools.Core.NET40.csproj">
83-
<Project>{C11252F9-0ECA-44DC-860B-E029C04FBD10}</Project>
84-
<Name>GitTools.Core.NET40</Name>
85-
</ProjectReference>
37+
38+
<ItemGroup Condition=" '$(Configuration)' == 'net46' ">
39+
<PackageReference Include="Atlassian.SDK" Version="2.5.0" />
8640
</ItemGroup>
41+
42+
43+
8744
<ItemGroup>
88-
<None Include="app.config" />
89-
<None Include="packages.config" />
90-
</ItemGroup>
45+
<ProjectReference Include="..\GitTools.Core\GitTools.Core.csproj" />
46+
</ItemGroup>
47+
9148
<ItemGroup>
92-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
93-
</ItemGroup>
94-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
95-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
96-
<PropertyGroup>
97-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
98-
</PropertyGroup>
99-
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props'))" />
100-
</Target>
49+
<Folder Include="Properties\" />
50+
</ItemGroup>
51+
52+
<ItemGroup>
53+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
54+
</ItemGroup>
55+
10156
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
10257
Other similar extension points exist, see Microsoft.Common.targets.
10358
<Target Name="BeforeBuild">

‎src/GitTools.Core.Tests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/GitTools.Core.Tests/app.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="LibGit2Sharp" publicKeyToken="7cbde695407f0333" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-0.23.0.0" newVersion="0.23.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-0.24.0.0" newVersion="0.24.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>
11-
</configuration>
11+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>

‎src/GitTools.Core.Tests/packages.config

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/GitTools.Core.sln

Lines changed: 14 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,41 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26430.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".misc", ".misc", "{72ECAB81-A674-4AC8-8795-7AD71C3E1A5A}"
77
ProjectSection(SolutionItems) = preProject
8+
..\.gitattributes = ..\.gitattributes
9+
..\.gitignore = ..\.gitignore
810
..\.travis.yml = ..\.travis.yml
911
..\appveyor.yml = ..\appveyor.yml
1012
GitTools.Core.sln.DotSettings = GitTools.Core.sln.DotSettings
1113
..\GitVersionConfig.yaml = ..\GitVersionConfig.yaml
1214
..\README.md = ..\README.md
1315
Settings.StyleCop = Settings.StyleCop
1416
SolutionAssemblyInfo.cs = SolutionAssemblyInfo.cs
15-
..\.gitattributes = ..\.gitattributes
16-
..\.gitignore = ..\.gitignore
1717
EndProjectSection
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.Core.Tests", "GitTools.Core.Tests\GitTools.Core.Tests.csproj", "{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitTools.Core", "GitTools.Core\GitTools.Core.csproj", "{DD19E93F-C6CC-4748-9EF8-146101AA7F59}"
2020
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.Core.NET40", "GitTools.Core\GitTools.Core.NET40\GitTools.Core.NET40.csproj", "{C11252F9-0ECA-44DC-860B-E029C04FBD10}"
22-
EndProject
23-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitTools.Core", "GitTools.Core", "{753DD689-12ED-42D8-8AF7-936336D65FA0}"
24-
ProjectSection(SolutionItems) = preProject
25-
GitTools.Core\GitTools.Core.nuspec = GitTools.Core\GitTools.Core.nuspec
26-
EndProjectSection
27-
EndProject
28-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTools.Core.NET45", "GitTools.Core\GitTools.Core.NET45\GitTools.Core.NET45.csproj", "{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}"
29-
EndProject
30-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "GitTools.Core.Shared", "GitTools.Core\GitTools.Core.Shared\GitTools.Core.Shared.shproj", "{C4B449DF-3E78-4F3B-81A8-DE0DC5827532}"
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitTools.Core.Tests", "GitTools.Core.Tests\GitTools.Core.Tests.csproj", "{47DE8A01-26B5-4907-9D32-9DA5F80F3B55}"
3122
EndProject
3223
Global
33-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
34-
GitTools.Core\GitTools.Core.Shared\GitTools.Core.Shared.projitems*{66295d7c-58fd-4641-aeab-3df7ea8fa4d2}*SharedItemsImports = 4
35-
GitTools.Core\GitTools.Core.Shared\GitTools.Core.Shared.projitems*{c4b449df-3e78-4f3b-81a8-de0dc5827532}*SharedItemsImports = 13
36-
GitTools.Core\GitTools.Core.Shared\GitTools.Core.Shared.projitems*{c11252f9-0eca-44dc-860b-e029c04fbd10}*SharedItemsImports = 4
37-
EndGlobalSection
3824
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3925
Debug|Any CPU = Debug|Any CPU
4026
Release|Any CPU = Release|Any CPU
4127
EndGlobalSection
4228
GlobalSection(ProjectConfigurationPlatforms) = postSolution
43-
{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44-
{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}.Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}.Release|Any CPU.ActiveCfg = Release|Any CPU
46-
{0834BE9B-5CDE-4CAB-A683-C70A7D91450B}.Release|Any CPU.Build.0 = Release|Any CPU
47-
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48-
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Debug|Any CPU.Build.0 = Debug|Any CPU
49-
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Release|Any CPU.ActiveCfg = Release|Any CPU
50-
{C11252F9-0ECA-44DC-860B-E029C04FBD10}.Release|Any CPU.Build.0 = Release|Any CPU
51-
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52-
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
53-
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
54-
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{DD19E93F-C6CC-4748-9EF8-146101AA7F59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{DD19E93F-C6CC-4748-9EF8-146101AA7F59}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{DD19E93F-C6CC-4748-9EF8-146101AA7F59}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{DD19E93F-C6CC-4748-9EF8-146101AA7F59}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{47DE8A01-26B5-4907-9D32-9DA5F80F3B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{47DE8A01-26B5-4907-9D32-9DA5F80F3B55}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{47DE8A01-26B5-4907-9D32-9DA5F80F3B55}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{47DE8A01-26B5-4907-9D32-9DA5F80F3B55}.Release|Any CPU.Build.0 = Release|Any CPU
5537
EndGlobalSection
5638
GlobalSection(SolutionProperties) = preSolution
5739
HideSolutionNode = FALSE
5840
EndGlobalSection
59-
GlobalSection(NestedProjects) = preSolution
60-
{C11252F9-0ECA-44DC-860B-E029C04FBD10} = {753DD689-12ED-42D8-8AF7-936336D65FA0}
61-
{66295D7C-58FD-4641-AEAB-3DF7EA8FA4D2} = {753DD689-12ED-42D8-8AF7-936336D65FA0}
62-
{C4B449DF-3E78-4F3B-81A8-DE0DC5827532} = {753DD689-12ED-42D8-8AF7-936336D65FA0}
63-
EndGlobalSection
6441
EndGlobal

‎src/GitTools.Core/GitTools.Core.Shared/Diposable.cs renamed to ‎src/GitTools.Core/Diposable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/// </summary>
99
public abstract class Disposable : IDisposable
1010
{
11-
static readonly ILog Log = LogProvider.GetCurrentClassLogger();
11+
static readonly ILog Log = LogProvider.GetLogger(typeof(Disposable));
1212

1313
readonly object _syncRoot = new object();
1414

‎src/GitTools.Core/GitTools.Core.Shared/Exceptions/GitToolsException.cs renamed to ‎src/GitTools.Core/Exceptions/GitToolsException.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
namespace GitTools
22
{
33
using System;
4+
using System.Runtime.Serialization;
45

6+
[Serializable]
57
public class GitToolsException : Exception
68
{
79
public GitToolsException(string messageFormat, params object[] args)
@@ -12,5 +14,12 @@ public GitToolsException(string message, Exception innerException)
1214
: base(message, innerException)
1315
{
1416
}
17+
18+
#if NETDESKTOP
19+
protected GitToolsException(SerializationInfo info, StreamingContext context)
20+
: base(info, context)
21+
{
22+
}
23+
#endif
1524
}
1625
}

0 commit comments

Comments
 (0)