Skip to content

Commit affd7e0

Browse files
dotnet-maestro-botryanbrandenburg
dotnet-maestro-bot
authored and
ryanbrandenburg
committed
[automated] Merge branch 'release/3.1' => 'master' (#15394)
* [release/3.1] Update dependencies from 3 repositories (#15218) * Update dependencies from https://github.com/dotnet/arcade build 20191017.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19517.3 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19517.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19517.3 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.2 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.2 - dotnet-ef - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.2 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.4 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.4 - dotnet-ef - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.4 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.5 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.5 - dotnet-ef - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.5 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.7 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.7 - dotnet-ef - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.7 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.8 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.8 - dotnet-ef - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.8 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.9 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.9 - dotnet-ef - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.9 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.11 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.11 - dotnet-ef - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.11 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.12 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.12 - dotnet-ef - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.12 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.13 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.13 - dotnet-ef - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.13 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191022.1 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19522.1 - dotnet-ef - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19522.1 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191022.3 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19522.3 - dotnet-ef - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19522.3 * Remove duplicate icon url * Remove more duplicate icon elements * Remove more package icons * Remove packageIcon * Update dependencies from https://github.com/aspnet/Blazor build 20191023.1 - Microsoft.AspNetCore.Blazor.Mono - 3.1.0-preview2.19523.1 * Undo bad deletion of eng/common file * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191023.2 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.0-preview2.19523.2 - Microsoft.AspNetCore.Razor.Language - 3.1.0-preview2.19523.2 - Microsoft.CodeAnalysis.Razor - 3.1.0-preview2.19523.2 - Microsoft.NET.Sdk.Razor - 3.1.0-preview2.19523.2 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191023.7 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19523.7 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19523.7 - dotnet-ef - 3.1.0-preview2.19523.7 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19523.7 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19523.7 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19523.7 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19523.7 * [ApiAuth] Fix subscription callbacks when unsubscribe (#15194) re-assigned the callback array to itself after running splice on it when a client unsubscribed from notifications. * Update doc references in Auth action results (#15110) * Rebrand for 3.1.0-preview3 - aspnet/AspNetCore-Internal#3281 * [Templating][Fixes #15349] Update SPA templates to use generic host (#15365) * [Blazor] Reliability improvements for the E2E tests (#15320) * Fix race with CTS disposing (#11757) * Nuke helix arm runs on 3.1 (#15390) * [Blazor][Fixes #14959] NavLink match should be case-insensitive (#15401)
1 parent c0161c7 commit affd7e0

File tree

49 files changed

+138
-120
lines changed

Some content is hidden

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

49 files changed

+138
-120
lines changed

‎Directory.Build.props

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@
4646
<!-- Contact email address for NuGet packages and Linux installers. -->
4747
<MaintainerEmail>[email protected]</MaintainerEmail>
4848

49-
<PackageIcon>packageIcon.png</PackageIcon>
50-
<PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
5149
<PackageProjectUrl>https://asp.net</PackageProjectUrl>
5250
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
5351

@@ -56,10 +54,6 @@
5654
<DefaultNetCoreTargetFramework>netcoreapp5.0</DefaultNetCoreTargetFramework>
5755
</PropertyGroup>
5856

59-
<ItemGroup>
60-
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
61-
</ItemGroup>
62-
6357
<!-- Warnings and errors -->
6458
<PropertyGroup>
6559
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -412,17 +412,17 @@
412412
<Uri>https://github.com/aspnet/Extensions</Uri>
413413
<Sha>f15f3278c73c72a6546d7cb2c1bd54a541ffc83e</Sha>
414414
</Dependency>
415-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19510.3">
415+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19517.3">
416416
<Uri>https://github.com/dotnet/arcade</Uri>
417-
<Sha>f70d1fca3d5d4045be75694006f1bee0e0aec572</Sha>
417+
<Sha>a42a124635ce1a218309ecb31ec59d559cacb886</Sha>
418418
</Dependency>
419-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19510.3">
419+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19517.3">
420420
<Uri>https://github.com/dotnet/arcade</Uri>
421-
<Sha>f70d1fca3d5d4045be75694006f1bee0e0aec572</Sha>
421+
<Sha>a42a124635ce1a218309ecb31ec59d559cacb886</Sha>
422422
</Dependency>
423-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19510.3">
423+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19517.3">
424424
<Uri>https://github.com/dotnet/arcade</Uri>
425-
<Sha>f70d1fca3d5d4045be75694006f1bee0e0aec572</Sha>
425+
<Sha>a42a124635ce1a218309ecb31ec59d559cacb886</Sha>
426426
</Dependency>
427427
<Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-alpha1.19517.7" CoherentParentDependency="Microsoft.EntityFrameworkCore">
428428
<Uri>https://github.com/aspnet/Extensions</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/arcade -->
65-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19510.3</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19517.3</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.4.0-beta1-19456-03</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/core-setup -->

‎eng/common/post-build/setup-maestro-vars.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ param(
66

77
try {
88
$Content = Get-Content $ReleaseConfigsPath
9-
9+
1010
$BarId = $Content | Select -Index 0
11-
11+
1212
$Channels = ""
1313
$Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," }
14-
14+
1515
$IsStableBuild = $Content | Select -Index 2
1616

1717
Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId
@@ -23,4 +23,4 @@ catch {
2323
Write-Host $_.Exception
2424
Write-Host $_.ScriptStackTrace
2525
ExitWithExitCode 1
26-
}
26+
}

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.15.2",
28-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19510.3",
29-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19510.3"
28+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19517.3",
29+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19517.3"
3030
}
3131
}

‎packageIcon.png

-6.84 KB
Binary file not shown.

‎src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<ItemGroup>
2626
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2727
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
28-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2928
</ItemGroup>
3029

3130
</Project>

‎src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<icon>packageIcon.png</icon>
65
</metadata>
76

87
<files>
8+
$CommonFileElements$
99
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
1010
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11-
<file src="$PackageIcon$" target="" />
1211
</files>
1312
</package>

‎src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<NuspecProperty Include="componentsversion=$(ComponentsPackageVersion)" />
2424
<NuspecProperty Include="razorversion=$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
2525
<NuspecProperty Include="blazormonoversion=$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
26-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2726
</ItemGroup>
2827

2928
<ItemGroup>

‎src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
<dependencies>
66
<dependency id="Microsoft.AspNetCore.Blazor.Mono" version="$blazormonoversion$" include="all" />
77
</dependencies>
8-
<icon>packageIcon.png</icon>
98
</metadata>
109
<files>
10+
$CommonFileElements$
1111
<file src="..\..\..\THIRD-PARTY-NOTICES.txt" />
1212
<file src="build\**" target="build" />
1313
<file src="targets\**" target="targets" />
1414
<file src="$publishdir$**\*" target="tools/" />
1515
<file src="..\..\..\Web.JS\dist\$configuration$\blazor.*.js" target="tools/blazor" />
16-
<file src="$PackageIcon$" target="" />
1716
</files>
1817
</package>

‎src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<NuspecProperty Include="publishDir=$(PublishDir)" />
3434
<NuspecProperty Include="componentsrootdir=..\..\..\" />
3535
<NuspecProperty Include="blazorversion=$(PackageVersion)" />
36-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
3736
</ItemGroup>
3837

3938
</Project>

‎src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<icon>packageIcon.png</icon>
65
</metadata>
76
<files>
7+
$CommonFileElements$
88
<file src="build\**" target="build" />
99
<file src="$publishDir$**\*" target="tools" />
1010
<file src="$componentsrootdir$THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
11-
<file src="$PackageIcon$" target="" />
1211
</files>
1312
</package>

‎src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
1616
</PropertyGroup>
1717

18-
<ItemGroup>
19-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
20-
</ItemGroup>
21-
2218
<ItemGroup>
2319
<UpToDateCheckInput Include="content\**\.template.config.src\**\*.*" />
2420
</ItemGroup>

‎src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
<packageTypes>
66
<packageType name="Template" />
77
</packageTypes>
8-
<icon>packageIcon.png</icon>
98
</metadata>
109
<files>
10+
$CommonFileElements$
1111
<file
1212
src="content/**"
1313
exclude="**/bin/**;**/obj/**;**/.template.config.src/**;content/Directory.Build.props;content/Directory.Build.targets;"
1414
target="Content" />
15-
<file src="$PackageIcon$" target="" />
1615
</files>
1716
</package>

‎src/Components/Components/src/Microsoft.AspNetCore.Components.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<NuspecProperty Condition="'$(DotNetBuildFromSource)' != 'true'" Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" />
5656
<NuspecProperty Include="AssemblyName=$(AssemblyName)" />
5757
<NuspecProperty Include="OutputPath=$(OutputPath)" />
58-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
5958
</ItemGroup>
6059

6160
</Project>

‎src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
1616
</group>
1717
</dependencies>
18-
<icon>packageIcon.png</icon>
1918
</metadata>
2019
<files>
20+
$CommonFileElements$
2121
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
2222
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
2323
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
24-
<file src="$PackageIcon$" target="" />
2524
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
2625
</files>
2726
</package>

‎src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
1010
</group>
1111
</dependencies>
12-
<icon>packageIcon.png</icon>
1312
</metadata>
1413
<files>
14+
$CommonFileElements$
1515
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
1616
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
1717
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
18-
<file src="$PackageIcon$" target="" />
1918
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
2019
</files>
2120
</package>

‎src/Components/Ignitor/src/BlazorClient.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@ public async Task<bool> ConnectAsync(Uri uri, bool connectAutomatically = true)
348348
});
349349

