Move credentials to core (NuGet#2547)

heng-liu · Dec 5, 2018 · 627d091 · 627d091
1 parent e673d84
commit 627d091
Show file tree

Hide file tree

Showing 35 changed files with 10 additions and 10 deletions.
diff --git a/NuGet.sln b/NuGet.sln
@@ -100,7 +100,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Integration.Test", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.CommandLine", "src\NuGet.Clients\NuGet.CommandLine\NuGet.CommandLine.csproj", "{957C4E99-3644-47DD-8F9A-AE36F41EBE4A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Credentials", "src\NuGet.Clients\NuGet.Credentials\NuGet.Credentials.csproj", "{32A23995-14C7-483B-98C3-0AE4185373EA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Credentials", "src\NuGet.Core\NuGet.Credentials\NuGet.Credentials.csproj", "{32A23995-14C7-483B-98C3-0AE4185373EA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.VisualStudio", "src\NuGet.Clients\NuGet.VisualStudio\NuGet.VisualStudio.csproj", "{E5556BC6-A7FD-4D8E-8A7D-7648DF1D7471}"
 EndProject
@@ -140,7 +140,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.CommandLine.FuncTest"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.CommandLine.Test", "test\NuGet.Clients.Tests\NuGet.CommandLine.Test\NuGet.CommandLine.Test.csproj", "{5039C2F9-CAD9-4162-849C-5EF7E3CE03D9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Credentials.Test", "test\NuGet.Clients.Tests\NuGet.Credentials.Test\NuGet.Credentials.Test.csproj", "{3DB4EDE3-B57B-498C-9EA9-A8BF8D9D4B2B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Credentials.Test", "test\NuGet.Core.Tests\NuGet.Credentials.Test\NuGet.Credentials.Test.csproj", "{3DB4EDE3-B57B-498C-9EA9-A8BF8D9D4B2B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EndToEnd", "EndToEnd", "{A8F45E94-4CFD-478C-9FE2-8E6DEE7E0770}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/src/NuGet.Clients/NuGet.CommandLine/NuGet.CommandLine.csproj b/src/NuGet.Clients/NuGet.CommandLine/NuGet.CommandLine.csproj
@@ -59,7 +59,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.PackageManagement\NuGet.PackageManagement.csproj" />
-    <ProjectReference Include="$(NuGetClientsSrcDirectory)NuGet.Credentials\NuGet.Credentials.csproj" />
+    <ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.Credentials\NuGet.Credentials.csproj" />
     <ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.Build.Tasks\NuGet.Build.Tasks.csproj" />
   </ItemGroup>
 

diff --git a/....Clients/NuGet.PackageManagement.VisualStudio/NuGet.PackageManagement.VisualStudio.csproj b/....Clients/NuGet.PackageManagement.VisualStudio/NuGet.PackageManagement.VisualStudio.csproj
@@ -226,7 +226,7 @@
       <Project>{a2b06fa8-bdbc-4459-a92a-161862b2aa97}</Project>
       <Name>NuGet.Indexing</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NuGet.Credentials\NuGet.Credentials.csproj">
+    <ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.Credentials\NuGet.Credentials.csproj">
       <Project>{32a23995-14c7-483b-98c3-0ae4185373ea}</Project>
       <Name>NuGet.Credentials</Name>
     </ProjectReference>

diff --git a/src/NuGet.Clients/NuGet.Tools/NuGet.Tools.csproj b/src/NuGet.Clients/NuGet.Tools/NuGet.Tools.csproj
@@ -92,7 +92,7 @@
       <Project>{50e33da2-af14-486d-81b8-bd8409744a38}</Project>
       <Name>NuGet.Console</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NuGet.Credentials\NuGet.Credentials.csproj">
+    <ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.Credentials\NuGet.Credentials.csproj">
       <Project>{32a23995-14c7-483b-98c3-0ae4185373ea}</Project>
       <Name>NuGet.Credentials</Name>
     </ProjectReference>

diff --git a/src/NuGet.Clients/NuGet.VisualStudio.Client/NuGet.VisualStudio.Client.csproj b/src/NuGet.Clients/NuGet.VisualStudio.Client/NuGet.VisualStudio.Client.csproj
@@ -177,7 +177,7 @@
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup</IncludeOutputGroupsInVSIXLocalOnly>
     </ProjectReference>
-    <ProjectReference Include="..\NuGet.Credentials\NuGet.Credentials.csproj">
+    <ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.Credentials\NuGet.Credentials.csproj">
       <Project>{32a23995-14c7-483b-98c3-0ae4185373ea}</Project>
       <Name>NuGet.Credentials</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>

diff --git a/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj b/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj
@@ -25,8 +25,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(NuGetClientsSrcDirectory)NuGet.Credentials\NuGet.Credentials.csproj" />
-    <ProjectReference Include="..\NuGet.ProjectModel\NuGet.ProjectModel.csproj" />
+    <ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.Credentials\NuGet.Credentials.csproj" />
+    <ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.ProjectModel\NuGet.ProjectModel.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == '$(NETFXTargetFramework)' ">

diff --git a/src/NuGet.Core/NuGet.Configuration/Properties/AssemblyInfo.cs b/src/NuGet.Core/NuGet.Configuration/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@
 [assembly: CLSCompliant(true)]
 
 #if SIGNED_BUILD
-[assembly: InternalsVisibleTo("NuGet.Credentials.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("NuGet.Credentials.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 [assembly: InternalsVisibleTo("NuGet.SolutionRestoreManager.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("NuGet.VisualStudio.Implementation.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("NuGet.Configuration.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

diff --git a/...s/NuGet.Credentials/CredentialResponse.cs → ...e/NuGet.Credentials/CredentialResponse.cs b/...s/NuGet.Credentials/CredentialResponse.cs → ...e/NuGet.Credentials/CredentialResponse.cs
diff --git a/...ts/NuGet.Credentials/CredentialService.cs → ...re/NuGet.Credentials/CredentialService.cs b/...ts/NuGet.Credentials/CredentialService.cs → ...re/NuGet.Credentials/CredentialService.cs
diff --git a/...nts/NuGet.Credentials/CredentialStatus.cs → ...ore/NuGet.Credentials/CredentialStatus.cs b/...nts/NuGet.Credentials/CredentialStatus.cs → ...ore/NuGet.Credentials/CredentialStatus.cs
diff --git a/...NuGet.Credentials/CredentialsConstants.cs → ...NuGet.Credentials/CredentialsConstants.cs b/...NuGet.Credentials/CredentialsConstants.cs → ...NuGet.Credentials/CredentialsConstants.cs
diff --git a/...ntials/DefaultCredentialServiceUtility.cs → ...ntials/DefaultCredentialServiceUtility.cs b/...ntials/DefaultCredentialServiceUtility.cs → ...ntials/DefaultCredentialServiceUtility.cs
diff --git a/...ltNetworkCredentialsCredentialProvider.cs → ...ltNetworkCredentialsCredentialProvider.cs b/...ltNetworkCredentialsCredentialProvider.cs → ...ltNetworkCredentialsCredentialProvider.cs
diff --git a/.../NuGet.Credentials/ICredentialProvider.cs → .../NuGet.Credentials/ICredentialProvider.cs b/.../NuGet.Credentials/ICredentialProvider.cs → .../NuGet.Credentials/ICredentialProvider.cs
diff --git a/...uGet.Credentials/NuGet.Credentials.csproj → ...uGet.Credentials/NuGet.Credentials.csproj b/...uGet.Credentials/NuGet.Credentials.csproj → ...uGet.Credentials/NuGet.Credentials.csproj
diff --git a/...t.Credentials/PluginCredentialProvider.cs → ...t.Credentials/PluginCredentialProvider.cs b/...t.Credentials/PluginCredentialProvider.cs → ...t.Credentials/PluginCredentialProvider.cs
diff --git a/...ntials/PluginCredentialProviderBuilder.cs → ...ntials/PluginCredentialProviderBuilder.cs b/...ntials/PluginCredentialProviderBuilder.cs → ...ntials/PluginCredentialProviderBuilder.cs
diff --git a/...et.Credentials/PluginCredentialRequest.cs → ...et.Credentials/PluginCredentialRequest.cs b/...et.Credentials/PluginCredentialRequest.cs → ...et.Credentials/PluginCredentialRequest.cs
diff --git a/...t.Credentials/PluginCredentialResponse.cs → ...t.Credentials/PluginCredentialResponse.cs b/...t.Credentials/PluginCredentialResponse.cs → ...t.Credentials/PluginCredentialResponse.cs
diff --git a/...ents/NuGet.Credentials/PluginException.cs → ...Core/NuGet.Credentials/PluginException.cs b/...ents/NuGet.Credentials/PluginException.cs → ...Core/NuGet.Credentials/PluginException.cs
diff --git a/...ntials/PluginUnexpectedStatusException.cs → ...ntials/PluginUnexpectedStatusException.cs b/...ntials/PluginUnexpectedStatusException.cs → ...ntials/PluginUnexpectedStatusException.cs
diff --git a/...Get.Credentials/PreviewFeatureSettings.cs → ...Get.Credentials/PreviewFeatureSettings.cs b/...Get.Credentials/PreviewFeatureSettings.cs → ...Get.Credentials/PreviewFeatureSettings.cs
diff --git a/...ts/NuGet.Credentials/ProviderException.cs → ...re/NuGet.Credentials/ProviderException.cs b/...ts/NuGet.Credentials/ProviderException.cs → ...re/NuGet.Credentials/ProviderException.cs
diff --git a/...s/NuGet.Credentials/Resources.Designer.cs → ...e/NuGet.Credentials/Resources.Designer.cs b/...s/NuGet.Credentials/Resources.Designer.cs → ...e/NuGet.Credentials/Resources.Designer.cs
diff --git a/....Clients/NuGet.Credentials/Resources.resx → ...Get.Core/NuGet.Credentials/Resources.resx b/....Clients/NuGet.Credentials/Resources.resx → ...Get.Core/NuGet.Credentials/Resources.resx
diff --git a/...entials/SecurePluginCredentialProvider.cs → ...entials/SecurePluginCredentialProvider.cs b/...entials/SecurePluginCredentialProvider.cs → ...entials/SecurePluginCredentialProvider.cs
diff --git a/.../SecurePluginCredentialProviderBuilder.cs → .../SecurePluginCredentialProviderBuilder.cs b/.../SecurePluginCredentialProviderBuilder.cs → .../SecurePluginCredentialProviderBuilder.cs
diff --git a/...redentials.Test/CredentialServiceTests.cs → ...redentials.Test/CredentialServiceTests.cs b/...redentials.Test/CredentialServiceTests.cs → ...redentials.Test/CredentialServiceTests.cs
diff --git a/...edentials.Test/CredentialTestConstants.cs → ...edentials.Test/CredentialTestConstants.cs b/...edentials.Test/CredentialTestConstants.cs → ...edentials.Test/CredentialTestConstants.cs
diff --git a/...ntials.Test/NuGet.Credentials.Test.csproj → ...ntials.Test/NuGet.Credentials.Test.csproj b/...ntials.Test/NuGet.Credentials.Test.csproj → ...ntials.Test/NuGet.Credentials.Test.csproj
@@ -29,7 +29,7 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(NuGetClientsSrcDirectory)NuGet.Credentials\NuGet.Credentials.csproj">
+    <ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.Credentials\NuGet.Credentials.csproj">
       <Project>{32a23995-14c7-483b-98c3-0ae4185373ea}</Project>
       <Name>NuGet.Credentials</Name>
     </ProjectReference>

diff --git a/...t/PluginCredentialProviderBuilderTests.cs → ...t/PluginCredentialProviderBuilderTests.cs b/...t/PluginCredentialProviderBuilderTests.cs → ...t/PluginCredentialProviderBuilderTests.cs
diff --git a/...als.Test/PluginCredentialProviderTests.cs → ...als.Test/PluginCredentialProviderTests.cs b/...als.Test/PluginCredentialProviderTests.cs → ...als.Test/PluginCredentialProviderTests.cs
diff --git a/...Get.Credentials.Test/PluginManagerMock.cs → ...Get.Credentials.Test/PluginManagerMock.cs b/...Get.Credentials.Test/PluginManagerMock.cs → ...Get.Credentials.Test/PluginManagerMock.cs
diff --git a/...rePluginCredentialProviderBuilderTests.cs → ...rePluginCredentialProviderBuilderTests.cs b/...rePluginCredentialProviderBuilderTests.cs → ...rePluginCredentialProviderBuilderTests.cs
diff --git a/...st/SecurePluginCredentialProviderTests.cs → ...st/SecurePluginCredentialProviderTests.cs b/...st/SecurePluginCredentialProviderTests.cs → ...st/SecurePluginCredentialProviderTests.cs