diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000..2631460 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,17 @@ + + + Debug + $(MSBuildThisFileDirectory)..\obj\$(MSBuildProjectName)\ + $(MSBuildThisFileDirectory)..\bin\$(MSBuildProjectName)\ + + true + $(NoWarn);CS1591 + false + + + full + + + pdbonly + + diff --git a/src/EnlistmentInfo.targets b/src/Directory.Build.targets similarity index 74% rename from src/EnlistmentInfo.targets rename to src/Directory.Build.targets index 731d7a7..325817f 100644 --- a/src/EnlistmentInfo.targets +++ b/src/Directory.Build.targets @@ -2,8 +2,20 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + $(MSBuildThisFileDirectory)GitLink.ruleset + + + + + + + + + + diff --git a/src/GitLink.Tests/GitLink.Tests.csproj b/src/GitLink.Tests/GitLink.Tests.csproj index b746535..317116a 100644 --- a/src/GitLink.Tests/GitLink.Tests.csproj +++ b/src/GitLink.Tests/GitLink.Tests.csproj @@ -1,51 +1,10 @@ - - + - Debug - AnyCPU - {ED2B9579-59D2-40F2-BC5E-F4DC3DAB9A56} - Library - Properties - GitLink.Tests - GitLink.Tests - v4.5 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - true - full - false - ..\..\output\debug\GitLink.Tests\ - DEBUG;TRACE - prompt - 4 - ..\..\bin\Debug\GitLink.Tests\GitLink.Tests.XML - CS1591 - GitLink.Tests.ruleset - - - pdbonly - true - ..\..\output\release\GitLink.Tests\ - TRACE - prompt - 4 - ..\..\bin\Release\GitLink.Tests\GitLink.Tests.XML - CS1591 - GitLink.Tests.ruleset + net45 + false - - @@ -53,87 +12,19 @@ - - - - - - - - Extensions\RepositoryExtensions.cs - - - - - - - - - - - - - - - - {d68add77-913f-46d2-9a4f-5cc71c4718d8} - GitLink - + - - Always - - - Always - - - Always + + PreserveNewest - - Always - - - - - stylecop.json - - - - - - - - False - - - False - - - False - - - False - - - - - - - \ No newline at end of file diff --git a/src/GitLink.Tests/GitLink.Tests.ruleset b/src/GitLink.Tests/GitLink.Tests.ruleset deleted file mode 100644 index 3094758..0000000 --- a/src/GitLink.Tests/GitLink.Tests.ruleset +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/GitLink.Tests/Providers/VisualStudioTeamServicesProviderFacts.cs b/src/GitLink.Tests/Providers/VisualStudioTeamServicesProviderFacts.cs index 2b4837d..adefe39 100644 --- a/src/GitLink.Tests/Providers/VisualStudioTeamServicesProviderFacts.cs +++ b/src/GitLink.Tests/Providers/VisualStudioTeamServicesProviderFacts.cs @@ -1,5 +1,5 @@ // -------------------------------------------------------------------------------------------------------------------- -// +// // Copyright (c) 2014 - 2014 CatenaLogic. All rights reserved. // // -------------------------------------------------------------------------------------------------------------------- @@ -19,7 +19,7 @@ public void ReturnsValidInitialization() { var provider = new VisualStudioTeamServicesProvider(); var valid = provider.Initialize("https://my-account.visualstudio.com/_git/main-repo"); - + Assert.IsTrue(valid); } diff --git a/src/GitLink/GitLink.ruleset b/src/GitLink.ruleset similarity index 98% rename from src/GitLink/GitLink.ruleset rename to src/GitLink.ruleset index 7bbe483..36f3a1f 100644 --- a/src/GitLink/GitLink.ruleset +++ b/src/GitLink.ruleset @@ -74,6 +74,7 @@ + diff --git a/src/GitLink.sln b/src/GitLink.sln index 1845f2b..35d177f 100644 --- a/src/GitLink.sln +++ b/src/GitLink.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27205.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitLink", "GitLink\GitLink.csproj", "{D68ADD77-913F-46D2-9A4F-5CC71C4718D8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitLink", "GitLink\GitLink.csproj", "{D68ADD77-913F-46D2-9A4F-5CC71C4718D8}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitLink.Tests", "GitLink.Tests\GitLink.Tests.csproj", "{ED2B9579-59D2-40F2-BC5E-F4DC3DAB9A56}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitLinkTask", "GitLinkTask\GitLinkTask.csproj", "{38BFDD5A-8CC2-43B8-96CE-BC572E3DFEF5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitLinkTask", "GitLinkTask\GitLinkTask.csproj", "{38BFDD5A-8CC2-43B8-96CE-BC572E3DFEF5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DADE411A-78DD-4586-B06C-E3991077DF76}" ProjectSection(SolutionItems) = preProject @@ -19,8 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\README.md = ..\README.md EndProjectSection EndProject -Project("{FF286327-C783-4F7A-AB73-9BCBAD0D4460}") = "GitLink.NuGet", "GitLink.NuGet\GitLink.NuGet.nuproj", "{29E78909-B7FB-472C-A9A0-1749A8BE9A9A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,12 +37,11 @@ Global {38BFDD5A-8CC2-43B8-96CE-BC572E3DFEF5}.Debug|Any CPU.Build.0 = Debug|Any CPU {38BFDD5A-8CC2-43B8-96CE-BC572E3DFEF5}.Release|Any CPU.ActiveCfg = Release|Any CPU {38BFDD5A-8CC2-43B8-96CE-BC572E3DFEF5}.Release|Any CPU.Build.0 = Release|Any CPU - {29E78909-B7FB-472C-A9A0-1749A8BE9A9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29E78909-B7FB-472C-A9A0-1749A8BE9A9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29E78909-B7FB-472C-A9A0-1749A8BE9A9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29E78909-B7FB-472C-A9A0-1749A8BE9A9A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {02DDD9FD-8BA4-421D-A234-DF8FDAEC1EE4} + EndGlobalSection EndGlobal diff --git a/src/GitLink/GitLink.csproj b/src/GitLink/GitLink.csproj index 587fb23..6e468c8 100644 --- a/src/GitLink/GitLink.csproj +++ b/src/GitLink/GitLink.csproj @@ -1,107 +1,19 @@ - - - + - Debug - AnyCPU - {D68ADD77-913F-46D2-9A4F-5CC71C4718D8} Exe - Properties - GitLink - GitLink - v4.5 - 512 - - - - true - full - false - bin\debug\ - DEBUG;TRACE - prompt - 4 - false - true - ..\..\bin\Debug\GitLink\GitLink.XML - GitLink.ruleset - CS1591 - - - pdbonly - true - bin\release\ - TRACE - prompt - 4 - false + net45 true - ..\..\bin\Release\GitLink\GitLink.XML - GitLink.ruleset - CS1591 - - GitLink.Program - - Logo.ico + false + GitLink_Inner - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest @@ -112,9 +24,4 @@ - - - - - \ No newline at end of file diff --git a/src/GitLinkTask/GitLinkTask.csproj b/src/GitLinkTask/GitLinkTask.csproj index 966e4ae..655e3e7 100644 --- a/src/GitLinkTask/GitLinkTask.csproj +++ b/src/GitLinkTask/GitLinkTask.csproj @@ -1,86 +1,39 @@ - - - + - Debug - AnyCPU - {38BFDD5A-8CC2-43B8-96CE-BC572E3DFEF5} - Library - Properties - GitLinkTask - GitLinkTask - v4.5 - 512 + net45 + $(NoWarn);CS1998 + GitLink + GeertvanHorrik,AArnott + $(GitVersion_NuGetVersion) + https://github.com/GitTools/GitLink + https://github.com/GitTools/GitLink/blob/$(APPVEYOR_REPO_COMMIT)/LICENSE + git pdb + https://raw.githubusercontent.com/GitTools/GitLink/$(APPVEYOR_REPO_COMMIT)/design/logo/logo_64.png + GitLink let's users step through your code hosted on any Git hosting service! This makes symbol servers obsolete which saves you both time - - AnyCPU - true - full - false - ..\..\output\debug\GitLinkTask\ - DEBUG;TRACE - prompt - 4 - true - 1591;1998 - ..\..\bin\Debug\GitLinkTask\GitLinkTask.XML - GitLinkTask.ruleset - - - AnyCPU - pdbonly - true - ..\..\output\release\GitLinkTask\ - TRACE - prompt - 4 - 1591;1998 - true - ..\..\bin\Release\GitLinkTask\GitLinkTask.XML - GitLinkTask.ruleset - - - - - - - - + + + + all + + + all + + ..\..\lib\Catel.Core.4.3.0\lib\net45\Catel.Core.dll - - - - - + - - PreserveNewest - - - PreserveNewest - - - - + + - - {d68add77-913f-46d2-9a4f-5cc71c4718d8} - GitLink - - - - - {d68add77-913f-46d2-9a4f-5cc71c4718d8} - GitLink - + - \ No newline at end of file diff --git a/src/GitLinkTask/GitLinkTask.ruleset b/src/GitLinkTask/GitLinkTask.ruleset deleted file mode 100644 index a7d6baf..0000000 --- a/src/GitLinkTask/GitLinkTask.ruleset +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/GitLinkTask/LinkPdbToGitRemote.cs b/src/GitLinkTask/LinkPdbToGitRemote.cs index c79c32f..f903762 100644 --- a/src/GitLinkTask/LinkPdbToGitRemote.cs +++ b/src/GitLinkTask/LinkPdbToGitRemote.cs @@ -1,4 +1,6 @@ -// Copyright (c) Andrew Arnott. All rights reserved. +// +// Copyright (c) 2014 - 2016 Andrew Arnott. All rights reserved. +// namespace GitLinkTask { diff --git a/src/GitLinkTask/Properties/AssemblyInfo.cs b/src/GitLinkTask/Properties/AssemblyInfo.cs index ae23dfa..a7f76f5 100644 --- a/src/GitLinkTask/Properties/AssemblyInfo.cs +++ b/src/GitLinkTask/Properties/AssemblyInfo.cs @@ -8,5 +8,5 @@ using System.Reflection; [assembly: AssemblyTitle("GitLinkTask")] -[assembly: AssemblyProduct("GitLinkTask")] -[assembly: AssemblyDescription("GitLinkTask library")] \ No newline at end of file +[assembly: AssemblyProduct("GitLink")] +[assembly: AssemblyDescription("GitLink let's users step through your code hosted on any Git hosting service! This makes symbol servers obsolete which saves you both time")] \ No newline at end of file diff --git a/src/GitLinkTask/GitLink.props b/src/GitLinkTask/build/GitLink.props similarity index 56% rename from src/GitLinkTask/GitLink.props rename to src/GitLinkTask/build/GitLink.props index f8131b3..898b39f 100644 --- a/src/GitLinkTask/GitLink.props +++ b/src/GitLinkTask/build/GitLink.props @@ -3,5 +3,9 @@ true true + + $(MSBuildThisFileDirectory) + netstandard1.5\ + net45\ diff --git a/src/GitLinkTask/GitLink.targets b/src/GitLinkTask/build/GitLink.targets similarity index 68% rename from src/GitLinkTask/GitLink.targets rename to src/GitLinkTask/build/GitLink.targets index aff9d5d..6a7a355 100644 --- a/src/GitLinkTask/GitLink.targets +++ b/src/GitLinkTask/build/GitLink.targets @@ -1,7 +1,10 @@  + + $(GitLinkToolsRootPath)$(GitLinkToolsSubPath) + - +