Skip to content

Commit 75f9f40

Browse files
rynowakrynowak
authored
Merge branch 'master' into merge/release/3.1-to-master
2 parents 9f358d9 + 360d042 commit 75f9f40

File tree

265 files changed

+4456
-3040
lines changed

Some content is hidden

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

265 files changed

+4456
-3040
lines changed

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
One of the easiest ways to contribute is to participate in discussions on GitHub issues. You can also contribute by submitting pull requests with code changes.
44

55
## General feedback and discussions?
6-
Please start a discussion on the [repo issue tracker](https://github.com/aspnet/Extensions/issues).
6+
Please start a discussion on the [repo issue tracker](https://github.com/dotnet/extensions/issues).
77

88
## Reporting security issues and bugs
99
Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC) [email protected]. You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the MSRC PGP key, can be found in the [Security TechCenter](https://technet.microsoft.com/en-us/security/ff852094.aspx).
@@ -19,7 +19,7 @@ If you would like to contribute to one of our repositories, first identify the s
1919

2020
You will need to sign a [Contributor License Agreement](https://cla.dotnetfoundation.org/) when submitting your pull request. To complete the Contributor License Agreement (CLA), you will need to follow the instructions provided by the CLA bot when you send the pull request. This needs to only be done once for any .NET Foundation OSS project.
2121

22-
If you don't know what a pull request is read this article: https://help.github.com/articles/using-pull-requests. Make sure the respository can build and all tests pass. Familiarize yourself with the project workflow and our coding conventions. The coding, style, and general engineering guidelines are published on the [Engineering guidelines](https://github.com/aspnet/AspNetCore/wiki/Engineering-guidelines) page.
22+
If you don't know what a pull request is read this article: https://help.github.com/articles/using-pull-requests. Make sure the respository can build and all tests pass. Familiarize yourself with the project workflow and our coding conventions. The coding, style, and general engineering guidelines are published on the [Engineering guidelines](https://github.com/dotnet/aspnetcore/wiki/Engineering-guidelines) page.
2323

2424

2525
### Tests

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
4-
<RepositoryUrl>https://github.com/aspnet/Extensions</RepositoryUrl>
4+
<RepositoryUrl>https://github.com/dotnet/extensions</RepositoryUrl>
55
<RepositoryType>git</RepositoryType>
66
<RepoRelativeProjectDir>$([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectDirectory)))</RepoRelativeProjectDir>
77

‎Extensions.sln‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Localization", "Localizatio
265265
EndProject
266266
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Localization", "src\Localization\Localization\src\Microsoft.Extensions.Localization.csproj", "{AC33A64E-1261-47E7-8676-69C48E4B0266}"
267267
EndProject
268-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Localization.Tests", "src\Localization\Localization\test\Microsoft.Extensions.Localization.Tests.csproj", "{66DA86CB-E1DD-4A3A-8855-AD37731F112E}"
269-
EndProject
270268
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Localization.Abstractions", "src\Localization\Abstractions\src\Microsoft.Extensions.Localization.Abstractions.csproj", "{9FE05F36-5626-416D-956D-5C4C6D7E3E1B}"
271269
EndProject
272270
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildWebHostInvalidSignature", "src\Shared\testassets\BuildWebHostInvalidSignature\BuildWebHostInvalidSignature.csproj", "{A73FD5A1-DA46-432A-9824-BA5FC56C2D3D}"
@@ -317,6 +315,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hostin
317315
EndProject
318316
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.IntegrationTesting", "src\Hosting\IntegrationTesting\src\Microsoft.Extensions.Hosting.IntegrationTesting.csproj", "{60313ECC-7C20-4509-B41B-C0F69F5162E7}"
319317
EndProject
318+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Localization.RootNamespace.Tests", "src\Localization\Localization\test\Microsoft.Extensions.Localization.RootNamespace.Tests\Microsoft.Extensions.Localization.RootNamespace.Tests.csproj", "{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}"
319+
EndProject
320+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Localization.Tests", "src\Localization\Localization\test\Microsoft.Extensions.Localization.Tests\Microsoft.Extensions.Localization.Tests.csproj", "{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}"
321+
EndProject
320322
Global
321323
GlobalSection(SolutionConfigurationPlatforms) = preSolution
322324
Debug|Any CPU = Debug|Any CPU
@@ -1635,18 +1637,6 @@ Global
16351637
{AC33A64E-1261-47E7-8676-69C48E4B0266}.Release|x64.Build.0 = Release|Any CPU
16361638
{AC33A64E-1261-47E7-8676-69C48E4B0266}.Release|x86.ActiveCfg = Release|Any CPU
16371639
{AC33A64E-1261-47E7-8676-69C48E4B0266}.Release|x86.Build.0 = Release|Any CPU
1638-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1639-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E}.Debug|Any CPU.Build.0 = Debug|Any CPU
1640-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E}.Debug|x64.ActiveCfg = Debug|Any CPU
1641-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E}.Debug|x64.Build.0 = Debug|Any CPU
1642-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E}.Debug|x86.ActiveCfg = Debug|Any CPU
1643-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E}.Debug|x86.Build.0 = Debug|Any CPU
1644-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E}.Release|Any CPU.ActiveCfg = Release|Any CPU
1645-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E}.Release|Any CPU.Build.0 = Release|Any CPU
1646-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E}.Release|x64.ActiveCfg = Release|Any CPU
1647-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E}.Release|x64.Build.0 = Release|Any CPU
1648-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E}.Release|x86.ActiveCfg = Release|Any CPU
1649-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E}.Release|x86.Build.0 = Release|Any CPU
16501640
{9FE05F36-5626-416D-956D-5C4C6D7E3E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16511641
{9FE05F36-5626-416D-956D-5C4C6D7E3E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
16521642
{9FE05F36-5626-416D-956D-5C4C6D7E3E1B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1899,6 +1889,30 @@ Global
18991889
{60313ECC-7C20-4509-B41B-C0F69F5162E7}.Release|x64.Build.0 = Release|Any CPU
19001890
{60313ECC-7C20-4509-B41B-C0F69F5162E7}.Release|x86.ActiveCfg = Release|Any CPU
19011891
{60313ECC-7C20-4509-B41B-C0F69F5162E7}.Release|x86.Build.0 = Release|Any CPU
1892+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1893+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}.Debug|Any CPU.Build.0 = Debug|Any CPU
1894+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}.Debug|x64.ActiveCfg = Debug|Any CPU
1895+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}.Debug|x64.Build.0 = Debug|Any CPU
1896+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}.Debug|x86.ActiveCfg = Debug|Any CPU
1897+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}.Debug|x86.Build.0 = Debug|Any CPU
1898+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}.Release|Any CPU.ActiveCfg = Release|Any CPU
1899+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}.Release|Any CPU.Build.0 = Release|Any CPU
1900+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}.Release|x64.ActiveCfg = Release|Any CPU
1901+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}.Release|x64.Build.0 = Release|Any CPU
1902+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}.Release|x86.ActiveCfg = Release|Any CPU
1903+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA}.Release|x86.Build.0 = Release|Any CPU
1904+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1905+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}.Debug|Any CPU.Build.0 = Debug|Any CPU
1906+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}.Debug|x64.ActiveCfg = Debug|Any CPU
1907+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}.Debug|x64.Build.0 = Debug|Any CPU
1908+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}.Debug|x86.ActiveCfg = Debug|Any CPU
1909+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}.Debug|x86.Build.0 = Debug|Any CPU
1910+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}.Release|Any CPU.ActiveCfg = Release|Any CPU
1911+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}.Release|Any CPU.Build.0 = Release|Any CPU
1912+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}.Release|x64.ActiveCfg = Release|Any CPU
1913+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}.Release|x64.Build.0 = Release|Any CPU
1914+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}.Release|x86.ActiveCfg = Release|Any CPU
1915+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B}.Release|x86.Build.0 = Release|Any CPU
19021916
EndGlobalSection
19031917
GlobalSection(SolutionProperties) = preSolution
19041918
HideSolutionNode = FALSE
@@ -2018,7 +2032,6 @@ Global
20182032
{A14AC3AC-3BAD-450A-957F-2F3B45E2412F} = {D9252E02-D807-43DA-BBAF-AD739A8D385A}
20192033
{5D56AD97-9819-4A65-ADD3-18728FE81D95} = {D9252E02-D807-43DA-BBAF-AD739A8D385A}
20202034
{AC33A64E-1261-47E7-8676-69C48E4B0266} = {2FAC6FF0-1FB6-41C6-9A36-FFC2E1727783}
2021-
{66DA86CB-E1DD-4A3A-8855-AD37731F112E} = {2FAC6FF0-1FB6-41C6-9A36-FFC2E1727783}
20222035
{9FE05F36-5626-416D-956D-5C4C6D7E3E1B} = {2FAC6FF0-1FB6-41C6-9A36-FFC2E1727783}
20232036
{A73FD5A1-DA46-432A-9824-BA5FC56C2D3D} = {15AC3300-D335-4C5C-9E3A-22F26904AB26}
20242037
{46EE8C21-DC4A-4BD6-B4D6-1919EA720396} = {15AC3300-D335-4C5C-9E3A-22F26904AB26}
@@ -2042,6 +2055,8 @@ Global
20422055
{1DF2C30F-4A33-4711-B198-6163C931FAC8} = {6868A014-43FD-4047-B536-30D5D159D9D4}
20432056
{C7204C14-0FA5-4EE6-B538-CAAEB7854E98} = {1DF2C30F-4A33-4711-B198-6163C931FAC8}
20442057
{60313ECC-7C20-4509-B41B-C0F69F5162E7} = {6868A014-43FD-4047-B536-30D5D159D9D4}
2058+
{8005D6EB-29C9-4A3F-8D8D-5DE255998ECA} = {2FAC6FF0-1FB6-41C6-9A36-FFC2E1727783}
2059+
{F2F6B6FD-C6AC-4536-81ED-4ED52EE2531B} = {2FAC6FF0-1FB6-41C6-9A36-FFC2E1727783}
20452060
EndGlobalSection
20462061
GlobalSection(ExtensibilityGlobals) = postSolution
20472062
SolutionGuid = {814BFC88-0867-451F-AC8F-20FE107809B4}

