Skip to content

Commit b4f69a5

Browse files
carolynvscarolynvs
committed
Merge pull request #549 from carolynvs/networking-v2
Networking v2
2 parents eeac6e5 + 58a339d commit b4f69a5

99 files changed

Lines changed: 4428 additions & 1659 deletions

File tree

Some content is hidden

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

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<config>
44
<add key="repositorypath" value="src/packages" />

‎src/Documentation/Documentation.v4.0.shfbproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<HtmlHelpName>API Reference Documentation</HtmlHelpName>
2121
<Language>en-US</Language>
2222
<DocumentationSources>
23-
<DocumentationSource sourceFile="..\corelib\corelib.v4.0.csproj" subFolders="True" />
23+
<DocumentationSource sourceFile="..\corelib\OpenStack.csproj" subFolders="True" />
2424
</DocumentationSources>
2525
<BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
2626
<HelpFileFormat>Website</HelpFileFormat>
@@ -106,7 +106,12 @@
106106
</configuration>
107107
</PlugInConfig>
108108
</PlugInConfigurations>
109-
<ApiFilter />
109+
<ApiFilter>
110+
<Filter entryType="Namespace" fullName="Flurl.Extensions" isExposed="False" />
111+
<Filter entryType="Namespace" fullName="Flurl.Http" isExposed="False" />
112+
<Filter entryType="Namespace" fullName="OpenStack.Networking.v2.Serialization" isExposed="False" />
113+
<Filter entryType="Namespace" fullName="OpenStack.Serialization" isExposed="False" />
114+
<Filter entryType="Namespace" fullName="OpenStack.Synchronous.Extensions" isExposed="False" /></ApiFilter>
110115
<HelpAttributes />
111116
<NamespaceSummaries />
112117
<BuildLogFile />

‎src/Documentation/History/Current/Documentation.Current.shfbproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<HtmlHelpName>API Reference Documentation</HtmlHelpName>
2121
<Language>en-US</Language>
2222
<DocumentationSources>
23-
<DocumentationSource sourceFile="..\..\..\corelib\corelib.v4.0.csproj" />
23+
<DocumentationSource sourceFile="..\..\..\corelib\OpenStack.csproj" />
2424
</DocumentationSources>
2525
<BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
2626
<HelpFileFormat>Website</HelpFileFormat>

‎src/Samples/CPPCodeSamples/CPPCodeSamples.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@
106106
<Image Include="app.ico" />
107107
</ItemGroup>
108108
<ItemGroup>
109-
<ProjectReference Include="..\..\corelib\corelib.v4.0.csproj">
110-
<Project>{7dba11eb-dba7-4d3a-8d42-b5312e74b9c0}</Project>
109+
<ProjectReference Include="..\..\corelib\OpenStack.csproj">
110+
<Project>{1a4fb67f-8642-4402-b931-118955ae7538}</Project>
111111
</ProjectReference>
112112
</ItemGroup>
113113
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
114114
<ImportGroup Label="ExtensionTargets">
115115
</ImportGroup>
116-
</Project>
116+
</Project>

‎src/Samples/CSharpCodeSamples/CSharpCodeSamples.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@
5858
<Compile Include="Properties\AssemblyInfo.cs" />
5959
<Compile Include="QueueingServiceExamples.cs" />
6060
</ItemGroup>
61-
<ItemGroup>
62-
<ProjectReference Include="..\..\corelib\corelib.v4.0.csproj">
63-
<Project>{7dba11eb-dba7-4d3a-8d42-b5312e74b9c0}</Project>
64-
<Name>corelib.v4.0</Name>
65-
</ProjectReference>
66-
</ItemGroup>
6761
<ItemGroup>
6862
<None Include="app.config" />
6963
<None Include="packages.CSharpCodeSamples.config" />
7064
</ItemGroup>
65+
<ItemGroup>
66+
<ProjectReference Include="..\..\corelib\OpenStack.csproj">
67+
<Project>{1a4fb67f-8642-4402-b931-118955ae7538}</Project>
68+
<Name>OpenStack</Name>
69+
</ProjectReference>
70+
</ItemGroup>
7171
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7272
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7373
Other similar extension points exist, see Microsoft.Common.targets.

