Skip to content

Refactor common files #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmat merged 1 commit into from
Dec 15, 2023
Merged

Refactor common files #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 44 additions & 20 deletions SourceLink.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29011.400
# Visual Studio Version 17
VisualStudioVersion = 17.9.34322.126
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Tasks.Git", "src\Microsoft.Build.Tasks.Git\Microsoft.Build.Tasks.Git.csproj", "{A86F9DC3-9595-44AC-ACC6-025FB74813E6}"
EndProject
Expand Down Expand Up @@ -33,19 +33,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SourceLink.GitLab
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SourceLink.GitLab.UnitTests", "src\SourceLink.GitLab.UnitTests\Microsoft.SourceLink.GitLab.UnitTests.csproj", "{46C6BD7C-ABB7-4444-B095-C63868FACC41}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{7621150D-714B-4C87-8834-199A0495B92F}"
ProjectSection(SolutionItems) = preProject
src\Common\CommonResources.resx = src\Common\CommonResources.resx
src\Common\GetSourceLinkUrlGitTask.cs = src\Common\GetSourceLinkUrlGitTask.cs
src\Common\Names.cs = src\Common\Names.cs
src\Common\NullableAttributes.cs = src\Common\NullableAttributes.cs
src\Common\PathUtilities.cs = src\Common\PathUtilities.cs
src\Common\SequenceComparer.cs = src\Common\SequenceComparer.cs
src\Common\TeamFoundationUrlParser.cs = src\Common\TeamFoundationUrlParser.cs
src\Common\TranslateRepositoryUrlGitTask.cs = src\Common\TranslateRepositoryUrlGitTask.cs
src\Common\UriUtilities.cs = src\Common\UriUtilities.cs
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SourceLink.Bitbucket.Git", "src\SourceLink.Bitbucket.Git\Microsoft.SourceLink.Bitbucket.Git.csproj", "{9138BCAB-41BC-4DED-8A3F-7EB4177CDCE1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SourceLink.Bitbucket.Git.UnitTests", "src\SourceLink.Bitbucket.Git.UnitTests\Microsoft.SourceLink.Bitbucket.Git.UnitTests.csproj", "{97AD20FC-9526-4579-8E95-47890FE12783}"
Expand Down Expand Up @@ -74,12 +61,39 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SourceLink.Gitee"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SourceLink.Gitee.UnitTests", "src\SourceLink.Gitee.UnitTests\Microsoft.SourceLink.Gitee.UnitTests.csproj", "{D647294C-40C0-4624-A76B-C4C276233609}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{4BB63B07-D1DD-48CF-845F-34B3BBB0F596}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureDevOps", "AzureDevOps", "{8A4D5938-D99A-4BEC-8C02-4BF69E70D720}"
ProjectSection(SolutionItems) = preProject
src\Common\AzureDevOps\AzureDevOpsUrlParser.cs = src\Common\AzureDevOps\AzureDevOpsUrlParser.cs
src\Common\AzureDevOps\Items.props = src\Common\AzureDevOps\Items.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitProvider", "GitProvider", "{59A2C2E8-AE72-46C4-B51C-4244D6451597}"
ProjectSection(SolutionItems) = preProject
src\Common\GitProvider\CommonResources.resx = src\Common\GitProvider\CommonResources.resx
src\Common\GitProvider\GetSourceLinkUrlGitTask.cs = src\Common\GitProvider\GetSourceLinkUrlGitTask.cs
src\Common\GitProvider\Items.props = src\Common\GitProvider\Items.props
src\Common\GitProvider\TranslateRepositoryUrlGitTask.cs = src\Common\GitProvider\TranslateRepositoryUrlGitTask.cs
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{F351EFBE-DAEE-437A-A492-4F1434489693}"
ProjectSection(SolutionItems) = preProject
src\Common\Utilities\Hash.cs = src\Common\Utilities\Hash.cs
src\Common\Utilities\Index.cs = src\Common\Utilities\Index.cs
src\Common\Utilities\IsExternalInit.cs = src\Common\Utilities\IsExternalInit.cs
src\Common\Utilities\Names.cs = src\Common\Utilities\Names.cs
src\Common\Utilities\NullableAttributes.cs = src\Common\Utilities\NullableAttributes.cs
src\Common\Utilities\PathUtilities.cs = src\Common\Utilities\PathUtilities.cs
src\Common\Utilities\Range.cs = src\Common\Utilities\Range.cs
src\Common\Utilities\RequiredMemberAttribute.cs = src\Common\Utilities\RequiredMemberAttribute.cs
src\Common\Utilities\SequenceComparer.cs = src\Common\Utilities\SequenceComparer.cs
src\Common\Utilities\SetsRequiredMembersAttribute.cs = src\Common\Utilities\SetsRequiredMembersAttribute.cs
src\Common\Utilities\UriUtilities.cs = src\Common\Utilities\UriUtilities.cs
src\Common\Utilities\ValueTuple.cs = src\Common\Utilities\ValueTuple.cs
EndProjectSection
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\SourceLink.Tools\Microsoft.SourceLink.Tools.projitems*{4376b613-cd5b-4274-9071-30989769b0b2}*SharedItemsImports = 5
src\SourceLink.Tools\Microsoft.SourceLink.Tools.projitems*{5df76cc2-5f0e-45a6-ad56-6bbbccbc1a78}*SharedItemsImports = 13
src\SourceLink.Tools\Microsoft.SourceLink.Tools.projitems*{99d113a9-24ec-471d-9f74-d2ac2f16220b}*SharedItemsImports = 5
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Expand Down Expand Up @@ -201,7 +215,17 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{8A4D5938-D99A-4BEC-8C02-4BF69E70D720} = {4BB63B07-D1DD-48CF-845F-34B3BBB0F596}
{59A2C2E8-AE72-46C4-B51C-4244D6451597} = {4BB63B07-D1DD-48CF-845F-34B3BBB0F596}
{F351EFBE-DAEE-437A-A492-4F1434489693} = {4BB63B07-D1DD-48CF-845F-34B3BBB0F596}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0E6D4D3C-C44D-4A03-B5C0-10A36F51E272}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\SourceLink.Tools\Microsoft.SourceLink.Tools.projitems*{4376b613-cd5b-4274-9071-30989769b0b2}*SharedItemsImports = 5
src\SourceLink.Tools\Microsoft.SourceLink.Tools.projitems*{5df76cc2-5f0e-45a6-ad56-6bbbccbc1a78}*SharedItemsImports = 13
src\SourceLink.Tools\Microsoft.SourceLink.Tools.projitems*{99d113a9-24ec-471d-9f74-d2ac2f16220b}*SharedItemsImports = 5
EndGlobalSection
EndGlobal
0 src/Common/AzureDevOpsUrlParser.cs → ...ommon/AzureDevOps/AzureDevOpsUrlParser.cs
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions src/Common/AzureDevOps/Items.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)..\GitProvider\Items.props" />
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)*.cs" Link="Common\%(FileName).cs" />
</ItemGroup>
</Project>
0 src/Common/CommonResources.resx → src/Common/GitProvider/CommonResources.resx
View file
Open in desktop
File renamed without changes.
0 src/Common/GetSourceLinkUrlGitTask.cs → ...on/GitProvider/GetSourceLinkUrlGitTask.cs
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions src/Common/GitProvider/Items.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)..\Utilities\*.cs" Link="Common\%(FileName).cs" />
<Compile Include="$(MSBuildThisFileDirectory)*.cs" Link="Common\%(FileName).cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)CommonResources.resx" Link="Common\CommonResources.resx">
<Namespace>Microsoft.Build.Tasks.SourceControl</Namespace>
<GenerateSource>true</GenerateSource>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
</ItemGroup>
</Project>
0 src/Common/TranslateRepositoryUrlGitTask.cs → ...Provider/TranslateRepositoryUrlGitTask.cs
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.cs.xlf → ...on/GitProvider/xlf/CommonResources.cs.xlf
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.de.xlf → ...on/GitProvider/xlf/CommonResources.de.xlf
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.es.xlf → ...on/GitProvider/xlf/CommonResources.es.xlf
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.fr.xlf → ...on/GitProvider/xlf/CommonResources.fr.xlf
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.it.xlf → ...on/GitProvider/xlf/CommonResources.it.xlf
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.ja.xlf → ...on/GitProvider/xlf/CommonResources.ja.xlf
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.ko.xlf → ...on/GitProvider/xlf/CommonResources.ko.xlf
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.pl.xlf → ...on/GitProvider/xlf/CommonResources.pl.xlf
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.pt-BR.xlf → ...GitProvider/xlf/CommonResources.pt-BR.xlf
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.ru.xlf → ...on/GitProvider/xlf/CommonResources.ru.xlf
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.tr.xlf → ...on/GitProvider/xlf/CommonResources.tr.xlf
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.zh-Hans.xlf → ...tProvider/xlf/CommonResources.zh-Hans.xlf
View file
Open in desktop
File renamed without changes.
0 src/Common/xlf/CommonResources.zh-Hant.xlf → ...tProvider/xlf/CommonResources.zh-Hant.xlf
View file
Open in desktop
File renamed without changes.
224 changes: 0 additions & 224 deletions src/Common/GitUrlMappingTask.cs
View file
Open in desktop

This file was deleted.

Loading