Skip to content

Commit e63969d

Browse files
authored
Clean up aspnetcore casing in ref to that repo (#47347)
- address difference I introduced in dotnet/aspnetcore#29511 and more - conflict detected in dotnet/aspnetcore#29520 - also s|aspnet/aspnetcore|dotnet/aspnetcore|
1 parent 39d72d4 commit e63969d

File tree

7 files changed

+69
-69
lines changed

7 files changed

+69
-69
lines changed

THIRD-PARTY-NOTICES.TXT

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ Copyright (c) .NET Foundation. All rights reserved.
1515
Licensed under the Apache License, Version 2.0.
1616

1717
Available at
18-
https://github.com/aspnet/AspNetCore/blob/master/LICENSE.txt
18+
https://github.com/dotnet/aspnetcore/blob/master/LICENSE.txt
1919

20-
License notice for Slicing-by-8
20+
License notice for Slicing-by-8
2121
-------------------------------
2222

2323
http://sourceforge.net/projects/slicing-by-8/
@@ -66,7 +66,7 @@ shall not be used in advertising or otherwise to promote the sale,
6666
use or other dealings in these Data Files or Software without prior
6767
written authorization of the copyright holder.
6868

69-
License notice for Zlib
69+
License notice for Zlib
7070
-----------------------
7171

7272
https://github.com/madler/zlib
@@ -117,12 +117,12 @@ furnished to do so, subject to the following conditions:
117117
The above copyright notice and this permission notice shall be included in all
118118
copies or substantial portions of the Software.
119119

120-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
121-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
122-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
123-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
124-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
125-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
120+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
121+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
122+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
123+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
124+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
125+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
126126
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
127127

128128
License notice for International Organization for Standardization
@@ -232,7 +232,7 @@ noted) — feel free to use them however you please. The aggregate collection an
232232
descriptions are © 1997-2005 Sean Eron Anderson. The code and descriptions are
233233
distributed in the hope that they will be useful, but WITHOUT ANY WARRANTY and
234234
without even the implied warranty of merchantability or fitness for a particular
235-
purpose.
235+
purpose.
236236

237237
License notice for Brotli
238238
--------------------------------------
@@ -378,7 +378,7 @@ License notice for RFC 3492
378378
---------------------------
379379

380380
The punycode implementation is based on the sample code in RFC 3492
381-
381+
382382
Copyright (C) The Internet Society (2003). All Rights Reserved.
383383

384384
This document and translations of it may be copied and furnished to
@@ -448,7 +448,7 @@ ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY
448448
RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A
449449
PARTICULAR PURPOSE.
450450

451-
License notice for Algorithm from RFC 4122 -
451+
License notice for Algorithm from RFC 4122 -
452452
A Universally Unique IDentifier (UUID) URN Namespace
453453
----------------------------------------------------
454454

@@ -517,8 +517,8 @@ License notice for Greg Parker
517517
------------------------------
518518

519519
Greg Parker [email protected] December 2000
520-
This code is in the public domain and may be copied or modified without
521-
permission.
520+
This code is in the public domain and may be copied or modified without
521+
permission.
522522

523523
License notice for libunwind based code
524524
----------------------------------------
@@ -548,23 +548,23 @@ License notice for Printing Floating-Point Numbers (Dragon4)
548548
/******************************************************************************
549549
Copyright (c) 2014 Ryan Juckett
550550
http://www.ryanjuckett.com/
551-
551+
552552
This software is provided 'as-is', without any express or implied
553553
warranty. In no event will the authors be held liable for any damages
554554
arising from the use of this software.
555-
555+
556556
Permission is granted to anyone to use this software for any purpose,
557557
including commercial applications, and to alter it and redistribute it
558558
freely, subject to the following restrictions:
559-
559+
560560
1. The origin of this software must not be misrepresented; you must not
561561
claim that you wrote the original software. If you use this software
562562
in a product, an acknowledgment in the product documentation would be
563563
appreciated but is not required.
564-
564+
565565
2. Altered source versions must be plainly marked as such, and must not be
566566
misrepresented as being the original software.
567-
567+
568568
3. This notice may not be removed or altered from any source
569569
distribution.
570570
******************************************************************************/

docs/coding-guidelines/api-guidelines/nullability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ However, for existing virtual APIs that do not have any such strong guarantee do
6767
4. How common is it in the case of (3) for such invocations to then dereference the result rather than passing it off to something else that accepts a `T?`?
6868

