Skip to content

Commit 0d412c3

Browse files
dougbudougbu
authored
Merge branch 'release/3.1' => 'master' (#14389)
2 parents 894d9af + 0e81361 commit 0d412c3

File tree

5 files changed

+44
-57
lines changed

5 files changed

+44
-57
lines changed

‎src/Components/Components.sln

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Signal
210210
EndProject
211211
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Connections.Client", "..\SignalR\clients\csharp\Http.Connections.Client\src\Microsoft.AspNetCore.Http.Connections.Client.csproj", "{F88118E1-6F4A-4F89-B047-5FFD2889B9F0}"
212212
EndProject
213-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor", "Ignitor\src\Ignitor.csproj", "{A78CE874-76B7-46FE-8009-1ED5258BA0AA}"
214-
EndProject
215-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor.Test", "Ignitor\test\Ignitor.Test.csproj", "{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}"
216-
EndProject
217213
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.HttpClient", "Blazor\Http\src\Microsoft.AspNetCore.Blazor.HttpClient.csproj", "{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}"
218214
EndProject
219215
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.HttpClient.Tests", "Blazor\Http\test\Microsoft.AspNetCore.Blazor.HttpClient.Tests.csproj", "{E4C01A3F-D3C1-4639-A6A9-930E918843DD}"
@@ -238,6 +234,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsP
238234
EndProject
239235
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServerApp", "Samples\BlazorServerApp\BlazorServerApp.csproj", "{BBF37AF9-8290-4B70-8BA8-0F6017B3B620}"
240236
EndProject
237+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ignitor", "Ignitor", "{BDE2397D-C53A-4783-8B3A-1F54F48A6926}"
238+
EndProject
239+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor", "Ignitor\src\Ignitor.csproj", "{CD0EF85C-4187-4515-A355-E5A0D4485F40}"
240+
EndProject
241+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor.Test", "Ignitor\test\Ignitor.Test.csproj", "{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}"
242+
EndProject
241243
Global
242244
GlobalSection(SolutionConfigurationPlatforms) = preSolution
243245
Debug|Any CPU = Debug|Any CPU
@@ -1352,30 +1354,6 @@ Global
13521354
{F88118E1-6F4A-4F89-B047-5FFD2889B9F0}.Release|x64.Build.0 = Release|Any CPU
13531355
{F88118E1-6F4A-4F89-B047-5FFD2889B9F0}.Release|x86.ActiveCfg = Release|Any CPU
13541356
{F88118E1-6F4A-4F89-B047-5FFD2889B9F0}.Release|x86.Build.0 = Release|Any CPU
1355-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1356-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
1357-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA}.Debug|x64.ActiveCfg = Debug|Any CPU
1358-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA}.Debug|x64.Build.0 = Debug|Any CPU
1359-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA}.Debug|x86.ActiveCfg = Debug|Any CPU
1360-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA}.Debug|x86.Build.0 = Debug|Any CPU
1361-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
1362-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA}.Release|Any CPU.Build.0 = Release|Any CPU
1363-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA}.Release|x64.ActiveCfg = Release|Any CPU
1364-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA}.Release|x64.Build.0 = Release|Any CPU
1365-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA}.Release|x86.ActiveCfg = Release|Any CPU
1366-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA}.Release|x86.Build.0 = Release|Any CPU
1367-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1368-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
1369-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Debug|x64.ActiveCfg = Debug|Any CPU
1370-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Debug|x64.Build.0 = Debug|Any CPU
1371-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Debug|x86.ActiveCfg = Debug|Any CPU
1372-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Debug|x86.Build.0 = Debug|Any CPU
1373-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
1374-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Release|Any CPU.Build.0 = Release|Any CPU
1375-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Release|x64.ActiveCfg = Release|Any CPU
1376-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Release|x64.Build.0 = Release|Any CPU
1377-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Release|x86.ActiveCfg = Release|Any CPU
1378-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Release|x86.Build.0 = Release|Any CPU
13791357
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13801358
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
13811359
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1484,6 +1462,30 @@ Global
14841462
{BBF37AF9-8290-4B70-8BA8-0F6017B3B620}.Release|x64.Build.0 = Release|Any CPU
14851463
{BBF37AF9-8290-4B70-8BA8-0F6017B3B620}.Release|x86.ActiveCfg = Release|Any CPU
14861464
{BBF37AF9-8290-4B70-8BA8-0F6017B3B620}.Release|x86.Build.0 = Release|Any CPU
1465+
{CD0EF85C-4187-4515-A355-E5A0D4485F40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1466+
{CD0EF85C-4187-4515-A355-E5A0D4485F40}.Debug|Any CPU.Build.0 = Debug|Any CPU
1467+
{CD0EF85C-4187-4515-A355-E5A0D4485F40}.Debug|x64.ActiveCfg = Debug|Any CPU
1468+
{CD0EF85C-4187-4515-A355-E5A0D4485F40}.Debug|x64.Build.0 = Debug|Any CPU
1469+
{CD0EF85C-4187-4515-A355-E5A0D4485F40}.Debug|x86.ActiveCfg = Debug|Any CPU
1470+
{CD0EF85C-4187-4515-A355-E5A0D4485F40}.Debug|x86.Build.0 = Debug|Any CPU
1471+
{CD0EF85C-4187-4515-A355-E5A0D4485F40}.Release|Any CPU.ActiveCfg = Release|Any CPU
1472+
{CD0EF85C-4187-4515-A355-E5A0D4485F40}.Release|Any CPU.Build.0 = Release|Any CPU
1473+
{CD0EF85C-4187-4515-A355-E5A0D4485F40}.Release|x64.ActiveCfg = Release|Any CPU
1474+
{CD0EF85C-4187-4515-A355-E5A0D4485F40}.Release|x64.Build.0 = Release|Any CPU
1475+
{CD0EF85C-4187-4515-A355-E5A0D4485F40}.Release|x86.ActiveCfg = Release|Any CPU
1476+
{CD0EF85C-4187-4515-A355-E5A0D4485F40}.Release|x86.Build.0 = Release|Any CPU
1477+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1478+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
1479+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Debug|x64.ActiveCfg = Debug|Any CPU
1480+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Debug|x64.Build.0 = Debug|Any CPU
1481+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Debug|x86.ActiveCfg = Debug|Any CPU
1482+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Debug|x86.Build.0 = Debug|Any CPU
1483+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
1484+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Release|Any CPU.Build.0 = Release|Any CPU
1485+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Release|x64.ActiveCfg = Release|Any CPU
1486+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Release|x64.Build.0 = Release|Any CPU
1487+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Release|x86.ActiveCfg = Release|Any CPU
1488+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Release|x86.Build.0 = Release|Any CPU
14871489
EndGlobalSection
14881490
GlobalSection(SolutionProperties) = preSolution
14891491
HideSolutionNode = FALSE
@@ -1583,8 +1585,6 @@ Global
15831585
{DA137BD4-F7F1-4D53-855F-5EC40CEA36B0} = {2FC10057-7A0A-4E34-8302-879925BC0102}
15841586
{0CDAB70B-71DC-43BE-ACB7-AD2EE3541FFB} = {2FC10057-7A0A-4E34-8302-879925BC0102}
15851587
{F88118E1-6F4A-4F89-B047-5FFD2889B9F0} = {2FC10057-7A0A-4E34-8302-879925BC0102}
1586-
{A78CE874-76B7-46FE-8009-1ED5258BA0AA} = {D6712550-0DA2-49C8-88E1-F04CAB982BF4}
1587-
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA} = {D6712550-0DA2-49C8-88E1-F04CAB982BF4}
15881588
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF} = {7260DED9-22A9-4E9D-92F4-5E8A4404DEAF}
15891589
{E4C01A3F-D3C1-4639-A6A9-930E918843DD} = {7260DED9-22A9-4E9D-92F4-5E8A4404DEAF}
15901590
{DE297C91-B3E9-4C6F-B74D-0AF9EFEBF684} = {A27FF193-195B-4474-8E6C-840B2E339373}
@@ -1594,6 +1594,8 @@ Global
15941594
{173D84A3-0F37-480F-AC0F-7E2DBBE32B28} = {B0EEB429-4C8C-42AA-8822-3058E7DBC98F}
15951595
{4664276D-606A-4BB3-873A-9EE84FB22877} = {2FC10057-7A0A-4E34-8302-879925BC0102}
15961596
{BBF37AF9-8290-4B70-8BA8-0F6017B3B620} = {46E4300C-5726-4108-B9A2-18BB94EB26ED}
1597+
{CD0EF85C-4187-4515-A355-E5A0D4485F40} = {BDE2397D-C53A-4783-8B3A-1F54F48A6926}
1598+
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E} = {BDE2397D-C53A-4783-8B3A-1F54F48A6926}
15971599
EndGlobalSection
15981600
GlobalSection(ExtensibilityGlobals) = postSolution
15991601
SolutionGuid = {CC3C47E1-AD1A-4619-9CD3-E08A0148E5CE}

