Skip to content
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.

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

Move Microsoft.Extensions.Azure into extensions directory #14715

Merged
merged 6 commits into from
Sep 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion eng/.docsettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ known_content_issues:
- ['sdk/anomalydetector/Azure.AI.AnomalyDetector/README.md', '#5499']
- ['sdk/core/Azure.Core/README.md', '#5499']
- ['sdk/core/Azure.Core.Experimental/README.md', '#5499']
- ['sdk/core/Microsoft.Extensions.Azure/README.md','#5499']
- ['sdk/keyvault/Microsoft.Azure.KeyVault/README.md','#5499']
- ['sdk/servicebus/Microsoft.Azure.ServiceBus/README.md','#5499']
- ['sdk/eventhub/Microsoft.Azure.EventHubs/README.md','#5499']
Expand All @@ -144,6 +143,7 @@ known_content_issues:
- ['sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/README.md','azure-sdk-tools/issues/404']
- ['sdk/extensions/Azure.Extensions.AspNetCore.Configuration.Secrets/README.md', 'azure-sdk-tools/issues/404']
- ['sdk/extensions/Microsoft.Azure.WebJobs.Extensions.Clients/README.md','azure-sdk-tools/issues/404']
- ['sdk/extensions/Microsoft.Extensions.Azure/README.md','#5499']
- ['sdk/search/README.md','azure-sdk-tools/issues/42']
- ['sdk/formrecognizer/Azure.AI.FormRecognizer/README.md','#5499']
- ['sdk/formrecognizer/Azure.AI.FormRecognizer/README.md','#11492']
Expand Down
369 changes: 300 additions & 69 deletions sdk/core/Azure.Core/Azure.Core.All.sln

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions sdk/core/Azure.Core/Azure.Core.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core", "src\Azure.Cor
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Tests", "tests\Azure.Core.Tests.csproj", "{84491222-6C36-4FA7-BBAE-1FA804129151}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Azure", "..\Microsoft.Extensions.Azure\src\Microsoft.Extensions.Azure.csproj", "{F8945D73-B000-4129-AF58-896EC3DB49AC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Azure.Tests", "..\Microsoft.Extensions.Azure\tests\Microsoft.Extensions.Azure.Tests.csproj", "{5B093527-8B04-4D2B-B23D-441D4B5EE305}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.TestFramework", "..\Azure.Core.TestFramework\src\Azure.Core.TestFramework.csproj", "{EB0781C6-6C18-4C2A-8BDB-D61A1460AB09}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Experimental", "..\Azure.Core.Experimental\src\Azure.Core.Experimental.csproj", "{08159FC6-D991-4728-A12C-55A05C906465}"
Expand All @@ -35,14 +31,6 @@ Global
{84491222-6C36-4FA7-BBAE-1FA804129151}.Debug|Any CPU.Build.0 = Debug|Any CPU
{84491222-6C36-4FA7-BBAE-1FA804129151}.Release|Any CPU.ActiveCfg = Release|Any CPU
{84491222-6C36-4FA7-BBAE-1FA804129151}.Release|Any CPU.Build.0 = Release|Any CPU
{F8945D73-B000-4129-AF58-896EC3DB49AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F8945D73-B000-4129-AF58-896EC3DB49AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F8945D73-B000-4129-AF58-896EC3DB49AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F8945D73-B000-4129-AF58-896EC3DB49AC}.Release|Any CPU.Build.0 = Release|Any CPU
{5B093527-8B04-4D2B-B23D-441D4B5EE305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5B093527-8B04-4D2B-B23D-441D4B5EE305}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B093527-8B04-4D2B-B23D-441D4B5EE305}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B093527-8B04-4D2B-B23D-441D4B5EE305}.Release|Any CPU.Build.0 = Release|Any CPU
{EB0781C6-6C18-4C2A-8BDB-D61A1460AB09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB0781C6-6C18-4C2A-8BDB-D61A1460AB09}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB0781C6-6C18-4C2A-8BDB-D61A1460AB09}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/Azure.Core/samples/Diagnostics.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ SecretClientOptions options = new SecretClientOptions()

### ASP.NET Core applications

If your are using Azure SDK libraries in ASP.NET Core application consider using the `Microsoft.Extensions.Azure` package that provides integration with `Microsoft.Extensions.Logging` library. See [Microsoft.Extensions.Azure readme](../../Microsoft.Extensions.Azure/README.md) for more details.
If your are using Azure SDK libraries in ASP.NET Core application consider using the `Microsoft.Extensions.Azure` package that provides integration with `Microsoft.Extensions.Logging` library. See [Microsoft.Extensions.Azure readme](../../../extensions/Microsoft.Extensions.Azure/README.md) for more details.