350350
_hubConnection = builder.Build();
351-
await HubConnection.StartAsync(CancellationToken);
352351

353352
HubConnection.On<int, string>("JS.AttachComponent", OnAttachComponent);
354353
HubConnection.On<int, string, string>("JS.BeginInvokeJS", OnBeginInvokeJS);
@@ -357,6 +356,8 @@ public async Task<bool> ConnectAsync(Uri uri, bool connectAutomatically = true)
357356
HubConnection.On<string>("JS.Error", OnError);
358357
HubConnection.Closed += OnClosedAsync;
359358

359+
await HubConnection.StartAsync(CancellationToken);
360+
360361
if (!connectAutomatically)
361362
{
362363
return true;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private bool ShouldMatch(string currentUriAbsolute)
130130

131131
private bool EqualsHrefExactlyOrIfTrailingSlashAdded(string currentUriAbsolute)
132132
{
133-
if (string.Equals(currentUriAbsolute, _hrefAbsolute, StringComparison.Ordinal))
133+
if (string.Equals(currentUriAbsolute, _hrefAbsolute, StringComparison.OrdinalIgnoreCase))
134134
{
135135
return true;
136136
}
@@ -146,7 +146,7 @@ private bool EqualsHrefExactlyOrIfTrailingSlashAdded(string currentUriAbsolute)
146146
// for http://host/vdir as they do for host://host/vdir/ as it's no
147147
// good to display a blank page in that case.
148148
if (_hrefAbsolute[_hrefAbsolute.Length - 1] == '/'
149-
&& _hrefAbsolute.StartsWith(currentUriAbsolute, StringComparison.Ordinal))
149+
&& _hrefAbsolute.StartsWith(currentUriAbsolute, StringComparison.OrdinalIgnoreCase))
150150
{
151151
return true;
152152
}

‎src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,10 @@
5757
<Compile Include="$(RepoRoot)src\Shared\Components\ServerComponentMarker.cs" />
5858
</ItemGroup>
5959

60+
<ItemGroup>
61+
<None Update="xunit.runner.json">
62+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
63+
</None>
64+
</ItemGroup>
65+
6066
</Project>

‎src/Components/test/E2ETest/ServerExecutionTests/ComponentHubReliabilityTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Microsoft.AspNetCore.Components.RenderTree;
1212
using Microsoft.AspNetCore.Components.Web;
1313
using Microsoft.AspNetCore.SignalR.Client;
14+
using Microsoft.AspNetCore.Testing;
1415
using Microsoft.Extensions.Logging;
1516
using TestServer;
1617
using Xunit;

‎src/Components/test/E2ETest/ServerExecutionTests/IgnitorTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ protected virtual Task InitializeAsync()
8383
return Task.CompletedTask;
8484
}
8585