‎src/Components/ComponentsNoDeps.slnf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
"Components\\test\\Microsoft.AspNetCore.Components.Tests.csproj",
2727
"Forms\\src\\Microsoft.AspNetCore.Components.Forms.csproj",
2828
"Forms\\test\\Microsoft.AspNetCore.Components.Forms.Tests.csproj",
29-
"Samples\\BlazorServer.Sample\\BlazorServer.Sample.csproj",
29+
"Ignitor\\src\\Ignitor.csproj",
30+
"Ignitor\\test\\Ignitor.Test.csproj",
31+
"Samples\\BlazorServerApp\\BlazorServerApp.csproj",
3032
"Server\\src\\Microsoft.AspNetCore.Components.Server.csproj",
3133
"Server\\test\\Microsoft.AspNetCore.Components.Server.Tests.csproj",
3234
"Web\\src\\Microsoft.AspNetCore.Components.Web.csproj",
3335
"Web\\test\\Microsoft.AspNetCore.Components.Web.Tests.csproj",
3436
"test\\E2ETest\\Microsoft.AspNetCore.Components.E2ETests.csproj",
35-
"test\\Ignitor.Test\\Ignitor.Test.csproj",
3637
"test\\testassets\\BasicTestApp\\BasicTestApp.csproj",
37-
"test\\testassets\\Ignitor\\Ignitor.csproj",
3838
"test\\testassets\\TestContentPackage\\TestContentPackage.csproj",
3939
"test\\testassets\\TestServer\\Components.TestServer.csproj"
4040
]
4141
}
42-
}
42+
}

