Skip to content
This repository was archived by the owner on Jul 15, 2023. It is now read-only.

Commit 9634ab0

Browse files
whoisjwhoisj
committed
shared: collate all shared projects
Group all of the shared projects under the same folder "Shared/", and update all referencing projects. - Move "Shared/" -> "Shared/Win32/" - Move "Cli/Shared/" -> "Shared/Cli/". - Move "Gui-Shared/" -> "Shared/Gui/". - Update project and solution files.
1 parent 03c0fd4 commit 9634ab0

Some content is hidden

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

52 files changed

+30
-30
lines changed

‎Bitbucket.Authentication/Src/Bitbucket.Authentication.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<ItemGroup>
155155
<None Include="packages.config" />
156156
</ItemGroup>
157-
<Import Project="..\..\Gui-Shared\Gui-Shared.projitems" Label="Shared" />
157+
<Import Project="..\..\Shared\Gui\Gui-Shared.projitems" Label="Shared" />
158158
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
159159
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
160160
<PropertyGroup>

‎Cli/Askpass/Cli-Askpass.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</FilesToSign>
9393
</ItemGroup>
9494
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
95-
<Import Project="..\Shared\Cli-Shared.projitems" Label="Shared" />
95+
<Import Project="..\..\Shared\Cli\Cli-Shared.projitems" Label="Shared" />
9696
<Import Project="..\..\build.targets" />
9797
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
9898
<PropertyGroup>

‎Cli/Manager/Cli-Manager.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</FilesToSign>
6868
</ItemGroup>
6969
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
70-
<Import Project="..\Shared\Cli-Shared.projitems" Label="Shared" />
70+
<Import Project="..\..\Shared\Cli\Cli-Shared.projitems" Label="Shared" />
7171
<Import Project="..\..\build.targets" />
7272
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
7373
<PropertyGroup>