‎src/Samples/FSharpCodeSamples/FSharpCodeSamples.fsproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,11 @@
7373
<Reference Include="System" />
7474
<Reference Include="System.Core" />
7575
<Reference Include="System.Numerics" />
76-
<ProjectReference Include="..\..\corelib\corelib.v4.0.csproj">
77-
<Name>corelib.v4.0</Name>
78-
<Project>{7dba11eb-dba7-4d3a-8d42-b5312e74b9c0}</Project>
76+
</ItemGroup>
77+
<ItemGroup>
78+
<ProjectReference Include="..\..\corelib\OpenStack.csproj">
79+
<Name>OpenStack</Name>
80+
<Project>{1a4fb67f-8642-4402-b931-118955ae7538}</Project>
7981
<Private>True</Private>
8082
</ProjectReference>
8183
</ItemGroup>

‎src/Samples/VBCodeSamples/VBCodeSamples.vbproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@
115115
<None Include="packages.VBCodeSamples.config" />
116116
</ItemGroup>
117117
<ItemGroup>
118-
<ProjectReference Include="..\..\corelib\corelib.v4.0.csproj">
119-
<Project>{7dba11eb-dba7-4d3a-8d42-b5312e74b9c0}</Project>
120-
<Name>corelib.v4.0</Name>
118+
<ProjectReference Include="..\..\corelib\OpenStack.csproj">
119+
<Project>{1a4fb67f-8642-4402-b931-118955ae7538}</Project>
120+
<Name>OpenStack</Name>
121121
</ProjectReference>
122122
</ItemGroup>
123123
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />

‎src/corelib/Authentication/AuthenticatedHttpClientFactory.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
namespace OpenStack.Authentication
77
{
88
/// <summary>
9-
/// Instructs Flurl to use our <see cref="AuthenticatedMessageHandler"/> for all requests.
9+
/// Instructs Flurl to use an <see cref="AuthenticatedMessageHandler"/> for all requests.
1010
/// </summary>
11-
internal class AuthenticatedHttpClientFactory : DefaultHttpClientFactory
11+
/// <exclude />
12+
public class AuthenticatedHttpClientFactory : DefaultHttpClientFactory
1213
{
14+
/// <inheritdoc/>
1315
public override HttpClient CreateClient(Url url, HttpMessageHandler handler)
1416
{
1517
return new HttpClient(handler)
@@ -18,6 +20,7 @@ public override HttpClient CreateClient(Url url, HttpMessageHandler handler)
1820
};
1921
}
2022

23+
/// <inheritdoc/>
2124
public override HttpMessageHandler CreateMessageHandler()
2225
{
2326
return new AuthenticatedMessageHandler(base.CreateMessageHandler());

‎src/corelib/Authentication/AuthenticatedMessageHandler.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ namespace OpenStack.Authentication
1010
/// <summary>
1111
/// Used by Flurl for all requests. Understands how to authenticate and retry when a token expires.
1212
/// </summary>
13+
/// <exclude />
1314
internal class AuthenticatedMessageHandler : FlurlMessageHandler
1415
{
1516
public AuthenticatedMessageHandler(HttpMessageHandler innerHandler)

‎src/corelib/Authentication/IAuthenticationProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ public interface IAuthenticationProvider
1818
/// <param name="region">The region.</param>
1919
/// <param name="useInternalUrl">if set to <c>true</c> [use internal URL].</param>
2020
/// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
21-
/// <exception cref="OpenStack.UserAuthenticationException">
21+
/// <exception cref="UserAuthenticationException">
2222
/// The user does not have access to the service or it does not exist.
2323
/// or
2424
/// The user does not have access to the service endpoint in the specified region.
2525
/// </exception>
2626
/// <exception cref="RegionRequiredException">No region was specified and the {0} service does not provide a region-independent endpoint.</exception>
2727
/// <returns>The requested endpoint.</returns>
28-
Task<string> GetEndpoint(ServiceType serviceType, string region, bool useInternalUrl, CancellationToken cancellationToken);
28+
Task<string> GetEndpoint(IServiceType serviceType, string region, bool useInternalUrl, CancellationToken cancellationToken);
2929

3030
/// <summary>
3131
/// Gets an authentication token for the user.

0 commit comments

Comments
 (0)