diff --git a/Bitbucket.Authentication/App.xaml b/Bitbucket.Authentication/Src/App.xaml similarity index 100% rename from Bitbucket.Authentication/App.xaml rename to Bitbucket.Authentication/Src/App.xaml diff --git a/Bitbucket.Authentication/App.xaml.cs b/Bitbucket.Authentication/Src/App.xaml.cs similarity index 100% rename from Bitbucket.Authentication/App.xaml.cs rename to Bitbucket.Authentication/Src/App.xaml.cs diff --git a/Bitbucket.Authentication/AppResources.xaml b/Bitbucket.Authentication/Src/AppResources.xaml similarity index 100% rename from Bitbucket.Authentication/AppResources.xaml rename to Bitbucket.Authentication/Src/AppResources.xaml diff --git a/Bitbucket.Authentication/Assets/ADG3/Colours.xaml b/Bitbucket.Authentication/Src/Assets/ADG3/Colours.xaml similarity index 100% rename from Bitbucket.Authentication/Assets/ADG3/Colours.xaml rename to Bitbucket.Authentication/Src/Assets/ADG3/Colours.xaml diff --git a/Bitbucket.Authentication/Assets/ADG3/Controls.xaml b/Bitbucket.Authentication/Src/Assets/ADG3/Controls.xaml similarity index 100% rename from Bitbucket.Authentication/Assets/ADG3/Controls.xaml rename to Bitbucket.Authentication/Src/Assets/ADG3/Controls.xaml diff --git a/Bitbucket.Authentication/Assets/ADG3/Images.xaml b/Bitbucket.Authentication/Src/Assets/ADG3/Images.xaml similarity index 100% rename from Bitbucket.Authentication/Assets/ADG3/Images.xaml rename to Bitbucket.Authentication/Src/Assets/ADG3/Images.xaml diff --git a/Bitbucket.Authentication/Assets/ADG3/Images/Atlassian-horizontal-white@2x-rgb.png b/Bitbucket.Authentication/Src/Assets/ADG3/Images/Atlassian-horizontal-white@2x-rgb.png similarity index 100% rename from Bitbucket.Authentication/Assets/ADG3/Images/Atlassian-horizontal-white@2x-rgb.png rename to Bitbucket.Authentication/Src/Assets/ADG3/Images/Atlassian-horizontal-white@2x-rgb.png diff --git a/Bitbucket.Authentication/Assets/ADG3/Images/Bitbucket-16x16.ico b/Bitbucket.Authentication/Src/Assets/ADG3/Images/Bitbucket-16x16.ico similarity index 100% rename from Bitbucket.Authentication/Assets/ADG3/Images/Bitbucket-16x16.ico rename to Bitbucket.Authentication/Src/Assets/ADG3/Images/Bitbucket-16x16.ico diff --git a/Bitbucket.Authentication/Assets/ADG3/Images/error.png b/Bitbucket.Authentication/Src/Assets/ADG3/Images/error.png similarity index 100% rename from Bitbucket.Authentication/Assets/ADG3/Images/error.png rename to Bitbucket.Authentication/Src/Assets/ADG3/Images/error.png diff --git a/Bitbucket.Authentication/Assets/ADG3/TextBlocks.xaml b/Bitbucket.Authentication/Src/Assets/ADG3/TextBlocks.xaml similarity index 100% rename from Bitbucket.Authentication/Assets/ADG3/TextBlocks.xaml rename to Bitbucket.Authentication/Src/Assets/ADG3/TextBlocks.xaml diff --git a/Bitbucket.Authentication/Assets/ADG3/Typography.xaml b/Bitbucket.Authentication/Src/Assets/ADG3/Typography.xaml similarity index 100% rename from Bitbucket.Authentication/Assets/ADG3/Typography.xaml rename to Bitbucket.Authentication/Src/Assets/ADG3/Typography.xaml diff --git a/Bitbucket.Authentication/Assets/ADG3/ValidationMessage.xaml b/Bitbucket.Authentication/Src/Assets/ADG3/ValidationMessage.xaml similarity index 100% rename from Bitbucket.Authentication/Assets/ADG3/ValidationMessage.xaml rename to Bitbucket.Authentication/Src/Assets/ADG3/ValidationMessage.xaml diff --git a/Bitbucket.Authentication/Assets/ADG3/atlassian.png b/Bitbucket.Authentication/Src/Assets/ADG3/atlassian.png similarity index 100% rename from Bitbucket.Authentication/Assets/ADG3/atlassian.png rename to Bitbucket.Authentication/Src/Assets/ADG3/atlassian.png diff --git a/Bitbucket.Authentication/Assets/auth.html b/Bitbucket.Authentication/Src/Assets/auth.html similarity index 100% rename from Bitbucket.Authentication/Assets/auth.html rename to Bitbucket.Authentication/Src/Assets/auth.html diff --git a/Bitbucket.Authentication/Authentication.cs b/Bitbucket.Authentication/Src/Authentication.cs similarity index 100% rename from Bitbucket.Authentication/Authentication.cs rename to Bitbucket.Authentication/Src/Authentication.cs diff --git a/Bitbucket.Authentication/AuthenticationPrompts.cs b/Bitbucket.Authentication/Src/AuthenticationPrompts.cs similarity index 100% rename from Bitbucket.Authentication/AuthenticationPrompts.cs rename to Bitbucket.Authentication/Src/AuthenticationPrompts.cs diff --git a/Bitbucket.Authentication/AuthenticationResult.cs b/Bitbucket.Authentication/Src/AuthenticationResult.cs similarity index 100% rename from Bitbucket.Authentication/AuthenticationResult.cs rename to Bitbucket.Authentication/Src/AuthenticationResult.cs diff --git a/Bitbucket.Authentication/Authority.cs b/Bitbucket.Authentication/Src/Authority.cs similarity index 100% rename from Bitbucket.Authentication/Authority.cs rename to Bitbucket.Authentication/Src/Authority.cs diff --git a/Bitbucket.Authentication/BasicAuth/BasicAuthAuthenticator.cs b/Bitbucket.Authentication/Src/BasicAuth/BasicAuthAuthenticator.cs similarity index 100% rename from Bitbucket.Authentication/BasicAuth/BasicAuthAuthenticator.cs rename to Bitbucket.Authentication/Src/BasicAuth/BasicAuthAuthenticator.cs diff --git a/Bitbucket.Authentication/Bitbucket.Authentication.csproj b/Bitbucket.Authentication/Src/Bitbucket.Authentication.csproj similarity index 90% rename from Bitbucket.Authentication/Bitbucket.Authentication.csproj rename to Bitbucket.Authentication/Src/Bitbucket.Authentication.csproj index 8aff48f..cbf1fdf 100644 --- a/Bitbucket.Authentication/Bitbucket.Authentication.csproj +++ b/Bitbucket.Authentication/Src/Bitbucket.Authentication.csproj @@ -1,6 +1,6 @@  - + Properties @@ -19,7 +19,7 @@ false - + false @@ -71,7 +71,7 @@ - + {19770407-B493-459D-BB4F-04FBEFB1BA13} Microsoft.Alm.Authentication @@ -154,12 +154,12 @@ - + 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}. - + \ No newline at end of file diff --git a/Bitbucket.Authentication/Controls/CredentialsControl.xaml b/Bitbucket.Authentication/Src/Controls/CredentialsControl.xaml similarity index 100% rename from Bitbucket.Authentication/Controls/CredentialsControl.xaml rename to Bitbucket.Authentication/Src/Controls/CredentialsControl.xaml diff --git a/Bitbucket.Authentication/Controls/CredentialsControl.xaml.cs b/Bitbucket.Authentication/Src/Controls/CredentialsControl.xaml.cs similarity index 100% rename from Bitbucket.Authentication/Controls/CredentialsControl.xaml.cs rename to Bitbucket.Authentication/Src/Controls/CredentialsControl.xaml.cs diff --git a/Bitbucket.Authentication/Controls/OAuthControl.xaml b/Bitbucket.Authentication/Src/Controls/OAuthControl.xaml similarity index 100% rename from Bitbucket.Authentication/Controls/OAuthControl.xaml rename to Bitbucket.Authentication/Src/Controls/OAuthControl.xaml diff --git a/Bitbucket.Authentication/Controls/OAuthControl.xaml.cs b/Bitbucket.Authentication/Src/Controls/OAuthControl.xaml.cs similarity index 100% rename from Bitbucket.Authentication/Controls/OAuthControl.xaml.cs rename to Bitbucket.Authentication/Src/Controls/OAuthControl.xaml.cs diff --git a/Bitbucket.Authentication/Controls/Text/ValidationMessage.cs b/Bitbucket.Authentication/Src/Controls/Text/ValidationMessage.cs similarity index 100% rename from Bitbucket.Authentication/Controls/Text/ValidationMessage.cs rename to Bitbucket.Authentication/Src/Controls/Text/ValidationMessage.cs diff --git a/Bitbucket.Authentication/IAuthentication.cs b/Bitbucket.Authentication/Src/IAuthentication.cs similarity index 100% rename from Bitbucket.Authentication/IAuthentication.cs rename to Bitbucket.Authentication/Src/IAuthentication.cs diff --git a/Bitbucket.Authentication/IAuthority.cs b/Bitbucket.Authentication/Src/IAuthority.cs similarity index 100% rename from Bitbucket.Authentication/IAuthority.cs rename to Bitbucket.Authentication/Src/IAuthority.cs diff --git a/Bitbucket.Authentication/OAuth/OAuthAuthenticator.cs b/Bitbucket.Authentication/Src/OAuth/OAuthAuthenticator.cs similarity index 100% rename from Bitbucket.Authentication/OAuth/OAuthAuthenticator.cs rename to Bitbucket.Authentication/Src/OAuth/OAuthAuthenticator.cs diff --git a/Bitbucket.Authentication/OAuth/SimpleServer.cs b/Bitbucket.Authentication/Src/OAuth/SimpleServer.cs similarity index 100% rename from Bitbucket.Authentication/OAuth/SimpleServer.cs rename to Bitbucket.Authentication/Src/OAuth/SimpleServer.cs diff --git a/Bitbucket.Authentication/Properties/AssemblyInfo.cs b/Bitbucket.Authentication/Src/Properties/AssemblyInfo.cs similarity index 100% rename from Bitbucket.Authentication/Properties/AssemblyInfo.cs rename to Bitbucket.Authentication/Src/Properties/AssemblyInfo.cs diff --git a/Bitbucket.Authentication/Properties/Resources.Designer.cs b/Bitbucket.Authentication/Src/Properties/Resources.Designer.cs similarity index 100% rename from Bitbucket.Authentication/Properties/Resources.Designer.cs rename to Bitbucket.Authentication/Src/Properties/Resources.Designer.cs diff --git a/Bitbucket.Authentication/Properties/Resources.resx b/Bitbucket.Authentication/Src/Properties/Resources.resx similarity index 100% rename from Bitbucket.Authentication/Properties/Resources.resx rename to Bitbucket.Authentication/Src/Properties/Resources.resx diff --git a/Bitbucket.Authentication/Rest/RestClient.cs b/Bitbucket.Authentication/Src/Rest/RestClient.cs similarity index 100% rename from Bitbucket.Authentication/Rest/RestClient.cs rename to Bitbucket.Authentication/Src/Rest/RestClient.cs diff --git a/Bitbucket.Authentication/TokenScope.cs b/Bitbucket.Authentication/Src/TokenScope.cs similarity index 100% rename from Bitbucket.Authentication/TokenScope.cs rename to Bitbucket.Authentication/Src/TokenScope.cs diff --git a/Bitbucket.Authentication/ViewModels/CredentialsViewModel.cs b/Bitbucket.Authentication/Src/ViewModels/CredentialsViewModel.cs similarity index 100% rename from Bitbucket.Authentication/ViewModels/CredentialsViewModel.cs rename to Bitbucket.Authentication/Src/ViewModels/CredentialsViewModel.cs diff --git a/Bitbucket.Authentication/ViewModels/OAuthViewModel.cs b/Bitbucket.Authentication/Src/ViewModels/OAuthViewModel.cs similarity index 100% rename from Bitbucket.Authentication/ViewModels/OAuthViewModel.cs rename to Bitbucket.Authentication/Src/ViewModels/OAuthViewModel.cs diff --git a/Bitbucket.Authentication/Views/CredentialsWindow.xaml b/Bitbucket.Authentication/Src/Views/CredentialsWindow.xaml similarity index 100% rename from Bitbucket.Authentication/Views/CredentialsWindow.xaml rename to Bitbucket.Authentication/Src/Views/CredentialsWindow.xaml diff --git a/Bitbucket.Authentication/Views/CredentialsWindow.xaml.cs b/Bitbucket.Authentication/Src/Views/CredentialsWindow.xaml.cs similarity index 100% rename from Bitbucket.Authentication/Views/CredentialsWindow.xaml.cs rename to Bitbucket.Authentication/Src/Views/CredentialsWindow.xaml.cs diff --git a/Bitbucket.Authentication/Views/OAuthWindow.xaml b/Bitbucket.Authentication/Src/Views/OAuthWindow.xaml similarity index 100% rename from Bitbucket.Authentication/Views/OAuthWindow.xaml rename to Bitbucket.Authentication/Src/Views/OAuthWindow.xaml diff --git a/Bitbucket.Authentication/Views/OAuthWindow.xaml.cs b/Bitbucket.Authentication/Src/Views/OAuthWindow.xaml.cs similarity index 100% rename from Bitbucket.Authentication/Views/OAuthWindow.xaml.cs rename to Bitbucket.Authentication/Src/Views/OAuthWindow.xaml.cs diff --git a/Bitbucket.Authentication/packages.config b/Bitbucket.Authentication/Src/packages.config similarity index 100% rename from Bitbucket.Authentication/packages.config rename to Bitbucket.Authentication/Src/packages.config diff --git a/Bitbucket.Authentication.Test/AuthenticationTest.cs b/Bitbucket.Authentication/Test/AuthenticationTest.cs similarity index 100% rename from Bitbucket.Authentication.Test/AuthenticationTest.cs rename to Bitbucket.Authentication/Test/AuthenticationTest.cs diff --git a/Bitbucket.Authentication.Test/Bitbucket.Authentication.Test.csproj b/Bitbucket.Authentication/Test/Bitbucket.Authentication.Test.csproj similarity index 54% rename from Bitbucket.Authentication.Test/Bitbucket.Authentication.Test.csproj rename to Bitbucket.Authentication/Test/Bitbucket.Authentication.Test.csproj index 3e35699..0db4332 100644 --- a/Bitbucket.Authentication.Test/Bitbucket.Authentication.Test.csproj +++ b/Bitbucket.Authentication/Test/Bitbucket.Authentication.Test.csproj @@ -1,8 +1,8 @@  - - - + + + Debug AnyCPU @@ -14,26 +14,25 @@ $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest - - + - + false - ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll + ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - ..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll + ..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll - ..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll + ..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll - ..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll + ..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll @@ -42,17 +41,17 @@ - + {ee663736-5bad-4ca6-a4f8-99978925ad8a} Bitbucket.Authentication - + {C1DAABC1-B493-459D-BB4F-04FBEFB1BA13} Microsoft.Alm.Authentication - + xunit.runner.json Always @@ -64,10 +63,10 @@ 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}. - - - - + + + + - + \ No newline at end of file diff --git a/Bitbucket.Authentication.Test/BitbucketAuthTests.cs b/Bitbucket.Authentication/Test/BitbucketAuthTests.cs similarity index 100% rename from Bitbucket.Authentication.Test/BitbucketAuthTests.cs rename to Bitbucket.Authentication/Test/BitbucketAuthTests.cs diff --git a/Bitbucket.Authentication.Test/IntegrationTest.cmd b/Bitbucket.Authentication/Test/IntegrationTest.cmd similarity index 100% rename from Bitbucket.Authentication.Test/IntegrationTest.cmd rename to Bitbucket.Authentication/Test/IntegrationTest.cmd diff --git a/Bitbucket.Authentication.Test/Properties/AssemblyInfo.cs b/Bitbucket.Authentication/Test/Properties/AssemblyInfo.cs similarity index 100% rename from Bitbucket.Authentication.Test/Properties/AssemblyInfo.cs rename to Bitbucket.Authentication/Test/Properties/AssemblyInfo.cs diff --git a/Bitbucket.Authentication.Test/packages.config b/Bitbucket.Authentication/Test/packages.config similarity index 100% rename from Bitbucket.Authentication.Test/packages.config rename to Bitbucket.Authentication/Test/packages.config diff --git a/Cli-Manager.Test/Cli-Manager.Test.csproj b/Cli-Manager.Test/Cli-Manager.Test.csproj deleted file mode 100644 index 843e349..0000000 --- a/Cli-Manager.Test/Cli-Manager.Test.csproj +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - {19781214-AE6D-4DCC-BA9F-12CB0C6581AE} - Properties - Microsoft.Alm.Manager.Test - Microsoft.Alm.Manager.Test - False - - - - - - - ..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll - - - ..\packages\Moq.4.8.2\lib\net45\Moq.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll - - - ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - - - ..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll - - - ..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll - - - ..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll - - - - - - - {19770407-63d4-40a8-a9df-f1c4b473308a} - Cli-CredentialHelper - - - {19770407-b493-459d-bb4f-04fbefb1ba13} - Microsoft.Alm.Authentication - - - {19770407-d7d8-4a37-914c-f552ff4b90d4} - Microsoft.Vsts.Authentication - - - - - - - - - - - - - false - - - - - - - - - - - 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}. - - - - - - - - \ No newline at end of file diff --git a/Cli-Askpass/App.config b/Cli/Askpass/App.config similarity index 100% rename from Cli-Askpass/App.config rename to Cli/Askpass/App.config diff --git a/Cli-Askpass/Assets/gcm.ico b/Cli/Askpass/Assets/gcm.ico similarity index 100% rename from Cli-Askpass/Assets/gcm.ico rename to Cli/Askpass/Assets/gcm.ico diff --git a/Cli-Askpass/Assets/gcm.png b/Cli/Askpass/Assets/gcm.png similarity index 100% rename from Cli-Askpass/Assets/gcm.png rename to Cli/Askpass/Assets/gcm.png diff --git a/Cli-Askpass/Cli-Askpass.csproj b/Cli/Askpass/Cli-Askpass.csproj similarity index 68% rename from Cli-Askpass/Cli-Askpass.csproj rename to Cli/Askpass/Cli-Askpass.csproj index 1cefdb5..619c9b4 100644 --- a/Cli-Askpass/Cli-Askpass.csproj +++ b/Cli/Askpass/Cli-Askpass.csproj @@ -1,7 +1,7 @@  - - + + Properties @@ -15,10 +15,10 @@ Microsoft.Alm.Cli v4.5.2 - + Microsoft.Alm.Cli.Program - ..\Assets\gcmicon.ico + ..\..\Assets\gcmicon.ico $(MSBuildThisFileDirectory) $(ProjectDir)$(OutputPath) $(OutputPath)\$(AssemblyName).exe @@ -40,19 +40,19 @@ - + {ee663736-5bad-4ca6-a4f8-99978925ad8a} Bitbucket.Authentication - + {cf306116-bbf0-4cc7-afce-a506ac4752cb} GitHub.Authentication - + {19770407-b493-459d-bb4f-04fbefb1ba13} Microsoft.Alm.Authentication - + {19770407-d7d8-4a37-914c-f552ff4b90d4} Microsoft.Vsts.Authentication @@ -68,11 +68,12 @@ - + + false + false - @@ -91,15 +92,15 @@ - - + + 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}. - - - + + + \ No newline at end of file diff --git a/Cli-Askpass/GlobalSuppressions.cs b/Cli/Askpass/GlobalSuppressions.cs similarity index 100% rename from Cli-Askpass/GlobalSuppressions.cs rename to Cli/Askpass/GlobalSuppressions.cs diff --git a/Cli-Askpass/PasswordBoxHintAdorner.cs b/Cli/Askpass/PasswordBoxHintAdorner.cs similarity index 100% rename from Cli-Askpass/PasswordBoxHintAdorner.cs rename to Cli/Askpass/PasswordBoxHintAdorner.cs diff --git a/Cli-Askpass/Program.cs b/Cli/Askpass/Program.cs similarity index 100% rename from Cli-Askpass/Program.cs rename to Cli/Askpass/Program.cs diff --git a/Cli-Askpass/Properties/AssemblyInfo.cs b/Cli/Askpass/Properties/AssemblyInfo.cs similarity index 100% rename from Cli-Askpass/Properties/AssemblyInfo.cs rename to Cli/Askpass/Properties/AssemblyInfo.cs diff --git a/Cli-Askpass/UserPromptDialog.xaml b/Cli/Askpass/UserPromptDialog.xaml similarity index 100% rename from Cli-Askpass/UserPromptDialog.xaml rename to Cli/Askpass/UserPromptDialog.xaml diff --git a/Cli-Askpass/UserPromptDialog.xaml.cs b/Cli/Askpass/UserPromptDialog.xaml.cs similarity index 100% rename from Cli-Askpass/UserPromptDialog.xaml.cs rename to Cli/Askpass/UserPromptDialog.xaml.cs diff --git a/Cli-Askpass/UserPromptKind.cs b/Cli/Askpass/UserPromptKind.cs similarity index 100% rename from Cli-Askpass/UserPromptKind.cs rename to Cli/Askpass/UserPromptKind.cs diff --git a/Cli-Askpass/packages.config b/Cli/Askpass/packages.config similarity index 100% rename from Cli-Askpass/packages.config rename to Cli/Askpass/packages.config diff --git a/Cli-Manager/Cli-Manager.csproj b/Cli/Manager/Cli-Manager.csproj similarity index 58% rename from Cli-Manager/Cli-Manager.csproj rename to Cli/Manager/Cli-Manager.csproj index 0e778b8..b321308 100644 --- a/Cli-Manager/Cli-Manager.csproj +++ b/Cli/Manager/Cli-Manager.csproj @@ -1,23 +1,23 @@  - - + + Properties git-credential-manager true - + Exe {19770407-63D4-40A8-A9DF-F1C4B473308A} Cli-Manager Microsoft.Alm.Cli v4.5.2 - + Microsoft.Alm.Cli.Program - ..\Assets\gcmicon.ico + ..\..\Assets\gcmicon.ico $(MSBuildThisFileDirectory) $(ProjectDir)$(OutputPath) $(OutputPath)\$(AssemblyName).exe @@ -29,19 +29,19 @@ - + {ee663736-5bad-4ca6-a4f8-99978925ad8a} Bitbucket.Authentication - + {cf306116-bbf0-4cc7-afce-a506ac4752cb} GitHub.Authentication - + {19770407-b493-459d-bb4f-04fbefb1ba13} Microsoft.Alm.Authentication - + {19770407-d7d8-4a37-914c-f552ff4b90d4} Microsoft.Vsts.Authentication @@ -53,11 +53,12 @@ - + + false + false - @@ -66,15 +67,15 @@ - - + + 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}. - - - + + + - + \ No newline at end of file diff --git a/Cli-Manager/GlobalSuppressions.cs b/Cli/Manager/GlobalSuppressions.cs similarity index 100% rename from Cli-Manager/GlobalSuppressions.cs rename to Cli/Manager/GlobalSuppressions.cs diff --git a/Cli-Manager/Installer.cs b/Cli/Manager/Installer.cs similarity index 100% rename from Cli-Manager/Installer.cs rename to Cli/Manager/Installer.cs diff --git a/Cli-Manager/Program.cs b/Cli/Manager/Program.cs similarity index 100% rename from Cli-Manager/Program.cs rename to Cli/Manager/Program.cs diff --git a/Cli-Manager/Properties/AssemblyInfo.cs b/Cli/Manager/Properties/AssemblyInfo.cs similarity index 87% rename from Cli-Manager/Properties/AssemblyInfo.cs rename to Cli/Manager/Properties/AssemblyInfo.cs index 51cec27..263343b 100644 --- a/Cli-Manager/Properties/AssemblyInfo.cs +++ b/Cli/Manager/Properties/AssemblyInfo.cs @@ -15,5 +15,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyVersion("1.16.0.0")] [assembly: AssemblyFileVersion("1.16.0.0")] [assembly: NeutralResourcesLanguage("en-US")] -[assembly: InternalsVisibleTo("Microsoft.Alm.Manager.Test")] + +// Only expose internals when the binary isn't signed. +#if !SIGNED +[assembly: InternalsVisibleTo("Microsoft.Alm.Cli.Test")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] +#endif diff --git a/Cli-Manager/app.config b/Cli/Manager/app.config similarity index 100% rename from Cli-Manager/app.config rename to Cli/Manager/app.config diff --git a/Cli-Manager/packages.config b/Cli/Manager/packages.config similarity index 100% rename from Cli-Manager/packages.config rename to Cli/Manager/packages.config diff --git a/Cli-Shared/AuthorityType.cs b/Cli/Shared/AuthorityType.cs similarity index 100% rename from Cli-Shared/AuthorityType.cs rename to Cli/Shared/AuthorityType.cs diff --git a/Cli-Shared/Cli-Shared.projitems b/Cli/Shared/Cli-Shared.projitems similarity index 100% rename from Cli-Shared/Cli-Shared.projitems rename to Cli/Shared/Cli-Shared.projitems diff --git a/Cli-Shared/Cli-Shared.shproj b/Cli/Shared/Cli-Shared.shproj similarity index 100% rename from Cli-Shared/Cli-Shared.shproj rename to Cli/Shared/Cli-Shared.shproj diff --git a/Cli-Shared/Delegates.cs b/Cli/Shared/Delegates.cs similarity index 100% rename from Cli-Shared/Delegates.cs rename to Cli/Shared/Delegates.cs diff --git a/Cli-Shared/Functions/Bitbucket.cs b/Cli/Shared/Functions/Bitbucket.cs similarity index 100% rename from Cli-Shared/Functions/Bitbucket.cs rename to Cli/Shared/Functions/Bitbucket.cs diff --git a/Cli-Shared/Functions/Common.cs b/Cli/Shared/Functions/Common.cs similarity index 100% rename from Cli-Shared/Functions/Common.cs rename to Cli/Shared/Functions/Common.cs diff --git a/Cli-Shared/Functions/Console.cs b/Cli/Shared/Functions/Console.cs similarity index 100% rename from Cli-Shared/Functions/Console.cs rename to Cli/Shared/Functions/Console.cs diff --git a/Cli-Shared/Functions/Dialog.cs b/Cli/Shared/Functions/Dialog.cs similarity index 100% rename from Cli-Shared/Functions/Dialog.cs rename to Cli/Shared/Functions/Dialog.cs diff --git a/Cli-Shared/Functions/GitHub.cs b/Cli/Shared/Functions/GitHub.cs similarity index 100% rename from Cli-Shared/Functions/GitHub.cs rename to Cli/Shared/Functions/GitHub.cs diff --git a/Cli-Shared/Interactivity.cs b/Cli/Shared/Interactivity.cs similarity index 100% rename from Cli-Shared/Interactivity.cs rename to Cli/Shared/Interactivity.cs diff --git a/Cli-Shared/NativeMethods.cs b/Cli/Shared/NativeMethods.cs similarity index 100% rename from Cli-Shared/NativeMethods.cs rename to Cli/Shared/NativeMethods.cs diff --git a/Cli-Shared/OperationArguments.cs b/Cli/Shared/OperationArguments.cs similarity index 100% rename from Cli-Shared/OperationArguments.cs rename to Cli/Shared/OperationArguments.cs diff --git a/Cli-Shared/Program.cs b/Cli/Shared/Program.cs similarity index 100% rename from Cli-Shared/Program.cs rename to Cli/Shared/Program.cs diff --git a/Cli-Manager.Test/BasicAuthenticationTests.cs b/Cli/Test/BasicAuthenticationTests.cs similarity index 100% rename from Cli-Manager.Test/BasicAuthenticationTests.cs rename to Cli/Test/BasicAuthenticationTests.cs diff --git a/Cli/Test/Cli-Test.csproj b/Cli/Test/Cli-Test.csproj new file mode 100644 index 0000000..8fba4d5 --- /dev/null +++ b/Cli/Test/Cli-Test.csproj @@ -0,0 +1,86 @@ + + + + + + + {19781214-AE6D-4DCC-BA9F-12CB0C6581AE} + Properties + Microsoft.Alm.Cli.Test + Microsoft.Alm.Cli.Test + False + + + + + + ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll + + + ..\..\packages\Moq.4.8.2\lib\net45\Moq.dll + + + ..\..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + ..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll + + + ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll + + + ..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll + + + ..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll + + + ..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll + + + + + + + {19770407-63d4-40a8-a9df-f1c4b473308a} + Cli-Manager + + + {19770407-b493-459d-bb4f-04fbefb1ba13} + Microsoft.Alm.Authentication + + + {19770407-d7d8-4a37-914c-f552ff4b90d4} + Microsoft.Vsts.Authentication + + + + + + + + + + + + + false + + + + + + + + + + + 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}. + + + + + + + + \ No newline at end of file diff --git a/Cli-Manager.Test/GlobalSuppressions.cs b/Cli/Test/GlobalSuppressions.cs similarity index 100% rename from Cli-Manager.Test/GlobalSuppressions.cs rename to Cli/Test/GlobalSuppressions.cs diff --git a/Cli-Manager.Test/OperationArgumentsTests.cs b/Cli/Test/OperationArgumentsTests.cs similarity index 100% rename from Cli-Manager.Test/OperationArgumentsTests.cs rename to Cli/Test/OperationArgumentsTests.cs diff --git a/Cli-Manager.Test/ProgramTests.cs b/Cli/Test/ProgramTests.cs similarity index 100% rename from Cli-Manager.Test/ProgramTests.cs rename to Cli/Test/ProgramTests.cs diff --git a/Cli-Manager.Test/Properties/AssemblyInfo.cs b/Cli/Test/Properties/AssemblyInfo.cs similarity index 100% rename from Cli-Manager.Test/Properties/AssemblyInfo.cs rename to Cli/Test/Properties/AssemblyInfo.cs diff --git a/Cli-Manager.Test/app.config b/Cli/Test/app.config similarity index 100% rename from Cli-Manager.Test/app.config rename to Cli/Test/app.config diff --git a/Cli-Manager.Test/packages.config b/Cli/Test/packages.config similarity index 100% rename from Cli-Manager.Test/packages.config rename to Cli/Test/packages.config diff --git a/GcmParentWindowTest/GcmParentWindowTest.csproj b/GcmParentWindowTest/GcmParentWindowTest.csproj index f3ad181..a06cbfe 100644 --- a/GcmParentWindowTest/GcmParentWindowTest.csproj +++ b/GcmParentWindowTest/GcmParentWindowTest.csproj @@ -98,9 +98,9 @@ - + {19770407-63d4-40a8-a9df-f1c4b473308a} - Cli-CredentialHelper + Cli-Manager diff --git a/GitCredentialManager.sln b/GitCredentialManager.sln index 4d548d2..d3cfb69 100644 --- a/GitCredentialManager.sln +++ b/GitCredentialManager.sln @@ -16,41 +16,41 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{D6456F11 xunit.runner.json = xunit.runner.json EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Alm.Authentication", "Microsoft.Alm.Authentication\Microsoft.Alm.Authentication.csproj", "{19770407-B493-459D-BB4F-04FBEFB1BA13}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Alm.Authentication", "Microsoft.Alm.Authentication\Src\Microsoft.Alm.Authentication.csproj", "{19770407-B493-459D-BB4F-04FBEFB1BA13}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Vsts.Authentication", "Microsoft.Vsts.Authentication\Microsoft.Vsts.Authentication.csproj", "{19770407-D7D8-4A37-914C-F552FF4B90D4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Vsts.Authentication", "Microsoft.Vsts.Authentication\Src\Microsoft.Vsts.Authentication.csproj", "{19770407-D7D8-4A37-914C-F552FF4B90D4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Authentication", "GitHub.Authentication\GitHub.Authentication.csproj", "{CF306116-BBF0-4CC7-AFCE-A506AC4752CB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Authentication", "GitHub.Authentication\Src\GitHub.Authentication.csproj", "{CF306116-BBF0-4CC7-AFCE-A506AC4752CB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bitbucket.Authentication", "Bitbucket.Authentication\Bitbucket.Authentication.csproj", "{EE663736-5BAD-4CA6-A4F8-99978925AD8A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bitbucket.Authentication", "Bitbucket.Authentication\Src\Bitbucket.Authentication.csproj", "{EE663736-5BAD-4CA6-A4F8-99978925AD8A}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Cli-Shared", "Cli-Shared\Cli-Shared.shproj", "{19770407-94D5-49D3-8ED1-C72637BA7D90}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Cli-Shared", "Cli\Shared\Cli-Shared.shproj", "{19770407-94D5-49D3-8ED1-C72637BA7D90}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli-Manager", "Cli-Manager\Cli-Manager.csproj", "{19770407-63D4-40A8-A9DF-F1C4B473308A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli-Manager", "Cli\Manager\Cli-Manager.csproj", "{19770407-63D4-40A8-A9DF-F1C4B473308A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli-Askpass", "Cli-Askpass\Cli-Askpass.csproj", "{19770407-B33A-4EBE-92B8-04C93F43CAE0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli-Askpass", "Cli\Askpass\Cli-Askpass.csproj", "{19770407-B33A-4EBE-92B8-04C93F43CAE0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Alm.Authentication.Test", "Microsoft.Alm.Authentication.Test\Microsoft.Alm.Authentication.Test.csproj", "{19781214-371F-415C-93C5-44CEAA0E9A34}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Alm.Authentication.Test", "Microsoft.Alm.Authentication\Test\Microsoft.Alm.Authentication.Test.csproj", "{19781214-371F-415C-93C5-44CEAA0E9A34}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Vsts.Authentication.Test", "Microsoft.Vsts.Authentication.Test\Microsoft.Vsts.Authentication.Test.csproj", "{19781214-5254-464A-BC69-FAC502046564}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Vsts.Authentication.Test", "Microsoft.Vsts.Authentication\Test\Microsoft.Vsts.Authentication.Test.csproj", "{19781214-5254-464A-BC69-FAC502046564}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bitbucket.Authentication.Test", "Bitbucket.Authentication.Test\Bitbucket.Authentication.Test.csproj", "{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bitbucket.Authentication.Test", "Bitbucket.Authentication\Test\Bitbucket.Authentication.Test.csproj", "{AECD6D57-F900-4D43-A01A-4AA3C68F39C2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli-Manager.Test", "Cli-Manager.Test\Cli-Manager.Test.csproj", "{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli-Test", "Cli\Test\Cli-Test.csproj", "{19781214-AE6D-4DCC-BA9F-12CB0C6581AE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Authentication.Test", "GitHub.Authentication\Test\GitHub.Authentication.Test.csproj", "{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Gui-Shared", "Gui-Shared\Gui-Shared.shproj", "{4A4F5ADA-7166-4799-BC7C-D5882637CF7A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Authentication.Test", "GitHub.Authentication.Test\GitHub.Authentication.Test.csproj", "{F24E0E80-8DDB-41D4-9F94-DCBC0CE81583}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Installer", "Installer\Installer.proj", "{19770407-3808-4B17-9EE0-21DD3468F875}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GcmParentWindowTest", "GcmParentWindowTest\GcmParentWindowTest.csproj", "{2F110EEF-14BA-4324-9DA4-C7D16469B064}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - Cli-Shared\Cli-Shared.projitems*{19770407-63d4-40a8-a9df-f1c4b473308a}*SharedItemsImports = 4 - Cli-Shared\Cli-Shared.projitems*{19770407-94d5-49d3-8ed1-c72637ba7d90}*SharedItemsImports = 13 - Cli-Shared\Cli-Shared.projitems*{19770407-b33a-4ebe-92b8-04c93f43cae0}*SharedItemsImports = 4 + Cli\Shared\Cli-Shared.projitems*{19770407-63d4-40a8-a9df-f1c4b473308a}*SharedItemsImports = 4 + Cli\Shared\Cli-Shared.projitems*{19770407-94d5-49d3-8ed1-c72637ba7d90}*SharedItemsImports = 13 + Cli\Shared\Cli-Shared.projitems*{19770407-b33a-4ebe-92b8-04c93f43cae0}*SharedItemsImports = 4 Gui-Shared\Gui-Shared.projitems*{4a4f5ada-7166-4799-bc7c-d5882637cf7a}*SharedItemsImports = 13 Gui-Shared\Gui-Shared.projitems*{cf306116-bbf0-4cc7-afce-a506ac4752cb}*SharedItemsImports = 4 Gui-Shared\Gui-Shared.projitems*{ee663736-5bad-4ca6-a4f8-99978925ad8a}*SharedItemsImports = 4 diff --git a/GitHub.Authentication/App.config b/GitHub.Authentication/Src/App.config similarity index 100% rename from GitHub.Authentication/App.config rename to GitHub.Authentication/Src/App.config diff --git a/GitHub.Authentication/App.xaml b/GitHub.Authentication/Src/App.xaml similarity index 100% rename from GitHub.Authentication/App.xaml rename to GitHub.Authentication/Src/App.xaml diff --git a/GitHub.Authentication/App.xaml.cs b/GitHub.Authentication/Src/App.xaml.cs similarity index 100% rename from GitHub.Authentication/App.xaml.cs rename to GitHub.Authentication/Src/App.xaml.cs diff --git a/GitHub.Authentication/AppResources.xaml b/GitHub.Authentication/Src/AppResources.xaml similarity index 100% rename from GitHub.Authentication/AppResources.xaml rename to GitHub.Authentication/Src/AppResources.xaml diff --git a/GitHub.Authentication/Assets/Styles.xaml b/GitHub.Authentication/Src/Assets/Styles.xaml similarity index 100% rename from GitHub.Authentication/Assets/Styles.xaml rename to GitHub.Authentication/Src/Assets/Styles.xaml diff --git a/GitHub.Authentication/Assets/TextBlocks.xaml b/GitHub.Authentication/Src/Assets/TextBlocks.xaml similarity index 100% rename from GitHub.Authentication/Assets/TextBlocks.xaml rename to GitHub.Authentication/Src/Assets/TextBlocks.xaml diff --git a/GitHub.Authentication/Assets/ValidationMessage.xaml b/GitHub.Authentication/Src/Assets/ValidationMessage.xaml similarity index 100% rename from GitHub.Authentication/Assets/ValidationMessage.xaml rename to GitHub.Authentication/Src/Assets/ValidationMessage.xaml diff --git a/GitHub.Authentication/Assets/octocat-mark.ico b/GitHub.Authentication/Src/Assets/octocat-mark.ico similarity index 100% rename from GitHub.Authentication/Assets/octocat-mark.ico rename to GitHub.Authentication/Src/Assets/octocat-mark.ico diff --git a/GitHub.Authentication/Authentication.cs b/GitHub.Authentication/Src/Authentication.cs similarity index 100% rename from GitHub.Authentication/Authentication.cs rename to GitHub.Authentication/Src/Authentication.cs diff --git a/GitHub.Authentication/AuthenticationPrompts.cs b/GitHub.Authentication/Src/AuthenticationPrompts.cs similarity index 100% rename from GitHub.Authentication/AuthenticationPrompts.cs rename to GitHub.Authentication/Src/AuthenticationPrompts.cs diff --git a/GitHub.Authentication/AuthenticationResult.cs b/GitHub.Authentication/Src/AuthenticationResult.cs similarity index 100% rename from GitHub.Authentication/AuthenticationResult.cs rename to GitHub.Authentication/Src/AuthenticationResult.cs diff --git a/GitHub.Authentication/Authority.cs b/GitHub.Authentication/Src/Authority.cs similarity index 100% rename from GitHub.Authentication/Authority.cs rename to GitHub.Authentication/Src/Authority.cs diff --git a/GitHub.Authentication/Controls/Buttons/OcticonButton.cs b/GitHub.Authentication/Src/Controls/Buttons/OcticonButton.cs similarity index 100% rename from GitHub.Authentication/Controls/Buttons/OcticonButton.cs rename to GitHub.Authentication/Src/Controls/Buttons/OcticonButton.cs diff --git a/GitHub.Authentication/Controls/Buttons/OcticonCircleButton.cs b/GitHub.Authentication/Src/Controls/Buttons/OcticonCircleButton.cs similarity index 100% rename from GitHub.Authentication/Controls/Buttons/OcticonCircleButton.cs rename to GitHub.Authentication/Src/Controls/Buttons/OcticonCircleButton.cs diff --git a/GitHub.Authentication/Controls/Buttons/OcticonCircleButton.xaml b/GitHub.Authentication/Src/Controls/Buttons/OcticonCircleButton.xaml similarity index 100% rename from GitHub.Authentication/Controls/Buttons/OcticonCircleButton.xaml rename to GitHub.Authentication/Src/Controls/Buttons/OcticonCircleButton.xaml diff --git a/GitHub.Authentication/Controls/CredentialsControl.xaml b/GitHub.Authentication/Src/Controls/CredentialsControl.xaml similarity index 100% rename from GitHub.Authentication/Controls/CredentialsControl.xaml rename to GitHub.Authentication/Src/Controls/CredentialsControl.xaml diff --git a/GitHub.Authentication/Controls/CredentialsControl.xaml.cs b/GitHub.Authentication/Src/Controls/CredentialsControl.xaml.cs similarity index 100% rename from GitHub.Authentication/Controls/CredentialsControl.xaml.cs rename to GitHub.Authentication/Src/Controls/CredentialsControl.xaml.cs diff --git a/GitHub.Authentication/Controls/HorizontalShadowDivider.xaml b/GitHub.Authentication/Src/Controls/HorizontalShadowDivider.xaml similarity index 100% rename from GitHub.Authentication/Controls/HorizontalShadowDivider.xaml rename to GitHub.Authentication/Src/Controls/HorizontalShadowDivider.xaml diff --git a/GitHub.Authentication/Controls/HorizontalShadowDivider.xaml.cs b/GitHub.Authentication/Src/Controls/HorizontalShadowDivider.xaml.cs similarity index 100% rename from GitHub.Authentication/Controls/HorizontalShadowDivider.xaml.cs rename to GitHub.Authentication/Src/Controls/HorizontalShadowDivider.xaml.cs diff --git a/GitHub.Authentication/Controls/Octicons/OcticonImage.cs b/GitHub.Authentication/Src/Controls/Octicons/OcticonImage.cs similarity index 100% rename from GitHub.Authentication/Controls/Octicons/OcticonImage.cs rename to GitHub.Authentication/Src/Controls/Octicons/OcticonImage.cs diff --git a/GitHub.Authentication/Controls/Octicons/OcticonImage.xaml b/GitHub.Authentication/Src/Controls/Octicons/OcticonImage.xaml similarity index 100% rename from GitHub.Authentication/Controls/Octicons/OcticonImage.xaml rename to GitHub.Authentication/Src/Controls/Octicons/OcticonImage.xaml diff --git a/GitHub.Authentication/Controls/Octicons/OcticonPath.cs b/GitHub.Authentication/Src/Controls/Octicons/OcticonPath.cs similarity index 100% rename from GitHub.Authentication/Controls/Octicons/OcticonPath.cs rename to GitHub.Authentication/Src/Controls/Octicons/OcticonPath.cs diff --git a/GitHub.Authentication/Controls/Octicons/OcticonPaths.Designer.cs b/GitHub.Authentication/Src/Controls/Octicons/OcticonPaths.Designer.cs similarity index 100% rename from GitHub.Authentication/Controls/Octicons/OcticonPaths.Designer.cs rename to GitHub.Authentication/Src/Controls/Octicons/OcticonPaths.Designer.cs diff --git a/GitHub.Authentication/Controls/Octicons/OcticonPaths.resx b/GitHub.Authentication/Src/Controls/Octicons/OcticonPaths.resx similarity index 100% rename from GitHub.Authentication/Controls/Octicons/OcticonPaths.resx rename to GitHub.Authentication/Src/Controls/Octicons/OcticonPaths.resx diff --git a/GitHub.Authentication/Controls/Panels/FixedAspectRatioPanel.cs b/GitHub.Authentication/Src/Controls/Panels/FixedAspectRatioPanel.cs similarity index 100% rename from GitHub.Authentication/Controls/Panels/FixedAspectRatioPanel.cs rename to GitHub.Authentication/Src/Controls/Panels/FixedAspectRatioPanel.cs diff --git a/GitHub.Authentication/Controls/Text/ValidationMessage.cs b/GitHub.Authentication/Src/Controls/Text/ValidationMessage.cs similarity index 100% rename from GitHub.Authentication/Controls/Text/ValidationMessage.cs rename to GitHub.Authentication/Src/Controls/Text/ValidationMessage.cs diff --git a/GitHub.Authentication/Controls/TwoFactorControl.xaml b/GitHub.Authentication/Src/Controls/TwoFactorControl.xaml similarity index 100% rename from GitHub.Authentication/Controls/TwoFactorControl.xaml rename to GitHub.Authentication/Src/Controls/TwoFactorControl.xaml diff --git a/GitHub.Authentication/Controls/TwoFactorControl.xaml.cs b/GitHub.Authentication/Src/Controls/TwoFactorControl.xaml.cs similarity index 100% rename from GitHub.Authentication/Controls/TwoFactorControl.xaml.cs rename to GitHub.Authentication/Src/Controls/TwoFactorControl.xaml.cs diff --git a/GitHub.Authentication/Controls/TwoFactorInput.xaml b/GitHub.Authentication/Src/Controls/TwoFactorInput.xaml similarity index 100% rename from GitHub.Authentication/Controls/TwoFactorInput.xaml rename to GitHub.Authentication/Src/Controls/TwoFactorInput.xaml diff --git a/GitHub.Authentication/Controls/TwoFactorInput.xaml.cs b/GitHub.Authentication/Src/Controls/TwoFactorInput.xaml.cs similarity index 100% rename from GitHub.Authentication/Controls/TwoFactorInput.xaml.cs rename to GitHub.Authentication/Src/Controls/TwoFactorInput.xaml.cs diff --git a/GitHub.Authentication/CredentialsWindow.xaml b/GitHub.Authentication/Src/CredentialsWindow.xaml similarity index 100% rename from GitHub.Authentication/CredentialsWindow.xaml rename to GitHub.Authentication/Src/CredentialsWindow.xaml diff --git a/GitHub.Authentication/CredentialsWindow.xaml.cs b/GitHub.Authentication/Src/CredentialsWindow.xaml.cs similarity index 100% rename from GitHub.Authentication/CredentialsWindow.xaml.cs rename to GitHub.Authentication/Src/CredentialsWindow.xaml.cs diff --git a/GitHub.Authentication/GitHub.Authentication.csproj b/GitHub.Authentication/Src/GitHub.Authentication.csproj similarity index 91% rename from GitHub.Authentication/GitHub.Authentication.csproj rename to GitHub.Authentication/Src/GitHub.Authentication.csproj index 3a0356f..7b2d9bf 100644 --- a/GitHub.Authentication/GitHub.Authentication.csproj +++ b/GitHub.Authentication/Src/GitHub.Authentication.csproj @@ -1,6 +1,6 @@  - + Properties @@ -14,7 +14,7 @@ GitHub.Authentication v4.5.1 - + false v4.5.1 @@ -176,10 +176,12 @@ - + + false + - + {19770407-B493-459D-BB4F-04FBEFB1BA13} Microsoft.Alm.Authentication @@ -188,11 +190,11 @@ - + 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}. - + \ No newline at end of file diff --git a/GitHub.Authentication/GlobalSuppressions.cs b/GitHub.Authentication/Src/GlobalSuppressions.cs similarity index 100% rename from GitHub.Authentication/GlobalSuppressions.cs rename to GitHub.Authentication/Src/GlobalSuppressions.cs diff --git a/GitHub.Authentication/Helpers/BindingProxy.cs b/GitHub.Authentication/Src/Helpers/BindingProxy.cs similarity index 100% rename from GitHub.Authentication/Helpers/BindingProxy.cs rename to GitHub.Authentication/Src/Helpers/BindingProxy.cs diff --git a/GitHub.Authentication/IAuthentication.cs b/GitHub.Authentication/Src/IAuthentication.cs similarity index 100% rename from GitHub.Authentication/IAuthentication.cs rename to GitHub.Authentication/Src/IAuthentication.cs diff --git a/GitHub.Authentication/IAuthority.cs b/GitHub.Authentication/Src/IAuthority.cs similarity index 100% rename from GitHub.Authentication/IAuthority.cs rename to GitHub.Authentication/Src/IAuthority.cs diff --git a/GitHub.Authentication/Octicon.cs b/GitHub.Authentication/Src/Octicon.cs similarity index 100% rename from GitHub.Authentication/Octicon.cs rename to GitHub.Authentication/Src/Octicon.cs diff --git a/GitHub.Authentication/Properties/AssemblyInfo.cs b/GitHub.Authentication/Src/Properties/AssemblyInfo.cs similarity index 100% rename from GitHub.Authentication/Properties/AssemblyInfo.cs rename to GitHub.Authentication/Src/Properties/AssemblyInfo.cs diff --git a/GitHub.Authentication/Properties/Resources.Designer.cs b/GitHub.Authentication/Src/Properties/Resources.Designer.cs similarity index 100% rename from GitHub.Authentication/Properties/Resources.Designer.cs rename to GitHub.Authentication/Src/Properties/Resources.Designer.cs diff --git a/GitHub.Authentication/Properties/Resources.resx b/GitHub.Authentication/Src/Properties/Resources.resx similarity index 100% rename from GitHub.Authentication/Properties/Resources.resx rename to GitHub.Authentication/Src/Properties/Resources.resx diff --git a/GitHub.Authentication/Properties/Settings.Designer.cs b/GitHub.Authentication/Src/Properties/Settings.Designer.cs similarity index 100% rename from GitHub.Authentication/Properties/Settings.Designer.cs rename to GitHub.Authentication/Src/Properties/Settings.Designer.cs diff --git a/GitHub.Authentication/Properties/Settings.settings b/GitHub.Authentication/Src/Properties/Settings.settings similarity index 100% rename from GitHub.Authentication/Properties/Settings.settings rename to GitHub.Authentication/Src/Properties/Settings.settings diff --git a/GitHub.Authentication/Tester.xaml b/GitHub.Authentication/Src/Tester.xaml similarity index 100% rename from GitHub.Authentication/Tester.xaml rename to GitHub.Authentication/Src/Tester.xaml diff --git a/GitHub.Authentication/Tester.xaml.cs b/GitHub.Authentication/Src/Tester.xaml.cs similarity index 100% rename from GitHub.Authentication/Tester.xaml.cs rename to GitHub.Authentication/Src/Tester.xaml.cs diff --git a/GitHub.Authentication/TokenScope.cs b/GitHub.Authentication/Src/TokenScope.cs similarity index 100% rename from GitHub.Authentication/TokenScope.cs rename to GitHub.Authentication/Src/TokenScope.cs diff --git a/GitHub.Authentication/TwoFactorWindow.xaml b/GitHub.Authentication/Src/TwoFactorWindow.xaml similarity index 100% rename from GitHub.Authentication/TwoFactorWindow.xaml rename to GitHub.Authentication/Src/TwoFactorWindow.xaml diff --git a/GitHub.Authentication/TwoFactorWindow.xaml.cs b/GitHub.Authentication/Src/TwoFactorWindow.xaml.cs similarity index 100% rename from GitHub.Authentication/TwoFactorWindow.xaml.cs rename to GitHub.Authentication/Src/TwoFactorWindow.xaml.cs diff --git a/GitHub.Authentication/ViewModels/CredentialsViewModel.cs b/GitHub.Authentication/Src/ViewModels/CredentialsViewModel.cs similarity index 100% rename from GitHub.Authentication/ViewModels/CredentialsViewModel.cs rename to GitHub.Authentication/Src/ViewModels/CredentialsViewModel.cs diff --git a/GitHub.Authentication/ViewModels/TwoFactorViewModel.cs b/GitHub.Authentication/Src/ViewModels/TwoFactorViewModel.cs similarity index 100% rename from GitHub.Authentication/ViewModels/TwoFactorViewModel.cs rename to GitHub.Authentication/Src/ViewModels/TwoFactorViewModel.cs diff --git a/GitHub.Authentication/packages.config b/GitHub.Authentication/Src/packages.config similarity index 100% rename from GitHub.Authentication/packages.config rename to GitHub.Authentication/Src/packages.config diff --git a/GitHub.Authentication.Test/ActionCommandTests.cs b/GitHub.Authentication/Test/ActionCommandTests.cs similarity index 100% rename from GitHub.Authentication.Test/ActionCommandTests.cs rename to GitHub.Authentication/Test/ActionCommandTests.cs diff --git a/GitHub.Authentication.Test/AuthenticationTests.cs b/GitHub.Authentication/Test/AuthenticationTests.cs similarity index 100% rename from GitHub.Authentication.Test/AuthenticationTests.cs rename to GitHub.Authentication/Test/AuthenticationTests.cs diff --git a/GitHub.Authentication.Test/Controls/MaskedPasswordBoxTests.cs b/GitHub.Authentication/Test/Controls/MaskedPasswordBoxTests.cs similarity index 100% rename from GitHub.Authentication.Test/Controls/MaskedPasswordBoxTests.cs rename to GitHub.Authentication/Test/Controls/MaskedPasswordBoxTests.cs diff --git a/GitHub.Authentication.Test/CredentialsViewModelTests.cs b/GitHub.Authentication/Test/CredentialsViewModelTests.cs similarity index 100% rename from GitHub.Authentication.Test/CredentialsViewModelTests.cs rename to GitHub.Authentication/Test/CredentialsViewModelTests.cs diff --git a/GitHub.Authentication.Test/Fakes/InMemoryCredentialStore.cs b/GitHub.Authentication/Test/Fakes/InMemoryCredentialStore.cs similarity index 100% rename from GitHub.Authentication.Test/Fakes/InMemoryCredentialStore.cs rename to GitHub.Authentication/Test/Fakes/InMemoryCredentialStore.cs diff --git a/GitHub.Authentication.Test/GitHub.Authentication.Test.csproj b/GitHub.Authentication/Test/GitHub.Authentication.Test.csproj similarity index 62% rename from GitHub.Authentication.Test/GitHub.Authentication.Test.csproj rename to GitHub.Authentication/Test/GitHub.Authentication.Test.csproj index d463e37..3c8e0a8 100644 --- a/GitHub.Authentication.Test/GitHub.Authentication.Test.csproj +++ b/GitHub.Authentication/Test/GitHub.Authentication.Test.csproj @@ -1,8 +1,8 @@  - - - + + + {F24E0E80-8DDB-41D4-9F94-DCBC0CE81583} @@ -14,7 +14,7 @@ - + @@ -25,16 +25,16 @@ - ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll + ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - ..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll + ..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll - ..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll + ..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll - ..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll + ..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll @@ -59,11 +59,11 @@ - + {cf306116-bbf0-4cc7-afce-a506ac4752cb} GitHub.Authentication - + {19770407-b493-459d-bb4f-04fbefb1ba13} Microsoft.Alm.Authentication @@ -72,26 +72,26 @@ - + xunit.runner.json Always - + 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}. - - - - + + + + - + - + false - + false @@ -155,7 +157,7 @@ - + diff --git a/Microsoft.Alm.Authentication/Base.cs b/Microsoft.Alm.Authentication/Src/Base.cs similarity index 100% rename from Microsoft.Alm.Authentication/Base.cs rename to Microsoft.Alm.Authentication/Src/Base.cs diff --git a/Microsoft.Alm.Authentication/BaseAuthentication.cs b/Microsoft.Alm.Authentication/Src/BaseAuthentication.cs similarity index 100% rename from Microsoft.Alm.Authentication/BaseAuthentication.cs rename to Microsoft.Alm.Authentication/Src/BaseAuthentication.cs diff --git a/Microsoft.Alm.Authentication/BaseSecureStore.cs b/Microsoft.Alm.Authentication/Src/BaseSecureStore.cs similarity index 100% rename from Microsoft.Alm.Authentication/BaseSecureStore.cs rename to Microsoft.Alm.Authentication/Src/BaseSecureStore.cs diff --git a/Microsoft.Alm.Authentication/BasicAuthentication.cs b/Microsoft.Alm.Authentication/Src/BasicAuthentication.cs similarity index 100% rename from Microsoft.Alm.Authentication/BasicAuthentication.cs rename to Microsoft.Alm.Authentication/Src/BasicAuthentication.cs diff --git a/Microsoft.Alm.Authentication/Credential.cs b/Microsoft.Alm.Authentication/Src/Credential.cs similarity index 100% rename from Microsoft.Alm.Authentication/Credential.cs rename to Microsoft.Alm.Authentication/Src/Credential.cs diff --git a/Microsoft.Alm.Authentication/Git/Configuration.cs b/Microsoft.Alm.Authentication/Src/Git/Configuration.cs similarity index 100% rename from Microsoft.Alm.Authentication/Git/Configuration.cs rename to Microsoft.Alm.Authentication/Src/Git/Configuration.cs diff --git a/Microsoft.Alm.Authentication/Git/ConfigurationLevel.cs b/Microsoft.Alm.Authentication/Src/Git/ConfigurationLevel.cs similarity index 100% rename from Microsoft.Alm.Authentication/Git/ConfigurationLevel.cs rename to Microsoft.Alm.Authentication/Src/Git/ConfigurationLevel.cs diff --git a/Microsoft.Alm.Authentication/Git/Installation.cs b/Microsoft.Alm.Authentication/Src/Git/Installation.cs similarity index 100% rename from Microsoft.Alm.Authentication/Git/Installation.cs rename to Microsoft.Alm.Authentication/Src/Git/Installation.cs diff --git a/Microsoft.Alm.Authentication/Git/InstallationComparer.cs b/Microsoft.Alm.Authentication/Src/Git/InstallationComparer.cs similarity index 100% rename from Microsoft.Alm.Authentication/Git/InstallationComparer.cs rename to Microsoft.Alm.Authentication/Src/Git/InstallationComparer.cs diff --git a/Microsoft.Alm.Authentication/Git/KnownDistribution.cs b/Microsoft.Alm.Authentication/Src/Git/KnownDistribution.cs similarity index 100% rename from Microsoft.Alm.Authentication/Git/KnownDistribution.cs rename to Microsoft.Alm.Authentication/Src/Git/KnownDistribution.cs diff --git a/Microsoft.Alm.Authentication/Git/Trace.cs b/Microsoft.Alm.Authentication/Src/Git/Trace.cs similarity index 100% rename from Microsoft.Alm.Authentication/Git/Trace.cs rename to Microsoft.Alm.Authentication/Src/Git/Trace.cs diff --git a/Microsoft.Alm.Authentication/Git/Where.cs b/Microsoft.Alm.Authentication/Src/Git/Where.cs similarity index 100% rename from Microsoft.Alm.Authentication/Git/Where.cs rename to Microsoft.Alm.Authentication/Src/Git/Where.cs diff --git a/Microsoft.Alm.Authentication/Global.cs b/Microsoft.Alm.Authentication/Src/Global.cs similarity index 100% rename from Microsoft.Alm.Authentication/Global.cs rename to Microsoft.Alm.Authentication/Src/Global.cs diff --git a/Microsoft.Alm.Authentication/GlobalSuppressions.cs b/Microsoft.Alm.Authentication/Src/GlobalSuppressions.cs similarity index 100% rename from Microsoft.Alm.Authentication/GlobalSuppressions.cs rename to Microsoft.Alm.Authentication/Src/GlobalSuppressions.cs diff --git a/Microsoft.Alm.Authentication/IAuthentication.cs b/Microsoft.Alm.Authentication/Src/IAuthentication.cs similarity index 100% rename from Microsoft.Alm.Authentication/IAuthentication.cs rename to Microsoft.Alm.Authentication/Src/IAuthentication.cs diff --git a/Microsoft.Alm.Authentication/ICredentialStore.cs b/Microsoft.Alm.Authentication/Src/ICredentialStore.cs similarity index 100% rename from Microsoft.Alm.Authentication/ICredentialStore.cs rename to Microsoft.Alm.Authentication/Src/ICredentialStore.cs diff --git a/Microsoft.Alm.Authentication/ISecretStore.cs b/Microsoft.Alm.Authentication/Src/ISecretStore.cs similarity index 100% rename from Microsoft.Alm.Authentication/ISecretStore.cs rename to Microsoft.Alm.Authentication/Src/ISecretStore.cs diff --git a/Microsoft.Alm.Authentication/ITokenStore.cs b/Microsoft.Alm.Authentication/Src/ITokenStore.cs similarity index 100% rename from Microsoft.Alm.Authentication/ITokenStore.cs rename to Microsoft.Alm.Authentication/Src/ITokenStore.cs diff --git a/Microsoft.Alm.Authentication/Microsoft.Alm.Authentication.csproj b/Microsoft.Alm.Authentication/Src/Microsoft.Alm.Authentication.csproj similarity index 72% rename from Microsoft.Alm.Authentication/Microsoft.Alm.Authentication.csproj rename to Microsoft.Alm.Authentication/Src/Microsoft.Alm.Authentication.csproj index 5f93ca4..d884ed3 100644 --- a/Microsoft.Alm.Authentication/Microsoft.Alm.Authentication.csproj +++ b/Microsoft.Alm.Authentication/Src/Microsoft.Alm.Authentication.csproj @@ -1,7 +1,7 @@  - - + + Properties @@ -13,7 +13,7 @@ Microsoft.Alm.Authentication v4.5.1 - + $(MSBuildThisFileDirectory) $(ProjectDir)$(OutputPath) @@ -66,7 +66,6 @@ false - @@ -75,14 +74,14 @@ - + 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}. - - - + + + - + \ No newline at end of file diff --git a/Microsoft.Alm.Authentication/NativeMethods.cs b/Microsoft.Alm.Authentication/Src/NativeMethods.cs similarity index 100% rename from Microsoft.Alm.Authentication/NativeMethods.cs rename to Microsoft.Alm.Authentication/Src/NativeMethods.cs diff --git a/Microsoft.Alm.Authentication/Network.cs b/Microsoft.Alm.Authentication/Src/Network.cs similarity index 100% rename from Microsoft.Alm.Authentication/Network.cs rename to Microsoft.Alm.Authentication/Src/Network.cs diff --git a/Microsoft.Alm.Authentication/NtlmSupport.cs b/Microsoft.Alm.Authentication/Src/NtlmSupport.cs similarity index 100% rename from Microsoft.Alm.Authentication/NtlmSupport.cs rename to Microsoft.Alm.Authentication/Src/NtlmSupport.cs diff --git a/Microsoft.Alm.Authentication/Properties/AssemblyInfo.cs b/Microsoft.Alm.Authentication/Src/Properties/AssemblyInfo.cs similarity index 88% rename from Microsoft.Alm.Authentication/Properties/AssemblyInfo.cs rename to Microsoft.Alm.Authentication/Src/Properties/AssemblyInfo.cs index d793728..40f2e16 100644 --- a/Microsoft.Alm.Authentication/Properties/AssemblyInfo.cs +++ b/Microsoft.Alm.Authentication/Src/Properties/AssemblyInfo.cs @@ -15,7 +15,11 @@ using System.Runtime.InteropServices; [assembly: Guid("c1daabc1-b493-459d-bb4f-04fbefb1ba13")] [assembly: AssemblyVersion("4.4.0.0")] [assembly: AssemblyFileVersion("4.4.0.0")] -[assembly: InternalsVisibleTo("Microsoft.Alm.Authentication.Test")] -[assembly: InternalsVisibleTo("Microsoft.Alm.CredentialHelper.Test")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] [assembly: NeutralResourcesLanguage("en-US")] + +// Only expose internals when the binary isn't signed. +#if !SIGNED +[assembly: InternalsVisibleTo("Microsoft.Alm.Authentication.Test")] +[assembly: InternalsVisibleTo("Microsoft.Alm.Cli.Test")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] +#endif diff --git a/Microsoft.Alm.Authentication/RuntimeContext.cs b/Microsoft.Alm.Authentication/Src/RuntimeContext.cs similarity index 100% rename from Microsoft.Alm.Authentication/RuntimeContext.cs rename to Microsoft.Alm.Authentication/Src/RuntimeContext.cs diff --git a/Microsoft.Alm.Authentication/Secret.cs b/Microsoft.Alm.Authentication/Src/Secret.cs similarity index 100% rename from Microsoft.Alm.Authentication/Secret.cs rename to Microsoft.Alm.Authentication/Src/Secret.cs diff --git a/Microsoft.Alm.Authentication/SecretCache.cs b/Microsoft.Alm.Authentication/Src/SecretCache.cs similarity index 100% rename from Microsoft.Alm.Authentication/SecretCache.cs rename to Microsoft.Alm.Authentication/Src/SecretCache.cs diff --git a/Microsoft.Alm.Authentication/SecretStore.cs b/Microsoft.Alm.Authentication/Src/SecretStore.cs similarity index 100% rename from Microsoft.Alm.Authentication/SecretStore.cs rename to Microsoft.Alm.Authentication/Src/SecretStore.cs diff --git a/Microsoft.Alm.Authentication/Storage.cs b/Microsoft.Alm.Authentication/Src/Storage.cs similarity index 100% rename from Microsoft.Alm.Authentication/Storage.cs rename to Microsoft.Alm.Authentication/Src/Storage.cs diff --git a/Microsoft.Alm.Authentication/TargetUri.cs b/Microsoft.Alm.Authentication/Src/TargetUri.cs similarity index 100% rename from Microsoft.Alm.Authentication/TargetUri.cs rename to Microsoft.Alm.Authentication/Src/TargetUri.cs diff --git a/Microsoft.Alm.Authentication/Token.cs b/Microsoft.Alm.Authentication/Src/Token.cs similarity index 100% rename from Microsoft.Alm.Authentication/Token.cs rename to Microsoft.Alm.Authentication/Src/Token.cs diff --git a/Microsoft.Alm.Authentication/TokenScope.cs b/Microsoft.Alm.Authentication/Src/TokenScope.cs similarity index 100% rename from Microsoft.Alm.Authentication/TokenScope.cs rename to Microsoft.Alm.Authentication/Src/TokenScope.cs diff --git a/Microsoft.Alm.Authentication/TokenType.cs b/Microsoft.Alm.Authentication/Src/TokenType.cs similarity index 100% rename from Microsoft.Alm.Authentication/TokenType.cs rename to Microsoft.Alm.Authentication/Src/TokenType.cs diff --git a/Microsoft.Alm.Authentication/WwwAuthenticateHelper.cs b/Microsoft.Alm.Authentication/Src/WwwAuthenticateHelper.cs similarity index 100% rename from Microsoft.Alm.Authentication/WwwAuthenticateHelper.cs rename to Microsoft.Alm.Authentication/Src/WwwAuthenticateHelper.cs diff --git a/Microsoft.Alm.Authentication/app.config b/Microsoft.Alm.Authentication/Src/app.config similarity index 100% rename from Microsoft.Alm.Authentication/app.config rename to Microsoft.Alm.Authentication/Src/app.config diff --git a/Microsoft.Alm.Authentication/packages.config b/Microsoft.Alm.Authentication/Src/packages.config similarity index 100% rename from Microsoft.Alm.Authentication/packages.config rename to Microsoft.Alm.Authentication/Src/packages.config diff --git a/Microsoft.Alm.Authentication.Test/AuthenticationTests.cs b/Microsoft.Alm.Authentication/Test/AuthenticationTests.cs similarity index 100% rename from Microsoft.Alm.Authentication.Test/AuthenticationTests.cs rename to Microsoft.Alm.Authentication/Test/AuthenticationTests.cs diff --git a/Microsoft.Alm.Authentication.Test/BasicAuthTests.cs b/Microsoft.Alm.Authentication/Test/BasicAuthTests.cs similarity index 100% rename from Microsoft.Alm.Authentication.Test/BasicAuthTests.cs rename to Microsoft.Alm.Authentication/Test/BasicAuthTests.cs diff --git a/Microsoft.Alm.Authentication.Test/CredentialStoreTest.cs b/Microsoft.Alm.Authentication/Test/CredentialStoreTest.cs similarity index 100% rename from Microsoft.Alm.Authentication.Test/CredentialStoreTest.cs rename to Microsoft.Alm.Authentication/Test/CredentialStoreTest.cs diff --git a/Microsoft.Alm.Authentication.Test/CredentialTests.cs b/Microsoft.Alm.Authentication/Test/CredentialTests.cs similarity index 100% rename from Microsoft.Alm.Authentication.Test/CredentialTests.cs rename to Microsoft.Alm.Authentication/Test/CredentialTests.cs diff --git a/Microsoft.Alm.Authentication.Test/Git/ConfigurationTests.cs b/Microsoft.Alm.Authentication/Test/Git/ConfigurationTests.cs similarity index 100% rename from Microsoft.Alm.Authentication.Test/Git/ConfigurationTests.cs rename to Microsoft.Alm.Authentication/Test/Git/ConfigurationTests.cs diff --git a/Microsoft.Alm.Authentication.Test/Git/GlobalSuppressions.cs b/Microsoft.Alm.Authentication/Test/Git/GlobalSuppressions.cs similarity index 100% rename from Microsoft.Alm.Authentication.Test/Git/GlobalSuppressions.cs rename to Microsoft.Alm.Authentication/Test/Git/GlobalSuppressions.cs diff --git a/Microsoft.Alm.Authentication.Test/Git/InstallationTests.cs b/Microsoft.Alm.Authentication/Test/Git/InstallationTests.cs similarity index 100% rename from Microsoft.Alm.Authentication.Test/Git/InstallationTests.cs rename to Microsoft.Alm.Authentication/Test/Git/InstallationTests.cs diff --git a/Microsoft.Alm.Authentication.Test/Git/WhereTests.cs b/Microsoft.Alm.Authentication/Test/Git/WhereTests.cs similarity index 100% rename from Microsoft.Alm.Authentication.Test/Git/WhereTests.cs rename to Microsoft.Alm.Authentication/Test/Git/WhereTests.cs diff --git a/Microsoft.Alm.Authentication.Test/Git/sample.gitconfig b/Microsoft.Alm.Authentication/Test/Git/sample.gitconfig similarity index 100% rename from Microsoft.Alm.Authentication.Test/Git/sample.gitconfig rename to Microsoft.Alm.Authentication/Test/Git/sample.gitconfig diff --git a/Microsoft.Alm.Authentication.Test/GlobalSuppressions.cs b/Microsoft.Alm.Authentication/Test/GlobalSuppressions.cs similarity index 100% rename from Microsoft.Alm.Authentication.Test/GlobalSuppressions.cs rename to Microsoft.Alm.Authentication/Test/GlobalSuppressions.cs diff --git a/Microsoft.Alm.Authentication.Test/Microsoft.Alm.Authentication.Test.csproj b/Microsoft.Alm.Authentication/Test/Microsoft.Alm.Authentication.Test.csproj similarity index 55% rename from Microsoft.Alm.Authentication.Test/Microsoft.Alm.Authentication.Test.csproj rename to Microsoft.Alm.Authentication/Test/Microsoft.Alm.Authentication.Test.csproj index a96f2a1..2190e50 100644 --- a/Microsoft.Alm.Authentication.Test/Microsoft.Alm.Authentication.Test.csproj +++ b/Microsoft.Alm.Authentication/Test/Microsoft.Alm.Authentication.Test.csproj @@ -1,8 +1,8 @@  - - - + + + Microsoft.Alm.Authentication.Test Properties @@ -12,31 +12,31 @@ {19781214-371F-415C-93C5-44CEAA0E9A34} Microsoft.Alm.Authentication.Test - + - ..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll + ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll - ..\packages\Moq.4.8.2\lib\net45\Moq.dll + ..\..\packages\Moq.4.8.2\lib\net45\Moq.dll - ..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + ..\..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - ..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll + ..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll - ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll + ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - ..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll + ..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll - ..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll + ..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll - ..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll + ..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll @@ -56,7 +56,7 @@ - + {19770407-b493-459d-bb4f-04fbefb1ba13} Microsoft.Alm.Authentication @@ -70,18 +70,18 @@ - + - + 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}. - - - - + + + + - + \ No newline at end of file diff --git a/Microsoft.Alm.Authentication.Test/Properties/AssemblyInfo.cs b/Microsoft.Alm.Authentication/Test/Properties/AssemblyInfo.cs similarity index 100% rename from Microsoft.Alm.Authentication.Test/Properties/AssemblyInfo.cs rename to Microsoft.Alm.Authentication/Test/Properties/AssemblyInfo.cs diff --git a/Microsoft.Alm.Authentication.Test/TargetUriTests.cs b/Microsoft.Alm.Authentication/Test/TargetUriTests.cs similarity index 100% rename from Microsoft.Alm.Authentication.Test/TargetUriTests.cs rename to Microsoft.Alm.Authentication/Test/TargetUriTests.cs diff --git a/Microsoft.Alm.Authentication.Test/TokenTests.cs b/Microsoft.Alm.Authentication/Test/TokenTests.cs similarity index 100% rename from Microsoft.Alm.Authentication.Test/TokenTests.cs rename to Microsoft.Alm.Authentication/Test/TokenTests.cs diff --git a/Microsoft.Alm.Authentication.Test/app.config b/Microsoft.Alm.Authentication/Test/app.config similarity index 100% rename from Microsoft.Alm.Authentication.Test/app.config rename to Microsoft.Alm.Authentication/Test/app.config diff --git a/Microsoft.Alm.Authentication.Test/packages.config b/Microsoft.Alm.Authentication/Test/packages.config similarity index 100% rename from Microsoft.Alm.Authentication.Test/packages.config rename to Microsoft.Alm.Authentication/Test/packages.config diff --git a/Microsoft.Vsts.Authentication/Microsoft.Vsts.Authentication.csproj b/Microsoft.Vsts.Authentication/Microsoft.Vsts.Authentication.csproj deleted file mode 100644 index f503fd8..0000000 --- a/Microsoft.Vsts.Authentication/Microsoft.Vsts.Authentication.csproj +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - Properties - Microsoft.Vsts.Authentication - - Library - {19770407-D7D8-4A37-914C-F552FF4B90D4} - Microsoft.Vsts.Authentication - Microsoft.Alm.Authentication - v4.5.1 - - - - $(MSBuildThisFileDirectory) - $(ProjectDir)$(OutputPath) - $(OutputPath)\$(AssemblyName).dll - - - - ..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.4\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll - - - ..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.4\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll - - - - - - - - - - {19770407-b493-459d-bb4f-04fbefb1ba13} - Microsoft.Alm.Authentication - - - - - GlobalSuppressions.cs - - - - - - - - - - - - - - - - - - - - false - - - - - - Microsoft - false - - - - - - - - - $([System.IO.File]::ReadAllText('$(ProjectDir)\Properties\AssemblyInfo.cs')) - ^\s*\[assembly:\s*AssemblyVersion\s*\(\s*"\s*([^"]+)\s*"\s*\) - $([System.Text.RegularExpressions.Regex]::Match($(In), $(Pattern), System.Text.RegularExpressions.RegexOptions.Multiline).Groups[1].Value) - ^\s*\[assembly: AssemblyDescription\s*\(\s*"\s*([^"]+)\s*"\s*\) - $([System.Text.RegularExpressions.Regex]::Match($(In), $(Pattern), System.Text.RegularExpressions.RegexOptions.Multiline).Groups[1].Value) - ^\s*\[assembly: AssemblyProduct\s*\(\s*"\s*([^"]+)\s*"\s*\) - $([System.Text.RegularExpressions.Regex]::Match($(In), $(Pattern), System.Text.RegularExpressions.RegexOptions.Multiline).Groups[1].Value) - ^\s*\[assembly: AssemblyCompany\s*\(\s*"\s*([^"]+)\s*"\s*\) - $([System.Text.RegularExpressions.Regex]::Match($(In), $(Pattern), System.Text.RegularExpressions.RegexOptions.Multiline).Groups[1].Value) - ^\s*\[assembly: AssemblyCopyright\s*\(\s*"\s*([^"]+)\s*"\s*\) - $([System.Text.RegularExpressions.Regex]::Match($(In), $(Pattern), System.Text.RegularExpressions.RegexOptions.Multiline).Groups[1].Value) - ^\s*\[assembly: AssemblyTitle\s*\(\s*"\s*([^"]+)\s*"\s*\) - $([System.Text.RegularExpressions.Regex]::Match($(In), $(Pattern), System.Text.RegularExpressions.RegexOptions.Multiline).Groups[1].Value) - - - - nuget.exe - - -unsigned - $(OutputPath.TrimEnd('\')) - - - ..\packages\NuGet.CommandLine.4.6.2\tools\NuGet.exe - - - - - - - - - - - - - - - - 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}. - - - - - - - - - \ No newline at end of file diff --git a/Microsoft.Vsts.Authentication/AzureAuthority.cs b/Microsoft.Vsts.Authentication/Src/AzureAuthority.cs similarity index 100% rename from Microsoft.Vsts.Authentication/AzureAuthority.cs rename to Microsoft.Vsts.Authentication/Src/AzureAuthority.cs diff --git a/Microsoft.Vsts.Authentication/BaseVstsAuthentication.cs b/Microsoft.Vsts.Authentication/Src/BaseVstsAuthentication.cs similarity index 100% rename from Microsoft.Vsts.Authentication/BaseVstsAuthentication.cs rename to Microsoft.Vsts.Authentication/Src/BaseVstsAuthentication.cs diff --git a/Microsoft.Vsts.Authentication/IAzureAuthority.cs b/Microsoft.Vsts.Authentication/Src/IAzureAuthority.cs similarity index 100% rename from Microsoft.Vsts.Authentication/IAzureAuthority.cs rename to Microsoft.Vsts.Authentication/Src/IAzureAuthority.cs diff --git a/Microsoft.Vsts.Authentication/IVstsAadAuthentication.cs b/Microsoft.Vsts.Authentication/Src/IVstsAadAuthentication.cs similarity index 100% rename from Microsoft.Vsts.Authentication/IVstsAadAuthentication.cs rename to Microsoft.Vsts.Authentication/Src/IVstsAadAuthentication.cs diff --git a/Microsoft.Vsts.Authentication/IVstsAuthority.cs b/Microsoft.Vsts.Authentication/Src/IVstsAuthority.cs similarity index 100% rename from Microsoft.Vsts.Authentication/IVstsAuthority.cs rename to Microsoft.Vsts.Authentication/Src/IVstsAuthority.cs diff --git a/Microsoft.Vsts.Authentication/IVstsMsaAuthentication.cs b/Microsoft.Vsts.Authentication/Src/IVstsMsaAuthentication.cs similarity index 100% rename from Microsoft.Vsts.Authentication/IVstsMsaAuthentication.cs rename to Microsoft.Vsts.Authentication/Src/IVstsMsaAuthentication.cs diff --git a/Microsoft.Vsts.Authentication/Microsoft.Alm.Authentication.nuspec b/Microsoft.Vsts.Authentication/Src/Microsoft.Alm.Authentication.nuspec similarity index 100% rename from Microsoft.Vsts.Authentication/Microsoft.Alm.Authentication.nuspec rename to Microsoft.Vsts.Authentication/Src/Microsoft.Alm.Authentication.nuspec diff --git a/Microsoft.Vsts.Authentication/Src/Microsoft.Vsts.Authentication.csproj b/Microsoft.Vsts.Authentication/Src/Microsoft.Vsts.Authentication.csproj new file mode 100644 index 0000000..8421fae --- /dev/null +++ b/Microsoft.Vsts.Authentication/Src/Microsoft.Vsts.Authentication.csproj @@ -0,0 +1,84 @@ + + + + + + + Properties + Microsoft.Vsts.Authentication + + Library + {19770407-D7D8-4A37-914C-F552FF4B90D4} + Microsoft.Vsts.Authentication + Microsoft.Alm.Authentication + v4.5.1 + + + + $(MSBuildThisFileDirectory) + $(ProjectDir)$(OutputPath) + $(OutputPath)\$(AssemblyName).dll + + + + ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.4\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll + + + ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.4\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll + + + + + + + + + + {19770407-b493-459d-bb4f-04fbefb1ba13} + Microsoft.Alm.Authentication + + + + + GlobalSuppressions.cs + + + + + + + + + + + + + + + + + + + + false + + + + + Microsoft + false + + + + + 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}. + + + + + + + + + + \ No newline at end of file diff --git a/Microsoft.Vsts.Authentication/PersonalAccessTokenOptions.cs b/Microsoft.Vsts.Authentication/Src/PersonalAccessTokenOptions.cs similarity index 100% rename from Microsoft.Vsts.Authentication/PersonalAccessTokenOptions.cs rename to Microsoft.Vsts.Authentication/Src/PersonalAccessTokenOptions.cs diff --git a/Microsoft.Vsts.Authentication/Properties/AssemblyInfo.cs b/Microsoft.Vsts.Authentication/Src/Properties/AssemblyInfo.cs similarity index 92% rename from Microsoft.Vsts.Authentication/Properties/AssemblyInfo.cs rename to Microsoft.Vsts.Authentication/Src/Properties/AssemblyInfo.cs index 95d2a54..938a673 100644 --- a/Microsoft.Vsts.Authentication/Properties/AssemblyInfo.cs +++ b/Microsoft.Vsts.Authentication/Src/Properties/AssemblyInfo.cs @@ -15,5 +15,9 @@ using System.Runtime.InteropServices; [assembly: Guid("c1daabc1-b493-459d-bb4f-04fbefb1ba13")] [assembly: AssemblyVersion("4.4.0.0")] [assembly: AssemblyFileVersion("4.4.0.0")] -[assembly: InternalsVisibleTo("Microsoft.Vsts.Authentication.Test")] [assembly: NeutralResourcesLanguage("en-US")] + +// Only expose internals when the binary isn't signed. +#if !SIGNED +[assembly: InternalsVisibleTo("Microsoft.Vsts.Authentication.Test")] +#endif diff --git a/Microsoft.Vsts.Authentication/TokenRegistry.cs b/Microsoft.Vsts.Authentication/Src/TokenRegistry.cs similarity index 100% rename from Microsoft.Vsts.Authentication/TokenRegistry.cs rename to Microsoft.Vsts.Authentication/Src/TokenRegistry.cs diff --git a/Microsoft.Vsts.Authentication/VstsAadAuthentication.cs b/Microsoft.Vsts.Authentication/Src/VstsAadAuthentication.cs similarity index 100% rename from Microsoft.Vsts.Authentication/VstsAadAuthentication.cs rename to Microsoft.Vsts.Authentication/Src/VstsAadAuthentication.cs diff --git a/Microsoft.Vsts.Authentication/VstsAdalTokenCache.cs b/Microsoft.Vsts.Authentication/Src/VstsAdalTokenCache.cs similarity index 100% rename from Microsoft.Vsts.Authentication/VstsAdalTokenCache.cs rename to Microsoft.Vsts.Authentication/Src/VstsAdalTokenCache.cs diff --git a/Microsoft.Vsts.Authentication/VstsAzureAuthority.cs b/Microsoft.Vsts.Authentication/Src/VstsAzureAuthority.cs similarity index 100% rename from Microsoft.Vsts.Authentication/VstsAzureAuthority.cs rename to Microsoft.Vsts.Authentication/Src/VstsAzureAuthority.cs diff --git a/Microsoft.Vsts.Authentication/VstsLocationServiceException.cs b/Microsoft.Vsts.Authentication/Src/VstsLocationServiceException.cs similarity index 100% rename from Microsoft.Vsts.Authentication/VstsLocationServiceException.cs rename to Microsoft.Vsts.Authentication/Src/VstsLocationServiceException.cs diff --git a/Microsoft.Vsts.Authentication/VstsMsaAuthentication.cs b/Microsoft.Vsts.Authentication/Src/VstsMsaAuthentication.cs similarity index 100% rename from Microsoft.Vsts.Authentication/VstsMsaAuthentication.cs rename to Microsoft.Vsts.Authentication/Src/VstsMsaAuthentication.cs diff --git a/Microsoft.Vsts.Authentication/VstsTokenScope.cs b/Microsoft.Vsts.Authentication/Src/VstsTokenScope.cs similarity index 100% rename from Microsoft.Vsts.Authentication/VstsTokenScope.cs rename to Microsoft.Vsts.Authentication/Src/VstsTokenScope.cs diff --git a/Microsoft.Vsts.Authentication/packages.config b/Microsoft.Vsts.Authentication/Src/packages.config similarity index 100% rename from Microsoft.Vsts.Authentication/packages.config rename to Microsoft.Vsts.Authentication/Src/packages.config diff --git a/Microsoft.Vsts.Authentication.Test/AuthenticationTests.cs b/Microsoft.Vsts.Authentication/Test/AuthenticationTests.cs similarity index 100% rename from Microsoft.Vsts.Authentication.Test/AuthenticationTests.cs rename to Microsoft.Vsts.Authentication/Test/AuthenticationTests.cs diff --git a/Microsoft.Vsts.Authentication.Test/AuthorityFake.cs b/Microsoft.Vsts.Authentication/Test/AuthorityFake.cs similarity index 100% rename from Microsoft.Vsts.Authentication.Test/AuthorityFake.cs rename to Microsoft.Vsts.Authentication/Test/AuthorityFake.cs diff --git a/Microsoft.Vsts.Authentication.Test/Microsoft.Vsts.Authentication.Test.csproj b/Microsoft.Vsts.Authentication/Test/Microsoft.Vsts.Authentication.Test.csproj similarity index 55% rename from Microsoft.Vsts.Authentication.Test/Microsoft.Vsts.Authentication.Test.csproj rename to Microsoft.Vsts.Authentication/Test/Microsoft.Vsts.Authentication.Test.csproj index 48d0f50..49568ea 100644 --- a/Microsoft.Vsts.Authentication.Test/Microsoft.Vsts.Authentication.Test.csproj +++ b/Microsoft.Vsts.Authentication/Test/Microsoft.Vsts.Authentication.Test.csproj @@ -1,8 +1,8 @@  - - - + + + Microsoft.Vsts.Authentication.Test Properties @@ -12,41 +12,41 @@ {19781214-5254-464A-BC69-FAC502046564} Microsoft.Alm.Authentication.Test - + - ..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll + ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll - ..\packages\Moq.4.8.2\lib\net45\Moq.dll + ..\..\packages\Moq.4.8.2\lib\net45\Moq.dll - ..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + ..\..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - ..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll + ..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll - ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll + ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - ..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll + ..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll - ..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll + ..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll - ..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll + ..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll - + {19770407-b493-459d-bb4f-04fbefb1ba13} Microsoft.Alm.Authentication - + {19770407-d7d8-4a37-914c-f552ff4b90d4} Microsoft.Vsts.Authentication @@ -67,18 +67,18 @@ - + - + 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}. - - - - + + + + \ No newline at end of file diff --git a/Microsoft.Vsts.Authentication.Test/Properties/AssemblyInfo.cs b/Microsoft.Vsts.Authentication/Test/Properties/AssemblyInfo.cs similarity index 100% rename from Microsoft.Vsts.Authentication.Test/Properties/AssemblyInfo.cs rename to Microsoft.Vsts.Authentication/Test/Properties/AssemblyInfo.cs diff --git a/Microsoft.Vsts.Authentication.Test/VstsAadTests.cs b/Microsoft.Vsts.Authentication/Test/VstsAadTests.cs similarity index 100% rename from Microsoft.Vsts.Authentication.Test/VstsAadTests.cs rename to Microsoft.Vsts.Authentication/Test/VstsAadTests.cs diff --git a/Microsoft.Vsts.Authentication.Test/VstsMsaTests.cs b/Microsoft.Vsts.Authentication/Test/VstsMsaTests.cs similarity index 100% rename from Microsoft.Vsts.Authentication.Test/VstsMsaTests.cs rename to Microsoft.Vsts.Authentication/Test/VstsMsaTests.cs diff --git a/Microsoft.Vsts.Authentication.Test/VstsTokenScopeTests.cs b/Microsoft.Vsts.Authentication/Test/VstsTokenScopeTests.cs similarity index 100% rename from Microsoft.Vsts.Authentication.Test/VstsTokenScopeTests.cs rename to Microsoft.Vsts.Authentication/Test/VstsTokenScopeTests.cs diff --git a/Microsoft.Vsts.Authentication.Test/app.config b/Microsoft.Vsts.Authentication/Test/app.config similarity index 100% rename from Microsoft.Vsts.Authentication.Test/app.config rename to Microsoft.Vsts.Authentication/Test/app.config diff --git a/Microsoft.Vsts.Authentication.Test/packages.config b/Microsoft.Vsts.Authentication/Test/packages.config similarity index 100% rename from Microsoft.Vsts.Authentication.Test/packages.config rename to Microsoft.Vsts.Authentication/Test/packages.config diff --git a/build.props b/build.props index b8dcb2f..ab62a83 100644 --- a/build.props +++ b/build.props @@ -6,7 +6,7 @@ true - ..\analysisRules.ruleset + ..\..\analysisRules.ruleset 512 AnyCPU false diff --git a/test.props b/test.props index 25977a3..b4cbd82 100644 --- a/test.props +++ b/test.props @@ -28,7 +28,7 @@ 4 - + xunit.runner.json Always