Skip to content

Commit f2c3abc

Browse files
pranavkmpranavkm
authored
Update SDK to 6.0.100-rc.1.21410.3 (#35229)
1 parent bc2e48c commit f2c3abc

File tree

33 files changed

+93
-27
lines changed

33 files changed

+93
-27
lines changed

‎eng/targets/CSharp.Common.targets‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@
1616
<!-- Public members should not use oblivious types. Not done with all nullable annotations. -->
1717
<NoWarn>$(NoWarn);RS0041</NoWarn>
1818

19-
<Nullable Condition=" '$(Nullable)' == '' AND (
20-
'$(IsImplementationProject)' == 'true' OR
19+
<_IsSrcProject Condition="'$(IsImplementationProject)' == 'true' OR
2120
'$(IsAnalyzersProject)' == true OR
22-
'$(IsSpecificationTestProject)' == 'true') ">enable</Nullable>
21+
'$(IsSpecificationTestProject)' == 'true'">true</_IsSrcProject>
22+
23+
<Nullable Condition=" '$(Nullable)' == '' AND '$(_IsSrcProject)' == 'true'">enable</Nullable>
2324

2425
<!-- Strip out non-public nullable annotations for src projects. This should help with size reduction -->
25-
<Features Condition="
26-
'$(IsImplementationProject)' == 'true' OR
27-
'$(IsAnalyzersProject)' == true OR
28-
'$(IsSpecificationTestProject)' == 'true'">$(Features);nullablePublicOnly</Features>
26+
<Features Condition="'$(_IsSrcProject)' == 'true'">$(Features);nullablePublicOnly</Features>
2927

3028
<!-- Turn off platform compatibility analyzer warnings in test, test assets, and samples. -->
3129
<NoWarn Condition=" '$(IsTestProject)' == 'true' OR
@@ -41,6 +39,19 @@
4139
<EnforceCodeStyleInBuild Condition="'$(EnforceCodeStyleInBuild)' == ''">true</EnforceCodeStyleInBuild>
4240
</PropertyGroup>
4341

42+
<!-- Enable implicit usings for projects that target the default TFM -->
43+
<PropertyGroup Condition="'$(ImplicitUsings)' == '' AND '$(TargetFrameworks)' == '' AND '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
44+
<ImplicitUsings>enable</ImplicitUsings>
45+
</PropertyGroup>
46+
47+
<ItemGroup Condition="'$(ImplicitUsings)' == 'enable'">
48+
<!-- We should make it obvious when Linq is being used in shipping code -->
49+
<Using Remove="System.Linq" Condition="'$(_IsSrcProject)' == 'true'" />
50+
<!-- System.Net.Http types will frequently conflict with ASP.NET Core types-->
51+
<Using Remove="System.Net.Http" />
52+
<Using Include="Xunit" Condition="'$(IsTestProject)' == 'true' OR '$(IsUnitTestProject)' == 'true'" />
53+
</ItemGroup>
54+
4455
<ItemGroup Condition=" '$(DotNetBuildFromSource)' != 'true' AND $(AddPublicApiAnalyzers) ">
4556
<Reference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" ExcludeAssets="Compile" PrivateAssets="All" />
4657
</ItemGroup>

‎eng/tools/Directory.Build.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
<IsPackable>false</IsPackable>
66
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
77
<Nullable>disable</Nullable>
8-
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
98
</PropertyGroup>
109
</Project>

‎eng/tools/RepoTasks/CreateFrameworkListFile.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace RepoTasks
1414
{
15-
public class CreateFrameworkListFile : Task
15+
public class CreateFrameworkListFile : Microsoft.Build.Utilities.Task
1616
{
1717
/// <summary>
1818
/// Files to extract basic information from and include in the list.

‎eng/tools/RepoTasks/GenerateGuid.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace RepoTasks
1010
{
11-
public class GenerateGuid : Task
11+
public class GenerateGuid : Microsoft.Build.Utilities.Task
1212
{
1313
[Output]
1414
public string Guid { get; private set; }

‎eng/tools/RepoTasks/GenerateSharedFrameworkDepsFile.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace RepoTasks
1616
{
17-
public class GenerateSharedFrameworkDepsFile : Task
17+
public class GenerateSharedFrameworkDepsFile : Microsoft.Build.Utilities.Task
1818
{
1919
[Required]
2020
public string DepsFilePath { get; set; }

‎eng/tools/RepoTasks/GetMsiProperty.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace RepoTasks
1111
{
12-
public class GetMsiProperty : Task
12+
public class GetMsiProperty : Microsoft.Build.Utilities.Task
1313
{
1414
[Required]
1515
public string InstallPackage { get; set; }

‎eng/tools/RepoTasks/RemoveSharedFrameworkDependencies.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
namespace RepoTasks
1818
{
1919
// This is temporary until we can use FrameworkReference to build our own packages
20-
public class RemoveSharedFrameworkDependencies : Task
20+
public class RemoveSharedFrameworkDependencies : Microsoft.Build.Utilities.Task
2121
{
2222
[Required]
2323
public ITaskItem[] Files { get; set; }

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-rc.1.21401.2"
3+
"version": "6.0.100-rc.1.21413.1"
44
},
55
"tools": {
6-
"dotnet": "6.0.100-rc.1.21401.2",
6+
"dotnet": "6.0.100-rc.1.21413.1",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.27",

‎src/Components/Authorization/src/Microsoft.AspNetCore.Components.Authorization.WarningSuppressions.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<linker>
3+
<assembly fullname="Microsoft.AspNetCore.Components.Authorization, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
4+
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
5+
<argument>ILLink</argument>
6+
<argument>IL2110</argument>
7+
<property name="Scope">member</property>
8+
<property name="Target">M:Microsoft.AspNetCore.Components.Authorization.AuthorizeRouteView.RenderContentInDefaultLayout(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder,Microsoft.AspNetCore.Components.RenderFragment)</property>
9+
</attribute>
10+
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
11+
<argument>ILLink</argument>
12+
<argument>IL2111</argument>
13+
<property name="Scope">member</property>
14+
<property name="Target">M:Microsoft.AspNetCore.Components.Authorization.AuthorizeRouteView.RenderContentInDefaultLayout(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder,Microsoft.AspNetCore.Components.RenderFragment)</property>
15+
</attribute>
16+
</assembly>
17+
</linker>

‎src/Components/Components/src/Microsoft.AspNetCore.Components.WarningSuppressions.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,17 @@
7373
<property name="Scope">member</property>
7474
<property name="Target">M:Microsoft.AspNetCore.Components.Reflection.MemberAssignment.&lt;GetPropertiesIncludingInherited&gt;d__0.MoveNext</property>
7575
</attribute>
76+
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
77+
<argument>ILLink</argument>
78+
<argument>IL2110</argument>
79+
<property name="Scope">member</property>
80+
<property name="Target">M:Microsoft.AspNetCore.Components.RouteView.Render(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder)</property>
81+
</attribute>
82+
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
83+
<argument>ILLink</argument>
84+
<argument>IL2111</argument>
85+
<property name="Scope">member</property>
86+
<property name="Target">M:Microsoft.AspNetCore.Components.RouteView.Render(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder)</property>
87+
</attribute>
7688
</assembly>
7789
</linker>

0 commit comments

Comments
 (0)