‎GitCredentialManager.sln

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{D6456F11
1616
xunit.runner.json = xunit.runner.json
1717
EndProjectSection
1818
EndProject
19+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Cli-Shared", "Shared\Cli\Cli-Shared.shproj", "{19770407-94D5-49D3-8ED1-C72637BA7D90}"
20+
EndProject
21+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Gui-Shared", "Shared\Gui\Gui-Shared.shproj", "{4A4F5ADA-7166-4799-BC7C-D5882637CF7A}"
22+
EndProject
23+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Alm.Win32", "Shared\Win32\Microsoft.Alm.Win32.shproj", "{19770407-37CD-41AC-B50C-CF885BBCE344}"
24+
EndProject
1925
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Alm.Authentication", "Microsoft.Alm.Authentication\Src\Microsoft.Alm.Authentication.csproj", "{19770407-B493-459D-BB4F-04FBEFB1BA13}"
2026
EndProject
2127
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Vsts.Authentication", "Microsoft.Vsts.Authentication\Src\Microsoft.Vsts.Authentication.csproj", "{19770407-D7D8-4A37-914C-F552FF4B90D4}"
@@ -24,8 +30,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Authentication", "Gi
2430
EndProject
2531
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bitbucket.Authentication", "Bitbucket.Authentication\Src\Bitbucket.Authentication.csproj", "{EE663736-5BAD-4CA6-A4F8-99978925AD8A}"
2632
EndProject
27-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Cli-Shared", "Cli\Shared\Cli-Shared.shproj", "{19770407-94D5-49D3-8ED1-C72637BA7D90}"
28-
EndProject
2933
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli-Manager", "Cli\Manager\Cli-Manager.csproj", "{19770407-63D4-40A8-A9DF-F1C4B473308A}"
3034
EndProject
3135
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli-Askpass", "Cli\Askpass\Cli-Askpass.csproj", "{19770407-B33A-4EBE-92B8-04C93F43CAE0}"
@@ -40,24 +44,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli-Test", "Cli\Test\Cli-Te
4044
EndProject
4145
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Authentication.Test", "GitHub.Authentication\Test\GitHub.Authentication.Test.csproj", "{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}"
4246
EndProject
43-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Gui-Shared", "Gui-Shared\Gui-Shared.shproj", "{4A4F5ADA-7166-4799-BC7C-D5882637CF7A}"
44-
EndProject
45-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Installer", "Installer\Installer.proj", "{19770407-3808-4B17-9EE0-21DD3468F875}"
46-
EndProject
4747
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GcmParentWindowTest", "GcmParentWindowTest\GcmParentWindowTest.csproj", "{2F110EEF-14BA-4324-9DA4-C7D16469B064}"
4848
EndProject
49-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Alm.Win32", "Shared\Microsoft.Alm.Win32.shproj", "{19770407-37CD-41AC-B50C-CF885BBCE344}"
49+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Installer", "Installer\Installer.proj", "{19770407-3808-4B17-9EE0-21DD3468F875}"
5050
EndProject
5151
Global
5252
GlobalSection(SharedMSBuildProjectFiles) = preSolution
53-
Cli\Shared\Cli-Shared.projitems*{19770407-63d4-40a8-a9df-f1c4b473308a}*SharedItemsImports = 4
54-
Cli\Shared\Cli-Shared.projitems*{19770407-94d5-49d3-8ed1-c72637ba7d90}*SharedItemsImports = 13
55-
Cli\Shared\Cli-Shared.projitems*{19770407-b33a-4ebe-92b8-04c93f43cae0}*SharedItemsImports = 4
56-
Shared\Microsoft.Alm.Win32.projitems*{19770407-37cd-41ac-b50c-cf885bbce344}*SharedItemsImports = 13
57-
Shared\Microsoft.Alm.Win32.projitems*{19770407-b493-459d-bb4f-04fbefb1ba13}*SharedItemsImports = 4
58-
Gui-Shared\Gui-Shared.projitems*{4a4f5ada-7166-4799-bc7c-d5882637cf7a}*SharedItemsImports = 13
59-
Gui-Shared\Gui-Shared.projitems*{cf306116-bbf0-4cc7-afce-a506ac4752cb}*SharedItemsImports = 4
60-
Gui-Shared\Gui-Shared.projitems*{ee663736-5bad-4ca6-a4f8-99978925ad8a}*SharedItemsImports = 4
53+
Shared\Win32\Microsoft.Alm.Win32.projitems*{19770407-37cd-41ac-b50c-cf885bbce344}*SharedItemsImports = 13
54+
Shared\Cli\Cli-Shared.projitems*{19770407-63d4-40a8-a9df-f1c4b473308a}*SharedItemsImports = 4
55+
Shared\Cli\Cli-Shared.projitems*{19770407-94d5-49d3-8ed1-c72637ba7d90}*SharedItemsImports = 13
56+
Shared\Cli\Cli-Shared.projitems*{19770407-b33a-4ebe-92b8-04c93f43cae0}*SharedItemsImports = 4
57+
Shared\Win32\Microsoft.Alm.Win32.projitems*{19770407-b493-459d-bb4f-04fbefb1ba13}*SharedItemsImports = 4
58+
Shared\Gui\Gui-Shared.projitems*{4a4f5ada-7166-4799-bc7c-d5882637cf7a}*SharedItemsImports = 13
59+
Shared\Gui\Gui-Shared.projitems*{cf306116-bbf0-4cc7-afce-a506ac4752cb}*SharedItemsImports = 4
60+
Shared\Gui\Gui-Shared.projitems*{ee663736-5bad-4ca6-a4f8-99978925ad8a}*SharedItemsImports = 4
6161
EndGlobalSection
6262
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6363
Debug|Any CPU = Debug|Any CPU
@@ -200,16 +200,6 @@ Global
200200
{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Release|x64.Build.0 = Release|Any CPU
201201
{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Release|x86.ActiveCfg = Release|Any CPU
202202
{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}.Release|x86.Build.0 = Release|Any CPU
203-
{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
204-
{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|x64.ActiveCfg = Debug|Any CPU
205-
{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|x64.Build.0 = Debug|Any CPU
206-
{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|x86.ActiveCfg = Debug|Any CPU
207-
{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|x86.Build.0 = Debug|Any CPU
208-
{19770407-3808-4B17-9EE0-21DD3468F875}.Release|Any CPU.ActiveCfg = Release|Any CPU
209-
{19770407-3808-4B17-9EE0-21DD3468F875}.Release|x64.ActiveCfg = Release|Any CPU
210-
{19770407-3808-4B17-9EE0-21DD3468F875}.Release|x64.Build.0 = Release|Any CPU
211-
{19770407-3808-4B17-9EE0-21DD3468F875}.Release|x86.ActiveCfg = Release|Any CPU
212-
{19770407-3808-4B17-9EE0-21DD3468F875}.Release|x86.Build.0 = Release|Any CPU
213203
{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
214204
{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Debug|Any CPU.Build.0 = Debug|Any CPU
215205
{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -222,6 +212,16 @@ Global
222212
{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|x64.Build.0 = Release|Any CPU
223213
{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|x86.ActiveCfg = Release|Any CPU
224214
{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|x86.Build.0 = Release|Any CPU
215+
{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
216+
{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|x64.ActiveCfg = Debug|Any CPU
217+
{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|x64.Build.0 = Debug|Any CPU
218+
{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|x86.ActiveCfg = Debug|Any CPU
219+
{19770407-3808-4B17-9EE0-21DD3468F875}.Debug|x86.Build.0 = Debug|Any CPU
220+
{19770407-3808-4B17-9EE0-21DD3468F875}.Release|Any CPU.ActiveCfg = Release|Any CPU
221+
{19770407-3808-4B17-9EE0-21DD3468F875}.Release|x64.ActiveCfg = Release|Any CPU
222+
{19770407-3808-4B17-9EE0-21DD3468F875}.Release|x64.Build.0 = Release|Any CPU
223+
{19770407-3808-4B17-9EE0-21DD3468F875}.Release|x86.ActiveCfg = Release|Any CPU
224+
{19770407-3808-4B17-9EE0-21DD3468F875}.Release|x86.Build.0 = Release|Any CPU
225225
EndGlobalSection
226226
GlobalSection(SolutionProperties) = preSolution
227227
HideSolutionNode = FALSE

‎GitHub.Authentication/Src/GitHub.Authentication.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
<Resource Include="Assets\octocat-mark.ico" />
191191
</ItemGroup>
192192
<ItemGroup />
193-
<Import Project="..\..\Gui-Shared\Gui-Shared.projitems" Label="Shared" />
193+
<Import Project="..\..\Shared\Gui\Gui-Shared.projitems" Label="Shared" />
194194
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
195195
<PropertyGroup>
196196
<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>

‎Microsoft.Alm.Authentication/Src/Microsoft.Alm.Authentication.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<InProject>false</InProject>
7575
</FilesToSign>
7676
</ItemGroup>
77-
<Import Project="..\..\Shared\Microsoft.Alm.Win32.projitems" Label="Shared" />
77+
<Import Project="..\..\Shared\Win32\Microsoft.Alm.Win32.projitems" Label="Shared" />
7878
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7979
<Import Project="..\..\build.targets" />
8080
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎Cli/Shared/AuthorityType.cs renamed to ‎Shared/Cli/AuthorityType.cs

File renamed without changes.

‎Cli/Shared/Cli-Shared.projitems renamed to ‎Shared/Cli/Cli-Shared.projitems

File renamed without changes.

‎Cli/Shared/Cli-Shared.shproj renamed to ‎Shared/Cli/Cli-Shared.shproj

File renamed without changes.

‎Cli/Shared/Delegates.cs renamed to ‎Shared/Cli/Delegates.cs

File renamed without changes.

‎Cli/Shared/Functions/Bitbucket.cs renamed to ‎Shared/Cli/Functions/Bitbucket.cs

File renamed without changes.

‎Cli/Shared/Functions/Common.cs renamed to ‎Shared/Cli/Functions/Common.cs

File renamed without changes.

‎Cli/Shared/Functions/Console.cs renamed to ‎Shared/Cli/Functions/Console.cs

File renamed without changes.

‎Cli/Shared/Functions/Dialog.cs renamed to ‎Shared/Cli/Functions/Dialog.cs

File renamed without changes.

‎Cli/Shared/Functions/GitHub.cs renamed to ‎Shared/Cli/Functions/GitHub.cs

File renamed without changes.

‎Cli/Shared/Interactivity.cs renamed to ‎Shared/Cli/Interactivity.cs

File renamed without changes.

‎Cli/Shared/NativeMethods.cs renamed to ‎Shared/Cli/NativeMethods.cs

File renamed without changes.

‎Cli/Shared/OperationArguments.cs renamed to ‎Shared/Cli/OperationArguments.cs

File renamed without changes.

‎Cli/Shared/Program.cs renamed to ‎Shared/Cli/Program.cs

File renamed without changes.

‎Gui-Shared/Controls/AuthenticationDialogWindow.cs renamed to ‎Shared/Gui/Controls/AuthenticationDialogWindow.cs

File renamed without changes.

‎Gui-Shared/Controls/DialogUserControl.cs renamed to ‎Shared/Gui/Controls/DialogUserControl.cs

File renamed without changes.

‎Gui-Shared/Controls/MaskedPasswordBox.cs renamed to ‎Shared/Gui/Controls/MaskedPasswordBox.cs

File renamed without changes.

‎Gui-Shared/Controls/PromptTextBox.cs renamed to ‎Shared/Gui/Controls/PromptTextBox.cs

File renamed without changes.

‎Gui-Shared/Converters/AspectRatioConverter.cs renamed to ‎Shared/Gui/Converters/AspectRatioConverter.cs

File renamed without changes.

‎Gui-Shared/Converters/BooleanToHiddenVisibilityConverter.cs renamed to ‎Shared/Gui/Converters/BooleanToHiddenVisibilityConverter.cs

File renamed without changes.

‎Gui-Shared/Converters/BooleanToInverseHiddenVisibilityConverter.cs renamed to ‎Shared/Gui/Converters/BooleanToInverseHiddenVisibilityConverter.cs

File renamed without changes.

‎Gui-Shared/Converters/BooleanToVisibilityConverter.cs renamed to ‎Shared/Gui/Converters/BooleanToVisibilityConverter.cs

File renamed without changes.

‎Gui-Shared/Converters/ThicknessConverter.cs renamed to ‎Shared/Gui/Converters/ThicknessConverter.cs

File renamed without changes.

‎Gui-Shared/Converters/ValueConverterMarkupExtension.cs renamed to ‎Shared/Gui/Converters/ValueConverterMarkupExtension.cs

File renamed without changes.

‎Gui-Shared/Gui-Shared.projitems renamed to ‎Shared/Gui/Gui-Shared.projitems

File renamed without changes.

‎Gui-Shared/Gui-Shared.shproj renamed to ‎Shared/Gui/Gui-Shared.shproj

File renamed without changes.

‎Gui-Shared/Helpers/AccessKeysManagerScoping.cs renamed to ‎Shared/Gui/Helpers/AccessKeysManagerScoping.cs

File renamed without changes.

‎Gui-Shared/Helpers/ActionCommand.cs renamed to ‎Shared/Gui/Helpers/ActionCommand.cs

File renamed without changes.

‎Gui-Shared/Helpers/FocusHelper.cs renamed to ‎Shared/Gui/Helpers/FocusHelper.cs

File renamed without changes.

‎Gui-Shared/Helpers/HyperLinkCommand.cs renamed to ‎Shared/Gui/Helpers/HyperLinkCommand.cs

File renamed without changes.

‎Gui-Shared/Helpers/StreamExtensions.cs renamed to ‎Shared/Gui/Helpers/StreamExtensions.cs

File renamed without changes.

‎Gui-Shared/Helpers/TaskExtensions.cs renamed to ‎Shared/Gui/Helpers/TaskExtensions.cs

File renamed without changes.

‎Gui-Shared/ViewModels/AuthenticationDialogResult.cs renamed to ‎Shared/Gui/ViewModels/AuthenticationDialogResult.cs

File renamed without changes.

‎Gui-Shared/ViewModels/DialogViewModel.cs renamed to ‎Shared/Gui/ViewModels/DialogViewModel.cs

File renamed without changes.

‎Gui-Shared/ViewModels/Validation/ModelValidator.cs renamed to ‎Shared/Gui/ViewModels/Validation/ModelValidator.cs

File renamed without changes.

‎Gui-Shared/ViewModels/Validation/PropertyValidationResult.cs renamed to ‎Shared/Gui/ViewModels/Validation/PropertyValidationResult.cs

File renamed without changes.

‎Gui-Shared/ViewModels/Validation/PropertyValidator.cs renamed to ‎Shared/Gui/ViewModels/Validation/PropertyValidator.cs

File renamed without changes.

‎Gui-Shared/ViewModels/Validation/PropertyValidatorExtensions.cs renamed to ‎Shared/Gui/ViewModels/Validation/PropertyValidatorExtensions.cs

File renamed without changes.

‎Gui-Shared/ViewModels/Validation/ValidationStatus.cs renamed to ‎Shared/Gui/ViewModels/Validation/ValidationStatus.cs

File renamed without changes.

‎Gui-Shared/ViewModels/ViewModel.cs renamed to ‎Shared/Gui/ViewModels/ViewModel.cs

File renamed without changes.

‎Shared/Kernel32.cs renamed to ‎Shared/Win32/Kernel32.cs

File renamed without changes.

‎Shared/Microsoft.Alm.Win32.projitems renamed to ‎Shared/Win32/Microsoft.Alm.Win32.projitems

File renamed without changes.

‎Shared/Microsoft.Alm.Win32.shproj renamed to ‎Shared/Win32/Microsoft.Alm.Win32.shproj

File renamed without changes.

‎Shared/Ntdll.cs renamed to ‎Shared/Win32/Ntdll.cs

File renamed without changes.

‎Shared/SafeProcessHandle.cs renamed to ‎Shared/Win32/SafeProcessHandle.cs

File renamed without changes.

‎Shared/SafeSnapshotHandle.cs renamed to ‎Shared/Win32/SafeSnapshotHandle.cs

File renamed without changes.

‎Shared/Types.cs renamed to ‎Shared/Win32/Types.cs

File renamed without changes.

0 commit comments

Comments
 (0)