Skip to content

Commit 336e055

Browse files
authored
Merge pull request #26516 from dotnet-maestro-bot/merge/release/5.0-to-master
[automated] Merge branch 'release/5.0' => 'master'
2 parents 56fa941 + 333caa4 commit 336e055

File tree

131 files changed

+2303
-119
lines changed

Some content is hidden

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

131 files changed

+2303
-119
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,17 @@
313313
<Uri>https://github.com/dotnet/runtime</Uri>
314314
<Sha>f63b0c1a7562b5a70c6f02db8f99e2c9b5b97cac</Sha>
315315
</Dependency>
316-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20474.4">
316+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20478.3">
317317
<Uri>https://github.com/dotnet/arcade</Uri>
318-
<Sha>61cde6e8fb9d5c9790867b279deb41783a780cd8</Sha>
318+
<Sha>c8a7611e15656f45b039d46ec4e09f9f2a7edf99</Sha>
319319
</Dependency>
320-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20474.4">
320+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20478.3">
321321
<Uri>https://github.com/dotnet/arcade</Uri>
322-
<Sha>61cde6e8fb9d5c9790867b279deb41783a780cd8</Sha>
322+
<Sha>c8a7611e15656f45b039d46ec4e09f9f2a7edf99</Sha>
323323
</Dependency>
324-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20474.4">
324+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20478.3">
325325
<Uri>https://github.com/dotnet/arcade</Uri>
326-
<Sha>61cde6e8fb9d5c9790867b279deb41783a780cd8</Sha>
326+
<Sha>c8a7611e15656f45b039d46ec4e09f9f2a7edf99</Sha>
327327
</Dependency>
328328
</ToolsetDependencies>
329329
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<MicrosoftEntityFrameworkCorePackageVersion>6.0.0-alpha.1.20480.2</MicrosoftEntityFrameworkCorePackageVersion>
138138
<MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-alpha.1.20480.2</MicrosoftEntityFrameworkCoreDesignPackageVersion>
139139
<!-- Packages from dotnet/arcade -->
140-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20474.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
140+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20478.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
141141
</PropertyGroup>
142142
<!--
143143

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.15.2",
33-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20474.4",
34-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20474.4"
33+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20478.3",
34+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20478.3"
3535
}
3636
}

src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<Description>ASP.NET Core API Authorization package powered by Identity Server.</Description>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<PackageTags>aspnetcore;apiauth;identity</PackageTags>
8+
<NoWarn>$(NoWarn.Replace('1591', ''))</NoWarn>
89
<!-- We are a package that depends on the shared framework, this allows us to
910
avoid errors during restore -->
1011
<GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>

src/Identity/ApiAuthorization.IdentityServer/src/Options/ApiScopeCollection.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
1010
{
11+
/// <summary>
12+
/// A collection of <see cref="ApiScope"/>.
13+
/// </summary>
1114
public class ApiScopeCollection : Collection<ApiScope>
1215
{
1316
/// <summary>

src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Description>ASP.NET Core Identity is the membership system for building ASP.NET Core web applications, including membership, login, and user data. ASP.NET Core Identity allows you to add login features to your application and makes it easy to customize data about the logged in user.</Description>
55
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
66
<IsAspNetCoreApp>true</IsAspNetCoreApp>
7+
<NoWarn>$(NoWarn.Replace('1591', ''))</NoWarn>
78
<GenerateDocumentationFile>true</GenerateDocumentationFile>
89
<PackageTags>aspnetcore;identity;membership</PackageTags>
910
<IsPackable>false</IsPackable>

src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Description>ASP.NET Core Identity provider that uses Entity Framework Core.</Description>
55
<TargetFrameworks>netstandard2.1;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<PackageTags>aspnetcore;entityframeworkcore;identity;membership</PackageTags>
8+
<NoWarn>$(NoWarn.Replace('1591', ''))</NoWarn>
89
</PropertyGroup>
910

1011
<ItemGroup>

src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<IsAspNetCoreApp>true</IsAspNetCoreApp>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>aspnetcore;identity;membership</PackageTags>
10+
<NoWarn>$(NoWarn.Replace('1591', ''))</NoWarn>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<IsAspNetCoreApp>true</IsAspNetCoreApp>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>aspnetcore;identity;membership</PackageTags>
10+
<NoWarn>$(NoWarn.Replace('1591', ''))</NoWarn>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<EnableDefaultRazorGenerateItems>false</EnableDefaultRazorGenerateItems>
1313
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
1414
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
15+
<NoWarn>$(NoWarn.Replace('1591', ''))</NoWarn>
1516

1617
<DisableStaticWebAssetsBuildPropsFileGeneration>true</DisableStaticWebAssetsBuildPropsFileGeneration>
1718
<StaticWebAssetsDisableProjectBuildPropsFileGeneration>true</StaticWebAssetsDisableProjectBuildPropsFileGeneration>

0 commit comments

Comments
 (0)