Skip to content
代码片段 群组 项目
未验证 提交 f2c3abcb 编辑于 作者: Pranav K's avatar Pranav K 提交者: GitHub
浏览文件

Update SDK to 6.0.100-rc.1.21410.3 (#35229)

上级 bc2e48c3
No related branches found
No related tags found
无相关合并请求
显示
77 个添加23 个删除
...@@ -16,16 +16,14 @@ ...@@ -16,16 +16,14 @@
<!-- Public members should not use oblivious types. Not done with all nullable annotations. --> <!-- Public members should not use oblivious types. Not done with all nullable annotations. -->
<NoWarn>$(NoWarn);RS0041</NoWarn> <NoWarn>$(NoWarn);RS0041</NoWarn>
<Nullable Condition=" '$(Nullable)' == '' AND ( <_IsSrcProject Condition="'$(IsImplementationProject)' == 'true' OR
'$(IsImplementationProject)' == 'true' OR
'$(IsAnalyzersProject)' == true OR '$(IsAnalyzersProject)' == true OR
'$(IsSpecificationTestProject)' == 'true') ">enable</Nullable> '$(IsSpecificationTestProject)' == 'true'">true</_IsSrcProject>
<Nullable Condition=" '$(Nullable)' == '' AND '$(_IsSrcProject)' == 'true'">enable</Nullable>
<!-- Strip out non-public nullable annotations for src projects. This should help with size reduction --> <!-- Strip out non-public nullable annotations for src projects. This should help with size reduction -->
<Features Condition=" <Features Condition="'$(_IsSrcProject)' == 'true'">$(Features);nullablePublicOnly</Features>
'$(IsImplementationProject)' == 'true' OR
'$(IsAnalyzersProject)' == true OR
'$(IsSpecificationTestProject)' == 'true'">$(Features);nullablePublicOnly</Features>
<!-- Turn off platform compatibility analyzer warnings in test, test assets, and samples. --> <!-- Turn off platform compatibility analyzer warnings in test, test assets, and samples. -->
<NoWarn Condition=" '$(IsTestProject)' == 'true' OR <NoWarn Condition=" '$(IsTestProject)' == 'true' OR
...@@ -41,6 +39,19 @@ ...@@ -41,6 +39,19 @@
<EnforceCodeStyleInBuild Condition="'$(EnforceCodeStyleInBuild)' == ''">true</EnforceCodeStyleInBuild> <EnforceCodeStyleInBuild Condition="'$(EnforceCodeStyleInBuild)' == ''">true</EnforceCodeStyleInBuild>
</PropertyGroup> </PropertyGroup>
<!-- Enable implicit usings for projects that target the default TFM -->
<PropertyGroup Condition="'$(ImplicitUsings)' == '' AND '$(TargetFrameworks)' == '' AND '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup Condition="'$(ImplicitUsings)' == 'enable'">
<!-- We should make it obvious when Linq is being used in shipping code -->
<Using Remove="System.Linq" Condition="'$(_IsSrcProject)' == 'true'" />
<!-- System.Net.Http types will frequently conflict with ASP.NET Core types-->
<Using Remove="System.Net.Http" />
<Using Include="Xunit" Condition="'$(IsTestProject)' == 'true' OR '$(IsUnitTestProject)' == 'true'" />
</ItemGroup>
<ItemGroup Condition=" '$(DotNetBuildFromSource)' != 'true' AND $(AddPublicApiAnalyzers) "> <ItemGroup Condition=" '$(DotNetBuildFromSource)' != 'true' AND $(AddPublicApiAnalyzers) ">
<Reference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" ExcludeAssets="Compile" PrivateAssets="All" /> <Reference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" ExcludeAssets="Compile" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
......
...@@ -5,6 +5,5 @@ ...@@ -5,6 +5,5 @@
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions> <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
<Nullable>disable</Nullable> <Nullable>disable</Nullable>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
...@@ -12,7 +12,7 @@ using Microsoft.Build.Utilities; ...@@ -12,7 +12,7 @@ using Microsoft.Build.Utilities;
namespace RepoTasks namespace RepoTasks
{ {
public class CreateFrameworkListFile : Task public class CreateFrameworkListFile : Microsoft.Build.Utilities.Task
{ {
/// <summary> /// <summary>
/// Files to extract basic information from and include in the list. /// Files to extract basic information from and include in the list.
......
...@@ -8,7 +8,7 @@ using Microsoft.Build.Utilities; ...@@ -8,7 +8,7 @@ using Microsoft.Build.Utilities;
namespace RepoTasks namespace RepoTasks
{ {
public class GenerateGuid : Task public class GenerateGuid : Microsoft.Build.Utilities.Task
{ {
[Output] [Output]
public string Guid { get; private set; } public string Guid { get; private set; }
......
...@@ -14,7 +14,7 @@ using Microsoft.Extensions.DependencyModel; ...@@ -14,7 +14,7 @@ using Microsoft.Extensions.DependencyModel;
namespace RepoTasks namespace RepoTasks
{ {
public class GenerateSharedFrameworkDepsFile : Task public class GenerateSharedFrameworkDepsFile : Microsoft.Build.Utilities.Task
{ {
[Required] [Required]
public string DepsFilePath { get; set; } public string DepsFilePath { get; set; }
......
...@@ -9,7 +9,7 @@ using Microsoft.Deployment.WindowsInstaller.Package; ...@@ -9,7 +9,7 @@ using Microsoft.Deployment.WindowsInstaller.Package;
namespace RepoTasks namespace RepoTasks
{ {
public class GetMsiProperty : Task public class GetMsiProperty : Microsoft.Build.Utilities.Task
{ {
[Required] [Required]
public string InstallPackage { get; set; } public string InstallPackage { get; set; }
......
...@@ -17,7 +17,7 @@ using NuGet.Packaging.Core; ...@@ -17,7 +17,7 @@ using NuGet.Packaging.Core;
namespace RepoTasks namespace RepoTasks
{ {
// This is temporary until we can use FrameworkReference to build our own packages // This is temporary until we can use FrameworkReference to build our own packages
public class RemoveSharedFrameworkDependencies : Task public class RemoveSharedFrameworkDependencies : Microsoft.Build.Utilities.Task
{ {
[Required] [Required]
public ITaskItem[] Files { get; set; } public ITaskItem[] Files { get; set; }
......
{ {
"sdk": { "sdk": {
"version": "6.0.100-rc.1.21401.2" "version": "6.0.100-rc.1.21413.1"
}, },
"tools": { "tools": {
"dotnet": "6.0.100-rc.1.21401.2", "dotnet": "6.0.100-rc.1.21413.1",
"runtimes": { "runtimes": {
"dotnet/x64": [ "dotnet/x64": [
"2.1.27", "2.1.27",
......
<?xml version="1.0" encoding="utf-8"?>
<linker>
<assembly fullname="Microsoft.AspNetCore.Components.Authorization, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2110</argument>
<property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.Components.Authorization.AuthorizeRouteView.RenderContentInDefaultLayout(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder,Microsoft.AspNetCore.Components.RenderFragment)</property>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2111</argument>
<property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.Components.Authorization.AuthorizeRouteView.RenderContentInDefaultLayout(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder,Microsoft.AspNetCore.Components.RenderFragment)</property>
</attribute>
</assembly>
</linker>
\ No newline at end of file
...@@ -73,5 +73,17 @@ ...@@ -73,5 +73,17 @@
<property name="Scope">member</property> <property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.Components.Reflection.MemberAssignment.&lt;GetPropertiesIncludingInherited&gt;d__0.MoveNext</property> <property name="Target">M:Microsoft.AspNetCore.Components.Reflection.MemberAssignment.&lt;GetPropertiesIncludingInherited&gt;d__0.MoveNext</property>
</attribute> </attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2110</argument>
<property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.Components.RouteView.Render(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder)</property>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2111</argument>
<property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.Components.RouteView.Render(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder)</property>
</attribute>
</assembly> </assembly>
</linker> </linker>
\ No newline at end of file
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
using System.Collections; using System.Collections;
using System.Globalization; using System.Globalization;
using System.Linq;
using System.Text; using System.Text;
using Microsoft.AspNetCore.Components.Routing; using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.Internal;
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license. // The .NET Foundation licenses this file to you under the MIT license.
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Linq;
using System.Text.Json; using System.Text.Json;
using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.RenderTree;
using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.Web;
......
...@@ -226,7 +226,7 @@ namespace Microsoft.AspNetCore.Components.Server ...@@ -226,7 +226,7 @@ namespace Microsoft.AspNetCore.Components.Server
LoggerMessage.Define<string>( LoggerMessage.Define<string>(
LogLevel.Debug, LogLevel.Debug,
new EventId(4, "InvalidMarkerType"), new EventId(4, "InvalidMarkerType"),
"Invalid component marker type '{}'."); "Invalid component marker type '{MarkerType}'.");
private static readonly Action<ILogger, Exception> _missingMarkerDescriptor = private static readonly Action<ILogger, Exception> _missingMarkerDescriptor =
LoggerMessage.Define( LoggerMessage.Define(
......
文件被 .gitattributes 条目压制或文件的编码不受支持。
...@@ -5,7 +5,13 @@ ...@@ -5,7 +5,13 @@
<argument>ILLink</argument> <argument>ILLink</argument>
<argument>IL2026</argument> <argument>IL2026</argument>
<property name="Scope">member</property> <property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.Components.Web.Infrastructure.JSComponentInterop.SetRootComponentParameters(System.Int32,System.Int32,System.Byte[])</property> <property name="Target">M:Microsoft.AspNetCore.Components.Web.Infrastructure.JSComponentInterop.SetRootComponentParameters(System.Int32,System.Int32,System.Text.Json.JsonElement,System.Text.Json.JsonSerializerOptions)</property>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2026</argument>
<property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.Components.Web.WebEventData.ParseEventArgsJson(Microsoft.AspNetCore.Components.RenderTree.Renderer,System.Text.Json.JsonSerializerOptions,System.UInt64,System.String,System.Text.Json.JsonElement)</property>
</attribute> </attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute"> <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument> <argument>ILLink</argument>
...@@ -13,6 +19,12 @@ ...@@ -13,6 +19,12 @@
<property name="Scope">member</property> <property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.Components.Web.Infrastructure.JSComponentInterop.AddRootComponent(System.String,System.String)</property> <property name="Target">M:Microsoft.AspNetCore.Components.Web.Infrastructure.JSComponentInterop.AddRootComponent(System.String,System.String)</property>
</attribute> </attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2067</argument>
<property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.Components.Web.Infrastructure.JSComponentInterop.CreateEventCallbackWithSingleParameter(System.Type,Microsoft.JSInterop.IJSObjectReference)</property>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute"> <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument> <argument>ILLink</argument>
<argument>IL2067</argument> <argument>IL2067</argument>
......
...@@ -17,25 +17,25 @@ ...@@ -17,25 +17,25 @@
<argument>ILLink</argument> <argument>ILLink</argument>
<argument>IL2026</argument> <argument>IL2026</argument>
<property name="Scope">member</property> <property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.Components.Web.WebEventData.ParseEventArgsJson(Microsoft.AspNetCore.Components.RenderTree.Renderer,System.Text.Json.JsonSerializerOptions,System.UInt64,System.String,System.Text.Json.JsonElement)</property> <property name="Target">M:Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder.InitializeRegisteredRootComponents(Microsoft.JSInterop.IJSUnmarshalledRuntime)</property>
</attribute> </attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute"> <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument> <argument>ILLink</argument>
<argument>IL2026</argument> <argument>IL2026</argument>
<property name="Scope">member</property> <property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder.InitializeRegisteredRootComponents(Microsoft.JSInterop.IJSUnmarshalledRuntime)</property> <property name="Target">M:Microsoft.AspNetCore.Components.WebAssemblyComponentParameterDeserializer.DeserializeParameters(System.Collections.Generic.IList{Microsoft.AspNetCore.Components.ComponentParameter},System.Collections.Generic.IList{System.Object})</property>
</attribute> </attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute"> <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument> <argument>ILLink</argument>
<argument>IL2026</argument> <argument>IL2026</argument>
<property name="Scope">member</property> <property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.Components.WebAssemblyComponentParameterDeserializer.DeserializeParameters(System.Collections.Generic.IList{Microsoft.AspNetCore.Components.ComponentParameter},System.Collections.Generic.IList{System.Object})</property> <property name="Target">M:Microsoft.Extensions.HotReload.HotReloadAgent.&lt;TopologicalSort&gt;g__Visit|10_0(System.Reflection.Assembly[],System.Reflection.Assembly,System.Collections.Generic.List{System.Reflection.Assembly},System.Collections.Generic.HashSet{System.String})</property>
</attribute> </attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute"> <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument> <argument>ILLink</argument>
<argument>IL2026</argument> <argument>IL2026</argument>
<property name="Scope">member</property> <property name="Scope">member</property>
<property name="Target">M:Microsoft.Extensions.HotReload.HotReloadAgent.&lt;TopologicalSort&gt;g__Visit|10_0(System.Reflection.Assembly[],System.Reflection.Assembly,System.Collections.Generic.List{System.Reflection.Assembly},System.Collections.Generic.HashSet{System.String})</property> <property name="Target">M:Microsoft.Extensions.HotReload.HotReloadAgent.GetMetadataUpdateTypes(System.Collections.Generic.IReadOnlyList{Microsoft.Extensions.HotReload.UpdateDelta})</property>
</attribute> </attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute"> <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument> <argument>ILLink</argument>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license. // The .NET Foundation licenses this file to you under the MIT license.
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing;
using Microsoft.JSInterop; using Microsoft.JSInterop;
using Moq; using Moq;
......
// Licensed to the .NET Foundation under one or more agreements. // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license. // The .NET Foundation licenses this file to you under the MIT license.
using System.Collections.Generic;
using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.Web;
namespace Microsoft.AspNetCore.Components.WebView.Photino namespace Microsoft.AspNetCore.Components.WebView.Photino
......
...@@ -71,7 +71,7 @@ namespace Wasm.Performance.Driver ...@@ -71,7 +71,7 @@ namespace Wasm.Performance.Driver
options.AddArgument("--enable-precise-memory-info"); options.AddArgument("--enable-precise-memory-info");
} }
options.SetLoggingPreference(LogType.Browser, LogLevel.All); options.SetLoggingPreference(LogType.Browser, OpenQA.Selenium.LogLevel.All);
var attempt = 0; var attempt = 0;
const int MaxAttempts = 3; const int MaxAttempts = 3;
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
<IsTestAssetProject>true</IsTestAssetProject> <IsTestAssetProject>true</IsTestAssetProject>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier> <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册