6969
`Object.ToString` is arguably the most extreme case. Answering the above questions:
70-
1. It is fairly easy in any reasonably-sized code base to find cases, intentional or otherwise, where `ToString` returns `null` in some cases (we've found examples in dotnet/corefx, dotnet/roslyn, NuGet/NuGet.Client, aspnet/AspNetCore, and so on). One of the most prevalent conditions for this are types that just return the value in a string field which may contain its default value of `null`, and in particular for structs where a ctor may not have even had a chance to run and validate an input. Guidance in the docs suggests that `ToString` shouldn't return `null` or `string.Empty`, but even the docs don't follow its own guidance.
70+
1. It is fairly easy in any reasonably-sized code base to find cases, intentional or otherwise, where `ToString` returns `null` in some cases (we've found examples in dotnet/corefx, dotnet/roslyn, NuGet/NuGet.Client, dotnet/aspnetcore, and so on). One of the most prevalent conditions for this are types that just return the value in a string field which may contain its default value of `null`, and in particular for structs where a ctor may not have even had a chance to run and validate an input. Guidance in the docs suggests that `ToString` shouldn't return `null` or `string.Empty`, but even the docs don't follow its own guidance.
7171
2. Thousands upon thousands of types we don't control override this method today.
7272
3. It's common for helper routines to invoke via the base `object.ToString`, but many `ToString` uses are actually on derived types. This is particularly true when working in a code base that both defines a type and consumes its `ToString`.
7373
4. Based on examination of several large code bases, we believe it to be relatively rare that the result of an `Object.ToString` call (made on the base) to be directly dereferenced. It's much more common to pass it to another method that accepts `string?`, such as `String.Concat`, `String.Format`, `Console.WriteLine`, logging utilities, and so on. And while we advocate that `ToString` results shouldn't be assumed to be in a particular machine-readable format and parsed, it's certainly the case that code bases do, such as using `Substring` on the result, but in such cases, the caller needs to understand the format of what's being rendered, which generally means they're working with a derived type rather than calling through the base `Object.ToString`.

src/installer/pkg/THIRD-PARTY-NOTICES.TXT

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Copyright (c) .NET Foundation. All rights reserved.
1515
Licensed under the Apache License, Version 2.0.
1616

1717
Available at
18-
https://github.com/aspnet/AspNetCore/blob/master/LICENSE.txt
18+
https://github.com/dotnet/aspnetcore/blob/master/LICENSE.txt
1919

2020
License notice for Slicing-by-8
2121
-------------------------------
@@ -116,12 +116,12 @@ furnished to do so, subject to the following conditions:
116116
The above copyright notice and this permission notice shall be included in all
117117
copies or substantial portions of the Software.
118118

119-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
120-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
121-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
122-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
123-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
124-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
119+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
120+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
121+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
122+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
123+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
124+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
125125
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
126126

127127
License notice for International Organization for Standardization
@@ -231,7 +231,7 @@ noted) — feel free to use them however you please. The aggregate collection an
231231
descriptions are © 1997-2005 Sean Eron Anderson. The code and descriptions are
232232
distributed in the hope that they will be useful, but WITHOUT ANY WARRANTY and
233233
without even the implied warranty of merchantability or fitness for a particular
234-
purpose.
234+
purpose.
235235

236236
License notice for Brotli
237237
--------------------------------------
@@ -377,7 +377,7 @@ License notice for RFC 3492
377377
---------------------------
378378

379379
The punycode implementation is based on the sample code in RFC 3492
380-
380+
381381
Copyright (C) The Internet Society (2003). All Rights Reserved.
382382

383383
This document and translations of it may be copied and furnished to
@@ -516,8 +516,8 @@ License notice for Greg Parker
516516
------------------------------
517517

518518
Greg Parker [email protected] December 2000
519-
This code is in the public domain and may be copied or modified without
520-
permission.
519+
This code is in the public domain and may be copied or modified without
520+
permission.
521521

522522
License notice for libunwind based code
523523
----------------------------------------
@@ -547,23 +547,23 @@ License notice for Printing Floating-Point Numbers (Dragon4)
547547
/******************************************************************************
548548
Copyright (c) 2014 Ryan Juckett
549549
http://www.ryanjuckett.com/
550-
550+
551551
This software is provided 'as-is', without any express or implied
552552
warranty. In no event will the authors be held liable for any damages
553553
arising from the use of this software.
554-
554+
555555
Permission is granted to anyone to use this software for any purpose,
556556
including commercial applications, and to alter it and redistribute it
557557
freely, subject to the following restrictions:
558-
558+
559559
1. The origin of this software must not be misrepresented; you must not
560560
claim that you wrote the original software. If you use this software
561561
in a product, an acknowledgment in the product documentation would be
562562
appreciated but is not required.
563-
563+
564564
2. Altered source versions must be plainly marked as such, and must not be
565565
misrepresented as being the original software.
566-
566+
567567
3. This notice may not be removed or altered from any source
568568
distribution.
569569
******************************************************************************/
@@ -1138,17 +1138,17 @@ Copyright © Sven Groot (Ookii.org) 2009
11381138
All rights reserved.
11391139

11401140

1141-
Redistribution and use in source and binary forms, with or without
1141+
Redistribution and use in source and binary forms, with or without
11421142
modification, are permitted provided that the following conditions are met:
11431143

1144-
1) Redistributions of source code must retain the above copyright notice,
1145-
this list of conditions and the following disclaimer.
1144+
1) Redistributions of source code must retain the above copyright notice,
1145+
this list of conditions and the following disclaimer.
11461146
2) Redistributions in binary form must reproduce the above copyright notice,
11471147
this list of conditions and the following disclaimer in the documentation
1148-
and/or other materials provided with the distribution.
1148+
and/or other materials provided with the distribution.
11491149
3) Neither the name of the ORGANIZATION nor the names of its contributors
11501150
may be used to endorse or promote products derived from this software
1151-
without specific prior written permission.
1151+
without specific prior written permission.
11521152