86-
protected virtual Task DisposeAsync()
86+
protected async virtual Task DisposeAsync()
8787
{
8888
if (TestSink != null)
8989
{
9090
TestSink.MessageLogged -= TestSink_MessageLogged;
9191
}
9292

93-
return Task.CompletedTask;
93+
await Client.DisposeAsync();
9494
}
9595

9696
private void TestSink_MessageLogged(WriteContext context)

‎src/Components/test/E2ETest/xunit.runner.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
// This is set to -1 to allow the usage of an
3+
// unlimited ammount of threads.
4+
"maxParallelThreads": -1,
5+
"diagnosticMessages": true,
6+
"longRunningTestSeconds": 30
7+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<li><NavLink href="Other" Match=NavLinkMatch.All>Other with base-relative URL (matches all)</NavLink></li>
1717
<li><NavLink href="/subdir/other?abc=123">Other with query</NavLink></li>
1818
<li><NavLink href="/subdir/Other#blah">Other with hash</NavLink></li>
19-
<li><NavLink href="/subdir/WithParameters/Name/Abc">With parameters</NavLink></li>
19+
<li><NavLink href="/subdir/WithParameters/name/Abc">With parameters</NavLink></li>
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>

‎src/Installers/Windows/SharedFramework/SharedFramework.wixproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
<ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec</ToolsetInstallerNuspecFile>
2525
</PropertyGroup>
2626