### Custom logging callback
Expand Down
2 changes: 0 additions & 2 deletions sdk/core/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,5 @@ extends:
safeName: AzureCore
- name: Azure.Core.Experimental
safeName: AzureCoreExperimental
- name: Microsoft.Extensions.Azure
safeName: MicrosoftExtensionsAzure
- name: Microsoft.Azure.Core.NewtonsoftJson
safeName: MicrosoftAzureCoreNewtonsoftJson
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ public void StoreElement(XElement element, string friendlyName)
}
}
}
}
}
56 changes: 28 additions & 28 deletions sdk/extensions/Azure.Extensions.sln
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Extensions.AspNetCore
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.TestFramework", "..\core\Azure.Core.TestFramework\src\Azure.Core.TestFramework.csproj", "{A1DF6702-2C7C-4A1E-B324-B574BF2BACCD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Azure", "..\core\Microsoft.Extensions.Azure\src\Microsoft.Extensions.Azure.csproj", "{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Azure.Tests", "..\core\Microsoft.Extensions.Azure\tests\Microsoft.Extensions.Azure.Tests.csproj", "{439AD388-D698-4A82-B509-D79D511624F5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.WebJobs.Extensions.Clients", "Microsoft.Azure.WebJobs.Extensions.Clients\src\Microsoft.Azure.WebJobs.Extensions.Clients.csproj", "{8AF0DAC5-3F8A-49A7-AA9E-A05D589DD279}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.WebJobs.Extensions.Clients.Tests", "Microsoft.Azure.WebJobs.Extensions.Clients\tests\Microsoft.Azure.WebJobs.Extensions.Clients.Tests.csproj", "{BFCD7A9E-27A9-448F-B98A-4C1A8808CFFB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.WebJobs.Extensions.Clients.Samples", "Microsoft.Azure.WebJobs.Extensions.Clients\samples\Microsoft.Azure.WebJobs.Extensions.Clients.Samples.csproj", "{45CF248B-6CBA-4BF2-8E8D-44092A525709}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Azure.Tests", "Microsoft.Extensions.Azure\tests\Microsoft.Extensions.Azure.Tests.csproj", "{BCE87213-2AA0-40AB-BD39-64CD91912111}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Azure", "Microsoft.Extensions.Azure\src\Microsoft.Extensions.Azure.csproj", "{56BF6473-7C0F-451B-BC65-26F5DAB2B318}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -127,30 +127,6 @@ Global
{A1DF6702-2C7C-4A1E-B324-B574BF2BACCD}.Release|x64.Build.0 = Release|Any CPU
{A1DF6702-2C7C-4A1E-B324-B574BF2BACCD}.Release|x86.ActiveCfg = Release|Any CPU
{A1DF6702-2C7C-4A1E-B324-B574BF2BACCD}.Release|x86.Build.0 = Release|Any CPU
{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}.Debug|x64.ActiveCfg = Debug|Any CPU
{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}.Debug|x64.Build.0 = Debug|Any CPU
{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}.Debug|x86.ActiveCfg = Debug|Any CPU
{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}.Debug|x86.Build.0 = Debug|Any CPU
{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}.Release|Any CPU.Build.0 = Release|Any CPU
{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}.Release|x64.ActiveCfg = Release|Any CPU
{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}.Release|x64.Build.0 = Release|Any CPU
{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}.Release|x86.ActiveCfg = Release|Any CPU
{AF8C46F0-00DF-4E9C-B99C-82DD361115DE}.Release|x86.Build.0 = Release|Any CPU
{439AD388-D698-4A82-B509-D79D511624F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{439AD388-D698-4A82-B509-D79D511624F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{439AD388-D698-4A82-B509-D79D511624F5}.Debug|x64.ActiveCfg = Debug|Any CPU
{439AD388-D698-4A82-B509-D79D511624F5}.Debug|x64.Build.0 = Debug|Any CPU
{439AD388-D698-4A82-B509-D79D511624F5}.Debug|x86.ActiveCfg = Debug|Any CPU
{439AD388-D698-4A82-B509-D79D511624F5}.Debug|x86.Build.0 = Debug|Any CPU
{439AD388-D698-4A82-B509-D79D511624F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{439AD388-D698-4A82-B509-D79D511624F5}.Release|Any CPU.Build.0 = Release|Any CPU
{439AD388-D698-4A82-B509-D79D511624F5}.Release|x64.ActiveCfg = Release|Any CPU
{439AD388-D698-4A82-B509-D79D511624F5}.Release|x64.Build.0 = Release|Any CPU
{439AD388-D698-4A82-B509-D79D511624F5}.Release|x86.ActiveCfg = Release|Any CPU
{439AD388-D698-4A82-B509-D79D511624F5}.Release|x86.Build.0 = Release|Any CPU
{8AF0DAC5-3F8A-49A7-AA9E-A05D589DD279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8AF0DAC5-3F8A-49A7-AA9E-A05D589DD279}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8AF0DAC5-3F8A-49A7-AA9E-A05D589DD279}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -187,6 +163,30 @@ Global
{45CF248B-6CBA-4BF2-8E8D-44092A525709}.Release|x64.Build.0 = Release|Any CPU
{45CF248B-6CBA-4BF2-8E8D-44092A525709}.Release|x86.ActiveCfg = Release|Any CPU
{45CF248B-6CBA-4BF2-8E8D-44092A525709}.Release|x86.Build.0 = Release|Any CPU
{BCE87213-2AA0-40AB-BD39-64CD91912111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BCE87213-2AA0-40AB-BD39-64CD91912111}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BCE87213-2AA0-40AB-BD39-64CD91912111}.Debug|x64.ActiveCfg = Debug|Any CPU
{BCE87213-2AA0-40AB-BD39-64CD91912111}.Debug|x64.Build.0 = Debug|Any CPU
{BCE87213-2AA0-40AB-BD39-64CD91912111}.Debug|x86.ActiveCfg = Debug|Any CPU
{BCE87213-2AA0-40AB-BD39-64CD91912111}.Debug|x86.Build.0 = Debug|Any CPU
{BCE87213-2AA0-40AB-BD39-64CD91912111}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BCE87213-2AA0-40AB-BD39-64CD91912111}.Release|Any CPU.Build.0 = Release|Any CPU
{BCE87213-2AA0-40AB-BD39-64CD91912111}.Release|x64.ActiveCfg = Release|Any CPU
{BCE87213-2AA0-40AB-BD39-64CD91912111}.Release|x64.Build.0 = Release|Any CPU
{BCE87213-2AA0-40AB-BD39-64CD91912111}.Release|x86.ActiveCfg = Release|Any CPU
{BCE87213-2AA0-40AB-BD39-64CD91912111}.Release|x86.Build.0 = Release|Any CPU
{56BF6473-7C0F-451B-BC65-26F5DAB2B318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{56BF6473-7C0F-451B-BC65-26F5DAB2B318}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56BF6473-7C0F-451B-BC65-26F5DAB2B318}.Debug|x64.ActiveCfg = Debug|Any CPU
{56BF6473-7C0F-451B-BC65-26F5DAB2B318}.Debug|x64.Build.0 = Debug|Any CPU
{56BF6473-7C0F-451B-BC65-26F5DAB2B318}.Debug|x86.ActiveCfg = Debug|Any CPU
{56BF6473-7C0F-451B-BC65-26F5DAB2B318}.Debug|x86.Build.0 = Debug|Any CPU
{56BF6473-7C0F-451B-BC65-26F5DAB2B318}.Release|Any CPU.ActiveCfg = Release|Any CPU
{56BF6473-7C0F-451B-BC65-26F5DAB2B318}.Release|Any CPU.Build.0 = Release|Any CPU
{56BF6473-7C0F-451B-BC65-26F5DAB2B318}.Release|x64.ActiveCfg = Release|Any CPU
{56BF6473-7C0F-451B-BC65-26F5DAB2B318}.Release|x64.Build.0 = Release|Any CPU
{56BF6473-7C0F-451B-BC65-26F5DAB2B318}.Release|x86.ActiveCfg = Release|Any CPU
{56BF6473-7C0F-451B-BC65-26F5DAB2B318}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.WebJobs" />
<ProjectReference Include="..\..\..\core\Microsoft.Extensions.Azure\src\Microsoft.Extensions.Azure.csproj" />
<ProjectReference Include="..\..\Microsoft.Extensions.Azure\src\Microsoft.Extensions.Azure.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][code_of_con


<!-- LINKS -->
[source_root]: https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/core/Microsoft.Extensions.Azure/
[source_root]: https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/extensions/Microsoft.Extensions.Azure/
[nuget]: https://www.nuget.org/
[package]: https://www.nuget.org/packages/Microsoft.Extensions.Azure/
[configuration]: https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/?view=aspnetcore-3.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@

<ItemGroup>
<PackageReference Include="Azure.Identity" />
<PackageReference Include="Azure.Core" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Options" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
</ItemGroup>

<Import Project="..\..\Azure.Core\src\Azure.Core.props" />

<ItemGroup>
<Compile Include="$(AzureCoreSharedSources)\EventSourceEventFormatting.cs" />
</ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions sdk/extensions/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ extends:
ServiceDirectory: extensions
ArtifactName: packages
Artifacts:
- name: Microsoft.Extensions.Azure
safeName: MicrosoftExtensionsAzure
- name: Azure.Extensions.AspNetCore.DataProtection.Blobs
safeName: AzureExtensionsAspNetCoreDataProtectionBlobs
- name: Azure.Extensions.AspNetCore.DataProtection.Keys
Expand Down