11531153
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
11541154
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
The code in this directory is shared between dotnet/runtime and dotnet/AspNetCore. This contains HTTP/2 and HTTP/3 protocol infrastructure such as an HPACK implementation. Any changes to this dir need to be checked into both repositories.
1+
The code in this directory is shared between dotnet/runtime and dotnet/aspnetcore. This contains HTTP/2 and HTTP/3 protocol infrastructure such as an HPACK implementation. Any changes to this dir need to be checked into both repositories.
22

33
dotnet/runtime code paths:
44
- runtime\src\libraries\Common\src\System\Net\Http\aspnetcore
55
- runtime\src\libraries\Common\tests\Tests\System\Net\aspnetcore
66

7-
dotnet/AspNetCore code paths:
8-
- AspNetCore\src\Shared\runtime
9-
- AspNetCore\src\Shared\test\Shared.Tests\runtime
7+
dotnet/aspnetcore code paths:
8+
- aspnetcore\src\Shared\runtime
9+
- aspnetcore\src\Shared\test\Shared.Tests\runtime
1010

1111
## Copying code
12-
- To copy code from dotnet/runtime to dotnet/AspNetCore, set ASPNETCORE_REPO to the AspNetCore repo root and then run CopyToAspNetCore.cmd.
13-
- To copy code from dotnet/AspNetCore to dotnet/runtime, set RUNTIME_REPO to the runtime repo root and then run CopyToRuntime.cmd.
12+
- To copy code from dotnet/runtime to dotnet/aspnetcore, set ASPNETCORE_REPO to the aspnetcore repo root and then run CopyToAspNetCore.cmd.
13+
- To copy code from dotnet/aspnetcore to dotnet/runtime, set RUNTIME_REPO to the runtime repo root and then run CopyToRuntime.cmd.
1414

1515
## Building dotnet/runtime code:
1616
- https://github.com/dotnet/runtime/tree/master/docs/workflow
@@ -23,14 +23,14 @@ dotnet/AspNetCore code paths:
2323
- `PS D:\github\runtime\src\libraries\Common\tests> dotnet build /t:test`
2424
- `PS D:\github\runtime\src\libraries\System.Net.Http\tests\UnitTests> dotnet build /t:test`
2525

26-
## Building dotnet/AspNetCore code:
27-
- https://github.com/dotnet/AspNetCore/blob/main/docs/BuildFromSource.md
28-
- Run restore in the root once: `PS D:\github\AspNetCore> .\restore.cmd`
29-
- Activate to use the repo local runtime: `PS D:\github\AspNetCore> . .\activate.ps1`
26+
## Building dotnet/aspnetcore code:
27+
- https://github.com/dotnet/aspnetcore/blob/main/docs/BuildFromSource.md
28+
- Run restore in the root once: `PS D:\github\aspnetcore> .\restore.cmd`
29+
- Activate to use the repo local runtime: `PS D:\github\aspnetcore> . .\activate.ps1`
3030
- Build the individual projects:
31-
- `(AspNetCore) PS D:\github\AspNetCore\src\Shared\test\Shared.Tests> dotnet build`
32-
- `(AspNetCore) PS D:\github\AspNetCore\src\servers\Kestrel\core\src> dotnet build`
31+
- `(aspnetcore) PS D:\github\aspnetcore\src\Shared\test\Shared.Tests> dotnet build`
32+
- `(aspnetcore) PS D:\github\aspnetcore\src\servers\Kestrel\core\src> dotnet build`
3333