‎src/Components/Web/src/Routing/NavLink.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@ private void OnLocationChanged(object sender, LocationChangedEventArgs args)
109109

110110
private bool ShouldMatch(string currentUriAbsolute)
111111
{
112+
if (_hrefAbsolute == null)
113+
{
114+
return false;
115+
}
116+
112117
if (EqualsHrefExactlyOrIfTrailingSlashAdded(currentUriAbsolute))
113118
{
114119
return true;

‎src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<li><NavLink href="/subdir/WithParameters/Name/Abc/LastName/McDef">With more parameters</NavLink></li>
2121
<li><NavLink href="/subdir/LongPage1">Long page 1</NavLink></li>
2222
<li><NavLink href="/subdir/LongPage2">Long page 2</NavLink></li>
23+
<li><NavLink>Null href never matches</NavLink></li>
2324
</ul>
2425

2526
<button id="do-navigation" @onclick=@(x => NavigationManager.NavigateTo("Other"))>

‎src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void OpenApi_Add_File_EquivilentPaths()
134134
Assert.Single(openApiRefs);
135135
}
136136

137-
[Fact (Skip = "https://github.com/aspnet/AspNetCore/pull/13571/#issuecomment-531466801")]
137+
[Fact]
138138
public async Task OpenApi_Add_NSwagTypeScript()
139139
{
140140
var project = CreateBasicProject(withOpenApi: true);
@@ -155,20 +155,9 @@ public async Task OpenApi_Add_NSwagTypeScript()
155155
Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
156156
Assert.Contains($"<OpenApiReference Include=\"{nswagJsonFile}\" CodeGenerator=\"NSwagTypeScript\" />", content);
157157
}
158-
159-
// Build project and make sure it compiles
160-
using var buildProc = ProcessEx.Run(_outputHelper, _tempDir.Root, "dotnet", "build");
161-
await buildProc.Exited;
162-
Assert.True(buildProc.ExitCode == 0, $"Build failed: {buildProc.Output}");
163-
164-
165-
// Run project and make sure it doesn't crash
166-
using var runProc = ProcessEx.Run(_outputHelper, _tempDir.Root, "dotnet", "run");
167-
Thread.Sleep(100);
168-
Assert.False(runProc.HasExited, $"Run failed with: {runProc.Output}");
169158
}
170159

171-
[Fact (Skip = "https://github.com/aspnet/AspNetCore/pull/13571/#issuecomment-531466801")]
160+
[Fact]
172161
public async Task OpenApi_Add_FromJson()
173162
{
174163
var project = CreateBasicProject(withOpenApi: true);
@@ -189,16 +178,6 @@ public async Task OpenApi_Add_FromJson()
189178
Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
190179
Assert.Contains($"<OpenApiReference Include=\"{nswagJsonFile}\"", content);
191180
}
192-
193-
// Build project and make sure it compiles
194-
var buildProc = ProcessEx.Run(_outputHelper, _tempDir.Root, "dotnet", "build");
195-
await buildProc.Exited;
196-
Assert.True(buildProc.ExitCode == 0, $"Build failed: {buildProc.Output}");
197-
198-
// Run project and make sure it doesn't crash
199-
using var runProc = ProcessEx.Run(_outputHelper, _tempDir.Root, "dotnet", "run");
200-
Thread.Sleep(100);
201-
Assert.False(runProc.HasExited, $"Run failed with: {runProc.Output}");
202181
}
203182

204183
[Fact]

0 commit comments

Comments
 (0)