‎NuGet.config‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6-
<add key="darc-pub-dotnet-core-setup-92224c9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-92224c91/nuget/v3/index.json" />
7-
<add key="darc-pub-dotnet-corefx-d658fef" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-d658fef8/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
6+
<add key="darc-pub-dotnet-corefx-4ac4c03" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-4ac4c036/nuget/v3/index.json" />
97
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
10-
<add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
11-
<add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
128
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
139
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1410
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.NET Extensions
22
===============
33

4-
[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/aspnet/Extensions/Extensions-ci)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=23)
4+
[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/extensions/Extensions-ci)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=23)
55

66
.NET Extensions is an open-source, cross-platform set of APIs for commonly used programming patterns and utilities, such as dependency injection, logging, and app configuration. Most of the API in this project is meant to work on many .NET platforms, such as .NET Core, .NET Framework, Xamarin, and others. While commonly used in ASP.NET Core applications, these APIs are not coupled to the ASP.NET Core application model. They can be used in console apps, WinForms and WPF, and others.
77

@@ -28,8 +28,8 @@ Security issues and bugs should be reported privately, via email, to the Microso
2828
These are some other repos for related projects:
2929

3030
* [.NET Core](https://github.com/dotnet/core) - a cross-platform, open-source .NET platform
31-
* [ASP.NET Core](https://github.com/aspnet/AspNetCore) - a .NET Core framework for building web apps
32-
* [Entity Framework Core](https://github.com/aspnet/EntityFrameworkCore) - data access technology
31+
* [ASP.NET Core](https://github.com/dotnet/aspnetcore) - a .NET Core framework for building web apps
32+
* [Entity Framework Core](https://github.com/dotnet/efcore) - data access technology
3333

3434
## Code of conduct
3535

‎azure-pipelines.yml‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ stages:
6969
enablePublishBuildAssets: true
7070
enablePublishUsingPipelines: ${{ variables._PublishUsingPipelines }}
7171
enableTelemetry: true
72-
helixRepo: aspnet/Extensions
72+
helixRepo: dotnet/extensions
7373
jobs:
7474
- job: Windows
7575
pool:
@@ -140,6 +140,8 @@ stages:
140140
- script: eng\scripts\ci-flaky-tests.cmd -configuration $(_BuildConfig)
141141
displayName: Run Flaky Tests
142142
continueOnError: true
143+
- script: dotnet msbuild eng/repo.targets /t:EnsureFunctionalTestLogsPreserved
144+
displayName: Ensure functional test logs preserved
143145
- powershell: eng\scripts\KillProcesses.ps1
144146
displayName: Kill processes
145147
condition: always()
@@ -160,6 +162,15 @@ stages:
160162
artifactName: $(Agent.Os)_$(Agent.JobName) TestResults
161163
artifactType: Container
162164
parallel: true
165+
- task: PublishBuildArtifacts@1
166+
displayName: Upload Test Logs
167+
condition: always()
168+
continueOnError: true
169+
inputs:
170+
pathtoPublish: artifacts/log
171+
artifactName: $(Agent.Os)_$(Agent.JobName) Test Logs
172+
artifactType: Container
173+
parallel: true
163174
- task: PublishBuildArtifacts@1
164175
displayName: Upload package artifacts
165176
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
@@ -238,6 +249,15 @@ stages:
238249
artifactName: $(Agent.Os)_$(Agent.JobName) TestResults
239250
artifactType: Container
240251
parallel: true
252+
- task: PublishBuildArtifacts@1
253+
displayName: Upload Test Logs
254+
condition: always()
255+
continueOnError: true
256+
inputs:
257+
pathtoPublish: artifacts/log
258+
artifactName: $(Agent.Os)_$(Agent.JobName) Test Logs
259+
artifactType: Container
260+
parallel: true
241261
- task: PublishBuildArtifacts@1
242262
displayName: Upload NPM artifacts
243263
condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release'))
@@ -301,6 +321,15 @@ stages:
301321
artifactName: $(Agent.Os)_$(Agent.JobName) TestResults
302322
artifactType: Container
303323
parallel: true
324+
- task: PublishBuildArtifacts@1
325+
displayName: Upload Test Logs
326+
condition: always()
327+
continueOnError: true
328+
inputs:
329+
pathtoPublish: artifacts/log
330+
artifactName: $(Agent.Os)_$(Agent.JobName) Test Logs
331+
artifactType: Container
332+
parallel: true
304333
- job: Source_Build
305334
displayName: 'Test: Linux Source Build'
306335
container: centos:7

‎docs/BuildFromSource.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Building Extensions on macOS or Linux requires:
2626

2727
## Building in Visual Studio
2828

29-
Visual Studio requires special tools and command lien parameters. You can acquire these by executing the following on command-line:
29+
Visual Studio requires special tools and command line parameters. You can acquire these by executing the following on command-line:
3030
```
3131
.\restore.cmd
3232
.\startvs.cmd

0 commit comments

Comments
 (0)