34-
### Running dotnet/AspNetCore tests:
35-
- `(AspNetCore) PS D:\github\AspNetCore\src\Shared\test\Shared.Tests> dotnet test`
36-
- `(AspNetCore) PS D:\github\AspNetCore\src\servers\Kestrel\core\test> dotnet test`
34+
### Running dotnet/aspnetcore tests:
35+
- `(aspnetcore) PS D:\github\aspnetcore\src\Shared\test\Shared.Tests> dotnet test`
36+
- `(aspnetcore) PS D:\github\aspnetcore\src\servers\Kestrel\core\test> dotnet test`

src/libraries/Common/tests/Tests/System/Net/aspnetcore/ReadMe.SharedCode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ The code in this directory is shared between the runtime libraries and AspNetCor
22

33
For additional details see:
44
- runtime/src/libraries/Common/src/System/Net/Http/aspnetcore/ReadMe.SharedCode.md
5-
- AspNetCore/src/Shared/runtime/ReadMe.SharedCode.md
5+
- aspnetcore/src/Shared/runtime/ReadMe.SharedCode.md

src/libraries/System.Net.Http/tests/StressTests/HttpStress/ClientOperations.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ public void PopulateWithRandomHeaders(HttpRequestHeaders headers)
153153
string CreateHeaderValue() => HttpUtility.UrlEncode(GetRandomString(1, 30, alphaNumericOnly: false));
154154
string[] values = Enumerable.Range(0, _random.Next(1, 6)).Select(_ => CreateHeaderValue()).ToArray();
155155
totalSize += name.Length + values.Select(v => v.Length + 2).Sum();
156-
157-
if (totalSize > MaxRequestHeaderTotalSize)
156+
157+
if (totalSize > MaxRequestHeaderTotalSize)
158158
{
159159
break;
160160
}
@@ -189,7 +189,7 @@ public static (string name, Func<RequestContext, Task> operation)[] Operations =
189189
using var req = new HttpRequestMessage(HttpMethod.Get, "/get");
190190
int expectedLength = ctx.SetExpectedResponseContentLengthHeader(req.Headers);
191191
using HttpResponseMessage m = await ctx.SendAsync(req);
192-
192+
193193
ValidateStatusCode(m);
194194
ValidateServerContent(await m.Content.ReadAsStringAsync(), expectedLength);
195195
}),
@@ -282,7 +282,7 @@ public static (string name, Func<RequestContext, Task> operation)[] Operations =
282282
{
283283
using var req = new HttpRequestMessage(HttpMethod.Get, "/abort");
284284
ctx.SetExpectedResponseContentLengthHeader(req.Headers, minLength: 2);
285-
285+
286286
await ctx.SendAsync(req);
287287

288288
throw new Exception("Completed unexpectedly");
@@ -307,7 +307,7 @@ public static (string name, Func<RequestContext, Task> operation)[] Operations =
307307
case "Http2ProtocolException":
308308
case "Http2ConnectionException":
309309
case "Http2StreamException":
310-
if ((e.InnerException?.Message?.Contains("INTERNAL_ERROR") ?? false) || // UseKestrel (https://github.com/aspnet/AspNetCore/issues/12256)
310+
if ((e.InnerException?.Message?.Contains("INTERNAL_ERROR") ?? false) || // UseKestrel (https://github.com/dotnet/aspnetcore/issues/12256)
311311
(e.InnerException?.Message?.Contains("CANCEL") ?? false)) // UseHttpSys
312312
{
313313
return;
@@ -490,7 +490,7 @@ private static void ValidateContent(string expectedContent, string actualContent
490490
{
491491
if (actualContent != expectedContent)
492492
{
493-
int divergentIndex =
493+
int divergentIndex =
494494
Enumerable
495495
.Zip(actualContent, expectedContent)
496496
.Select((x,i) => (x.First, x.Second, i))

0 commit comments

Comments
 (0)