27-
<ItemGroup>
28-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
29-
</ItemGroup>
30-
3127
<ItemGroup>
3228
<WixExtension Include="WixDependencyExtension">
3329
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>

‎src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<owners>Microsoft</owners>
99
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
1010
<projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
11-
<icon>packageIcon.png</icon>
1211
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1312
<description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
1413
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

‎src/Installers/Windows/TargetingPack/TargetingPack.wixproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
<ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\TargetingPack\TargetingPackPackage.nuspec</ToolsetInstallerNuspecFile>
2424
</PropertyGroup>
2525

26-
<ItemGroup>
27-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
28-
</ItemGroup>
29-
3026
<ItemGroup>
3127
<WixExtension Include="WixDependencyExtension">
3228
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>

‎src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<owners>Microsoft</owners>
99
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
1010
<projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
11-
<icon>packageIcon.png</icon>
1211
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1312
<description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
1413
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

‎src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<ItemGroup>
2020
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2121
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
22-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2322
</ItemGroup>
2423

2524
</Project>

‎src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<icon>packageIcon.png</icon>
65
</metadata>
76

87
<files>
8+
$CommonFileElements$
99
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
1010
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11-
<file src="$PackageIcon$" target="" />
1211
</files>
1312
</package>

‎src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<ItemGroup>
2525
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2626
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
27-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2827
</ItemGroup>
2928

3029
</Project>

‎src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<icon>packageIcon.png</icon>
65
</metadata>
76

87
<files>
8+
$CommonFileElements$
99
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
1010
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11-
<file src="$PackageIcon$" target="" />
1211
</files>
1312
</package>

‎src/Mvc/Mvc.Core/src/ChallengeResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Microsoft.AspNetCore.Mvc
1212
{
1313
/// <summary>
14-
/// An <see cref="ActionResult"/> that on execution invokes <see cref="M:AuthenticationManager.ChallengeAsync"/>.
14+
/// An <see cref="ActionResult"/> that on execution invokes <see cref="M:HttpContext.ChallengeAsync"/>.
1515
/// </summary>
1616
public class ChallengeResult : ActionResult
1717
{

0 commit comments

Comments
 (0)