зеркало из https://github.com/github/VisualStudio.git
Moved logging to GitHub.Logging assembly.
This commit is contained in:
Родитель
a3ba3ddf33
Коммит
8f7bb8a3ef
|
@ -0,0 +1,5 @@
|
|||
<ProjectConfiguration>
|
||||
<Settings>
|
||||
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
|
||||
</Settings>
|
||||
</ProjectConfiguration>
|
14
GitHubVS.sln
14
GitHubVS.sln
|
@ -111,6 +111,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.InlineReviews", "src
|
|||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.InlineReviews.UnitTests", "test\GitHub.InlineReviews.UnitTests\GitHub.InlineReviews.UnitTests.csproj", "{17EB676B-BB91-48B5-AA59-C67695C647C2}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Logging", "src\GitHub.Logging\GitHub.Logging.csproj", "{8D73575A-A89F-47CC-B153-B47DD06837F0}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
@ -461,6 +463,18 @@ Global
|
|||
{17EB676B-BB91-48B5-AA59-C67695C647C2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{17EB676B-BB91-48B5-AA59-C67695C647C2}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{17EB676B-BB91-48B5-AA59-C67695C647C2}.Release|x86.Build.0 = Release|Any CPU
|
||||
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Publish|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Publish|Any CPU.Build.0 = Release|Any CPU
|
||||
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Publish|x86.ActiveCfg = Release|Any CPU
|
||||
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Publish|x86.Build.0 = Release|Any CPU
|
||||
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
@ -50,11 +50,11 @@
|
|||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="ApiClientConfiguration.cs"/>
|
||||
<Compile Include="ApiClientConfiguration.cs" />
|
||||
<Compile Include="..\..\script\src\ApiClientConfiguration_User.cs" Condition="$(Buildtype) == 'Internal'">
|
||||
<Link>ApiClientConfiguration_User.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="ApiClientConfiguration_User.cs" Condition="$(Buildtype) != 'Internal'"/>
|
||||
<Compile Include="ApiClientConfiguration_User.cs" Condition="$(Buildtype) != 'Internal'" />
|
||||
<Compile Include="ILoginCache.cs" />
|
||||
<Compile Include="ILoginManager.cs" />
|
||||
<Compile Include="ITwoFactorChallengeHandler.cs" />
|
||||
|
@ -87,6 +87,10 @@
|
|||
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
|
||||
<Name>GitHub.Extensions</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
|
|
|
@ -17,7 +17,7 @@ using Octokit.Internal;
|
|||
using System.Collections.Generic;
|
||||
using GitHub.Models;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using Serilog;
|
||||
|
||||
namespace GitHub.Api
|
||||
|
|
|
@ -11,7 +11,7 @@ using Akavache;
|
|||
using GitHub.Extensions;
|
||||
using GitHub.Extensions.Reactive;
|
||||
using GitHub.Factories;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Services;
|
||||
using Rothko;
|
||||
using Serilog;
|
||||
|
|
|
@ -5,7 +5,7 @@ using System.Reactive;
|
|||
using System.Reactive.Linq;
|
||||
using Akavache;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Primitives;
|
||||
using Serilog;
|
||||
using Serilog.Core;
|
||||
|
|
|
@ -4,7 +4,7 @@ using System.Globalization;
|
|||
using System.Reactive;
|
||||
using System.Reactive.Linq;
|
||||
using Akavache;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using Serilog;
|
||||
|
||||
namespace GitHub.Caches
|
||||
|
|
|
@ -15,7 +15,7 @@ using System.Reactive.Disposables;
|
|||
using System.Reactive.Linq;
|
||||
using System.Reactive.Subjects;
|
||||
using System.Windows;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
|
||||
namespace GitHub.Controllers
|
||||
{
|
||||
|
|
|
@ -7,7 +7,7 @@ using GitHub.Services;
|
|||
using Octokit;
|
||||
using Octokit.Reactive;
|
||||
using ApiClient = GitHub.Api.ApiClient;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using System.Threading.Tasks;
|
||||
using ILoginCache = GitHub.Caches.ILoginCache;
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ using System.ComponentModel.Composition;
|
|||
using System.Reactive.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using Serilog;
|
||||
|
||||
namespace GitHub.Factories
|
||||
|
|
|
@ -155,7 +155,6 @@
|
|||
<Compile Include="Factories\UIFactory.cs" />
|
||||
<Compile Include="GlobalSuppressions.cs" />
|
||||
<Compile Include="Models\PullRequestFileModel.cs" />
|
||||
<Compile Include="Infrastructure\LogManager.cs" />
|
||||
<Compile Include="Models\PullRequestModel.cs" />
|
||||
<Compile Include="Resources.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
|
@ -307,6 +306,10 @@
|
|||
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
|
||||
<Name>GitHub.Extensions</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj">
|
||||
<Project>{158b05e8-fdbc-4d71-b871-c96e28d5adf5}</Project>
|
||||
<Name>GitHub.UI.Reactive</Name>
|
||||
|
|
|
@ -3,7 +3,7 @@ using Octokit.Internal;
|
|||
using System;
|
||||
using System.Net.Http;
|
||||
|
||||
namespace GitHub.Infrastructure
|
||||
namespace GitHub.Logging
|
||||
{
|
||||
/// <summary>
|
||||
/// Since VS doesn't support dynamic component registration, we have to implement wrappers
|
||||
|
|
|
@ -17,7 +17,7 @@ using System.Linq;
|
|||
using System.Reactive.Threading.Tasks;
|
||||
using System.Collections.Generic;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using Serilog;
|
||||
using ILoginCache = GitHub.Caches.ILoginCache;
|
||||
using System.Threading.Tasks;
|
||||
|
|
|
@ -11,7 +11,7 @@ using GitHub.Authentication;
|
|||
using GitHub.Caches;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Factories;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Primitives;
|
||||
using GitHub.Services;
|
||||
using ReactiveUI;
|
||||
|
|
|
@ -7,7 +7,7 @@ using System.Reactive.Linq;
|
|||
using System.Windows.Media.Imaging;
|
||||
using Akavache;
|
||||
using GitHub.Caches;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Models;
|
||||
using System.Windows;
|
||||
|
|
|
@ -6,7 +6,7 @@ using System.Threading.Tasks;
|
|||
using GitHub.Extensions;
|
||||
using GitHub.Primitives;
|
||||
using LibGit2Sharp;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using Serilog;
|
||||
|
||||
namespace GitHub.Services
|
||||
|
|
|
@ -4,7 +4,7 @@ using System.Threading.Tasks;
|
|||
using Akavache;
|
||||
using GitHub.Caches;
|
||||
using GitHub.Extensions.Reactive;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Primitives;
|
||||
using Octokit;
|
||||
using Serilog;
|
||||
|
|
|
@ -6,7 +6,7 @@ using System.Net;
|
|||
using System.Net.Http;
|
||||
using System.Reactive.Linq;
|
||||
using System.Reactive.Threading.Tasks;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using Octokit;
|
||||
using Octokit.Internal;
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ using GitHub.Caches;
|
|||
using GitHub.Collections;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Extensions.Reactive;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Models;
|
||||
using GitHub.Primitives;
|
||||
using Octokit;
|
||||
|
|
|
@ -15,7 +15,7 @@ using System.Reactive;
|
|||
using System.Collections.Generic;
|
||||
using LibGit2Sharp;
|
||||
using System.Diagnostics;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
|
||||
namespace GitHub.Services
|
||||
{
|
||||
|
|
|
@ -4,7 +4,7 @@ using System.IO;
|
|||
using System.Reactive;
|
||||
using System.Reactive.Linq;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using Microsoft.VisualStudio.Shell;
|
||||
using Serilog;
|
||||
using Rothko;
|
||||
|
|
|
@ -8,7 +8,7 @@ using GitHub.App;
|
|||
using GitHub.Exports;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Extensions.Reactive;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Models;
|
||||
using GitHub.Services;
|
||||
using Octokit;
|
||||
|
|
|
@ -9,7 +9,7 @@ using GitHub.Authentication;
|
|||
using GitHub.Extensions;
|
||||
using GitHub.Extensions.Reactive;
|
||||
using GitHub.Info;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Models;
|
||||
using GitHub.Primitives;
|
||||
using GitHub.Services;
|
||||
|
|
|
@ -18,7 +18,7 @@ using System.Globalization;
|
|||
using GitHub.Extensions;
|
||||
using System.Reactive.Disposables;
|
||||
using System.Reactive;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using Serilog;
|
||||
|
||||
namespace GitHub.ViewModels
|
||||
|
|
|
@ -11,7 +11,7 @@ using GitHub.App;
|
|||
using GitHub.Collections;
|
||||
using GitHub.Exports;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Models;
|
||||
using GitHub.Services;
|
||||
using GitHub.Settings;
|
||||
|
|
|
@ -21,7 +21,7 @@ using System.Collections.ObjectModel;
|
|||
using GitHub.Collections;
|
||||
using GitHub.UI;
|
||||
using GitHub.Extensions.Reactive;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using Serilog;
|
||||
|
||||
namespace GitHub.ViewModels
|
||||
|
|
|
@ -20,7 +20,7 @@ using Octokit;
|
|||
using ReactiveUI;
|
||||
using Rothko;
|
||||
using GitHub.Collections;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using Serilog;
|
||||
|
||||
namespace GitHub.ViewModels
|
||||
|
|
|
@ -10,7 +10,7 @@ using GitHub.App;
|
|||
using GitHub.Exports;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Extensions.Reactive;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Models;
|
||||
using GitHub.Services;
|
||||
using GitHub.UserErrors;
|
||||
|
|
|
@ -10,7 +10,7 @@ using GitHub.App;
|
|||
using GitHub.Exports;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Extensions.Reactive;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Models;
|
||||
using GitHub.Services;
|
||||
using GitHub.Validation;
|
||||
|
|
|
@ -9,7 +9,7 @@ using GitHub.Authentication;
|
|||
using GitHub.Exports;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Info;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Services;
|
||||
using GitHub.Validation;
|
||||
using Octokit;
|
||||
|
|
|
@ -191,6 +191,10 @@
|
|||
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
|
||||
<Name>GitHub.Extensions</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
|
|
|
@ -159,7 +159,6 @@
|
|||
<Compile Include="Extensions\LocalRepositoryModelExtensions.cs" />
|
||||
<Compile Include="Helpers\SettingsStore.cs" />
|
||||
<Compile Include="Helpers\ThreadingHelper.cs" />
|
||||
<Compile Include="Info\ApplicationInfo.cs" />
|
||||
<Compile Include="Models\BranchModel.cs" />
|
||||
<Compile Include="Models\ConnectionDetails.cs" />
|
||||
<Compile Include="Models\CloneDialogResult.cs" />
|
||||
|
@ -261,6 +260,10 @@
|
|||
<Name>GitHub.Extensions</Name>
|
||||
<Private>True</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Settings\generated\IPackageSettings.tt">
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
|
||||
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
|
@ -98,6 +98,10 @@
|
|||
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
|
||||
<Name>GitHub.Extensions</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
|
||||
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
|
||||
|
@ -82,6 +82,10 @@
|
|||
<Project>{252ce1c2-027a-4445-a3c2-e4d6c80a935a}</Project>
|
||||
<Name>Splat-Net45</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
|
|
|
@ -183,6 +183,10 @@
|
|||
<Project>{6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}</Project>
|
||||
<Name>GitHub.Extensions</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj">
|
||||
<Project>{158b05e8-fdbc-4d71-b871-c96e28d5adf5}</Project>
|
||||
<Name>GitHub.UI.Reactive</Name>
|
||||
|
|
|
@ -0,0 +1,79 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{8D73575A-A89F-47CC-B153-B47DD06837F0}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>GitHub</RootNamespace>
|
||||
<AssemblyName>GitHub.Logging</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<ItemGroup>
|
||||
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Serilog.2.3.0\lib\net45\Serilog.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Serilog.Enrichers.Thread, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Serilog.Sinks.File.3.2.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Serilog.Sinks.RollingFile, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Serilog.Sinks.RollingFile.3.3.0\lib\net45\Serilog.Sinks.RollingFile.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\common\SolutionInfo.cs">
|
||||
<Link>Properties\SolutionInfo.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="Info\ApplicationInfo.cs" />
|
||||
<Compile Include="Logging\LogManager.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
|
@ -1,19 +1,19 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Info;
|
||||
using Serilog;
|
||||
using Serilog.Core;
|
||||
|
||||
namespace GitHub.Infrastructure
|
||||
namespace GitHub.Logging
|
||||
{
|
||||
public static class LogManager
|
||||
{
|
||||
static Logger CreateLogger()
|
||||
{
|
||||
var environment = new Rothko.Environment();
|
||||
var logPath = Path.Combine(environment.GetLocalGitHubApplicationDataPath(), "extension.log");
|
||||
var logPath = Path.Combine(
|
||||
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||
ApplicationInfo.ApplicationName,
|
||||
"extension.log");
|
||||
|
||||
const string outputTemplate =
|
||||
"{Timestamp:yyyy-MM-dd HH:mm:ss.fff}|{Level}|Thread:{ThreadId}|{SourceContext}|{Message}{NewLine}{Exception}";
|
|
@ -0,0 +1,4 @@
|
|||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyTitle("GitHub.Logging")]
|
||||
[assembly: AssemblyDescription("")]
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Serilog" version="2.3.0" targetFramework="net452" requireReinstallation="true" />
|
||||
<package id="Serilog.Enrichers.Thread" version="3.0.0" targetFramework="net452" />
|
||||
<package id="Serilog.Sinks.File" version="3.2.0" targetFramework="net452" />
|
||||
<package id="Serilog.Sinks.RollingFile" version="3.3.0" targetFramework="net452" />
|
||||
</packages>
|
|
@ -85,6 +85,10 @@
|
|||
<Project>{9aea02db-02b5-409c-b0ca-115d05331a6b}</Project>
|
||||
<Name>GitHub.Exports</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.UI\GitHub.UI.csproj">
|
||||
<Project>{346384dd-2445-4a28-af22-b45f3957bd89}</Project>
|
||||
<Name>GitHub.UI</Name>
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<ItemGroup>
|
||||
<Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
|
||||
|
@ -172,6 +172,10 @@
|
|||
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
|
||||
<Name>GitHub.Extensions</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.VisualStudio.UI\GitHub.VisualStudio.UI.csproj">
|
||||
<Project>{d1dfbb0c-b570-4302-8f1e-2e3a19c41961}</Project>
|
||||
<Name>GitHub.VisualStudio.UI</Name>
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<ItemGroup>
|
||||
<Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
|
||||
|
@ -237,6 +237,10 @@
|
|||
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
|
||||
<Name>GitHub.Extensions</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.VisualStudio.UI\GitHub.VisualStudio.UI.csproj">
|
||||
<Project>{d1dfbb0c-b570-4302-8f1e-2e3a19c41961}</Project>
|
||||
<Name>GitHub.VisualStudio.UI</Name>
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
|
||||
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<ItemGroup>
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
|
@ -176,6 +176,10 @@
|
|||
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
|
||||
<Name>GitHub.Extensions</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.UI\GitHub.UI.csproj">
|
||||
<Project>{346384DD-2445-4A28-AF22-B45F3957BD89}</Project>
|
||||
<Name>GitHub.UI</Name>
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
|
||||
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<Import Project="$(SolutionDir)\src\common\signing.props" />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Expression.Blend.Sdk.WPF.1.0.1\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>
|
||||
|
@ -254,6 +254,10 @@
|
|||
<Project>{6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}</Project>
|
||||
<Name>GitHub.Extensions</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
|
|
|
@ -230,6 +230,10 @@
|
|||
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
|
||||
<Name>GitHub.Extensions</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.UI\GitHub.UI.csproj">
|
||||
<Project>{346384dd-2445-4a28-af22-b45f3957bd89}</Project>
|
||||
<Name>GitHub.UI</Name>
|
||||
|
|
|
@ -652,6 +652,10 @@
|
|||
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
|
||||
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
|
||||
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
|
||||
<Name>GitHub.Logging</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GitHub.InlineReviews\GitHub.InlineReviews.csproj">
|
||||
<Project>{7f5ed78b-74a3-4406-a299-70cfb5885b8b}</Project>
|
||||
<Name>GitHub.InlineReviews</Name>
|
||||
|
|
|
@ -4,7 +4,7 @@ using Microsoft.VisualStudio.TextManager.Interop;
|
|||
using System;
|
||||
using System.ComponentModel.Composition;
|
||||
using System.Diagnostics;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
|
||||
namespace GitHub.VisualStudio
|
||||
{
|
||||
|
|
|
@ -3,7 +3,7 @@ using GitHub.UI;
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
using GitHub.Extensions;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
|
||||
namespace GitHub.VisualStudio.Menus
|
||||
{
|
||||
|
|
|
@ -15,10 +15,16 @@ using Microsoft.VisualStudio.Shell;
|
|||
OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = AssemblyVersionInformation.Version)]
|
||||
[assembly: ProvideBindingRedirection(AssemblyName = "GitHub.Extensions", CodeBase = @"$PackageFolder$\GitHub.Extensions.dll",
|
||||
OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = AssemblyVersionInformation.Version)]
|
||||
[assembly: ProvideBindingRedirection(AssemblyName = "GitHub.Logging", CodeBase = @"$PackageFolder$\GitHub.Logging.dll",
|
||||
OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = AssemblyVersionInformation.Version)]
|
||||
|
||||
[assembly: ProvideCodeBase(AssemblyName = "Octokit", CodeBase = @"$PackageFolder$\Octokit.dll")]
|
||||
[assembly: ProvideCodeBase(AssemblyName = "LibGit2Sharp", CodeBase = @"$PackageFolder$\LibGit2Sharp.dll")]
|
||||
[assembly: ProvideCodeBase(AssemblyName = "Splat", CodeBase = @"$PackageFolder$\Splat.dll")]
|
||||
[assembly: ProvideCodeBase(AssemblyName = "Rothko", CodeBase = @"$PackageFolder$\Rothko.dll")]
|
||||
[assembly: ProvideCodeBase(AssemblyName = "Serilog", CodeBase = @"$PackageFolder$\Serilog.dll")]
|
||||
[assembly: ProvideCodeBase(AssemblyName = "Serilog.Enrichers.Thread", CodeBase = @"$PackageFolder$\Serilog.Enrichers.Thread.dll")]
|
||||
[assembly: ProvideCodeBase(AssemblyName = "Serilog.Sinks.File", CodeBase = @"$PackageFolder$\Serilog.Sinks.File.dll")]
|
||||
[assembly: ProvideCodeBase(AssemblyName = "Serilog.Sinks.RollingFile", CodeBase = @"$PackageFolder$\Serilog.Sinks.RollingFile.dll")]
|
||||
[assembly: ProvideCodeBase(AssemblyName = "Markdig", CodeBase = @"$PackageFolder$\Markdig.dll")]
|
||||
[assembly: ProvideCodeBase(AssemblyName = "Markdig.Wpf", CodeBase = @"$PackageFolder$\Markdig.Wpf.dll")]
|
||||
|
|
|
@ -8,7 +8,7 @@ using System.Diagnostics.CodeAnalysis;
|
|||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Reactive.Disposables;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.Models;
|
||||
using GitHub.Exports;
|
||||
using GitHub.Services;
|
||||
|
@ -18,7 +18,7 @@ using Task = System.Threading.Tasks.Task;
|
|||
using System.Threading.Tasks;
|
||||
using GitHub.Extensions;
|
||||
using Serilog;
|
||||
using Log = GitHub.Infrastructure.Log;
|
||||
using Log = GitHub.Logging.Log;
|
||||
|
||||
namespace GitHub.VisualStudio
|
||||
{
|
||||
|
|
|
@ -15,7 +15,7 @@ using ReactiveUI;
|
|||
using GitHub.App.Factories;
|
||||
using GitHub.Exports;
|
||||
using GitHub.Controllers;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using Serilog;
|
||||
|
||||
namespace GitHub.VisualStudio.UI
|
||||
|
|
|
@ -10,7 +10,7 @@ using GitHub.Models;
|
|||
using GitHub.UI;
|
||||
using GitHub.ViewModels;
|
||||
using System.Diagnostics;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
using GitHub.VisualStudio.UI.Views;
|
||||
|
||||
namespace GitHub.VisualStudio.UI
|
||||
|
|
|
@ -17,7 +17,7 @@ using ReactiveUI;
|
|||
using System.ComponentModel.Composition;
|
||||
using GitHub.Services;
|
||||
using System.Linq;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
|
||||
namespace GitHub.VisualStudio.UI.Views.Controls
|
||||
{
|
||||
|
|
|
@ -13,7 +13,7 @@ using System.Diagnostics;
|
|||
using System.Reactive.Linq;
|
||||
using System.Windows;
|
||||
using System.Reactive.Disposables;
|
||||
using GitHub.Infrastructure;
|
||||
using GitHub.Logging;
|
||||
|
||||
namespace GitHub.VisualStudio.UI.Views
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче