Skip to content

SLVS-2383 Gb/cred store2 #6322

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

SLVS-2383 Gb/cred store2 #6322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b62323d
i
georgii-borovinskikh-sonarsource Jul 11, 2025
d4c44cd
ii
georgii-borovinskikh-sonarsource Jul 11, 2025
9903cc6
iii
georgii-borovinskikh-sonarsource Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/CFamily.UnitTests/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,6 +1115,11 @@
"resolved": "4.3.0",
"contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg=="
},
"System.Security.Cryptography.ProtectedData": {
"type": "Transitive",
"resolved": "9.0.7",
"contentHash": "OAiDZTyzIzgbtrjzbMlprCxvlXpFW7q+JVOSEc/v4jgLBF4hVSey0MQ06MyctGjspKyJBdGj6k6MuqjiZV9c5Q=="
},
"System.Security.Cryptography.X509Certificates": {
"type": "Transitive",
"resolved": "4.3.0",
Expand Down Expand Up @@ -1286,7 +1291,8 @@
"SonarLint.VisualStudio.Core": "[1.0.0, )",
"SonarLint.VisualStudio.IssueVisualization": "[1.0.0, )",
"SonarLint.VisualStudio.SLCore": "[1.0.0, )",
"StrongNamer": "[0.0.8, )"
"StrongNamer": "[0.0.8, )",
"System.Security.Cryptography.ProtectedData": "[9.0.7, )"
}
},
"SonarLint.VisualStudio.Core": {
Expand Down
6 changes: 4 additions & 2 deletions src/ConnectedMode.UnitTests/Persistence/ServerConnectionsRepositoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,17 @@ public void MefCtor_CheckExports() =>
MefTestHelpers.CheckTypeCanBeImported<ServerConnectionsRepository, IServerConnectionsRepository>(
MefTestHelpers.CreateExport<IJsonFileHandler>(),
MefTestHelpers.CreateExport<IServerConnectionModelMapper>(),
MefTestHelpers.CreateExport<ICredentialStoreService>(),
MefTestHelpers.CreateExport<ISolutionBindingCredentialsLoader>(),
MefTestHelpers.CreateExport<IEnvironmentVariableProvider>(),
MefTestHelpers.CreateExport<ILogger>());

[TestMethod]
public void MefCtor_IServerConnectionWithInvalidTokenRepository_CheckExports() =>
MefTestHelpers.CheckTypeCanBeImported<ServerConnectionsRepository, IServerConnectionWithInvalidTokenRepository>(
MefTestHelpers.CreateExport<IJsonFileHandler>(),
MefTestHelpers.CreateExport<IServerConnectionModelMapper>(),
MefTestHelpers.CreateExport<ICredentialStoreService>(),
MefTestHelpers.CreateExport<ISolutionBindingCredentialsLoader>(),
MefTestHelpers.CreateExport<IEnvironmentVariableProvider>(),
MefTestHelpers.CreateExport<ILogger>());

[TestMethod]
Expand Down
8 changes: 5 additions & 3 deletions src/ConnectedMode.UnitTests/Persistence/SolutionBindingRepositoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void TestInitialize()
solutionBindingFileLoader = Substitute.For<ISolutionBindingFileLoader>();
logger = new TestLogger();

testSubject = new SolutionBindingRepository(unintrusiveBindingPathProvider, bindingJsonModelConverter, serverConnectionsRepository, solutionBindingFileLoader, credentialsLoader, logger);
testSubject = new SolutionBindingRepository(unintrusiveBindingPathProvider, bindingJsonModelConverter, serverConnectionsRepository, credentialsLoader, solutionBindingFileLoader, logger);

mockCredentials = new UsernameAndPasswordCredentials("user", "pwd".ToSecureString());

Expand All @@ -72,13 +72,15 @@ public void MefCtor_CheckIsExported()
MefTestHelpers.CreateExport<IUnintrusiveBindingPathProvider>(),
MefTestHelpers.CreateExport<IBindingJsonModelConverter>(),
MefTestHelpers.CreateExport<IServerConnectionsRepository>(),
MefTestHelpers.CreateExport<ICredentialStoreService>(),
MefTestHelpers.CreateExport<ISolutionBindingCredentialsLoader>(),
MefTestHelpers.CreateExport<ISolutionBindingFileLoader>(),
MefTestHelpers.CreateExport<ILogger>());
MefTestHelpers.CheckTypeCanBeImported<SolutionBindingRepository, ILegacySolutionBindingRepository>(
MefTestHelpers.CreateExport<IUnintrusiveBindingPathProvider>(),
MefTestHelpers.CreateExport<IBindingJsonModelConverter>(),
MefTestHelpers.CreateExport<IServerConnectionsRepository>(),
MefTestHelpers.CreateExport<ICredentialStoreService>(),
MefTestHelpers.CreateExport<ISolutionBindingCredentialsLoader>(),
MefTestHelpers.CreateExport<ISolutionBindingFileLoader>(),
MefTestHelpers.CreateExport<ILogger>());
}

Expand Down
8 changes: 7 additions & 1 deletion src/ConnectedMode.UnitTests/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,6 +1334,11 @@
"resolved": "4.3.0",
"contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg=="
},
"System.Security.Cryptography.ProtectedData": {
"type": "Transitive",
"resolved": "9.0.7",
"contentHash": "OAiDZTyzIzgbtrjzbMlprCxvlXpFW7q+JVOSEc/v4jgLBF4hVSey0MQ06MyctGjspKyJBdGj6k6MuqjiZV9c5Q=="
},
"System.Security.Cryptography.X509Certificates": {
"type": "Transitive",
"resolved": "4.3.0",
Expand Down Expand Up @@ -1483,7 +1488,8 @@
"SonarLint.VisualStudio.Core": "[1.0.0, )",
"SonarLint.VisualStudio.IssueVisualization": "[1.0.0, )",
"SonarLint.VisualStudio.SLCore": "[1.0.0, )",
"StrongNamer": "[0.0.8, )"
"StrongNamer": "[0.0.8, )",
"System.Security.Cryptography.ProtectedData": "[9.0.7, )"
}
},
"SonarLint.VisualStudio.Core": {
Expand Down
11 changes: 11 additions & 0 deletions src/ConnectedMode/ConnectedMode.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
<Page Include="UI\OrganizationSelection\ManualOrganizationSelectionDialog.xaml" />
<Page Include="UI\OrganizationSelection\OrganizationSelectionDialog.xaml" />
<Page Include="UI\ProjectSelection\ProjectSelectionDialog.xaml" />
<Page Include="CredentialStore2\MasterPasswordDialog.xaml" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -171,6 +172,16 @@
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.7" />
</ItemGroup>

<ItemGroup>
<None Update="CredentialStore2\MasterPasswordDialog.xaml">
<Generator>MSBuild:Compile</Generator>
</None>
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
Loading