Skip to content

Commit 06c618f

Browse files
[release/6.0-preview3] Update dependencies from dotnet/efcore dotnet/runtime (#31255)
[release/6.0-preview3] Update dependencies from dotnet/efcore dotnet/runtime - Port changes from main - Merge branch 'release/6.0-preview3' into darc-release/6.0-preview3-ce4fb228-ea32-4f60-95e1-0e60d42e3fc3
1 parent b14188b commit 06c618f

File tree

14 files changed

+251
-220
lines changed

14 files changed

+251
-220
lines changed

Directory.Build.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,15 @@
175175
<BuildDependsOn>$(BuildDependsOn);_CopySymbolsToArtifacts</BuildDependsOn>
176176
</PropertyGroup>
177177

178+
<!--
179+
Where necessary, do not pretend we support iOS or Android. This file is imported after project
180+
has a chance to set $(RemoveDevicePlatformSupport) and long after @(SupportedPlatforms) is initialized.
181+
-->
182+
<ItemGroup Condition=" '$(RemoveDevicePlatformSupport)' == 'true' ">
183+
<SupportedPlatform Remove="Android" />
184+
<SupportedPlatform Remove="iOS" />
185+
</ItemGroup>
186+
178187
<Target Name="_CopySymbolsToArtifacts">
179188
<Copy SourceFiles="$([System.IO.Path]::ChangeExtension('$(TargetPath)', 'pdb'))"
180189
DestinationFolder="$(SymbolsOutputPath)$(TargetFramework)"

eng/Version.Details.xml

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 73 additions & 73 deletions
Large diffs are not rendered by default.

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<linker>
33
<assembly fullname="Microsoft.AspNetCore.Components.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
4+
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
5+
<argument>ILLink</argument>
6+
<argument>IL2026</argument>
7+
<property name="Scope">member</property>
8+
<property name="Target">M:Microsoft.AspNetCore.Components.Forms.EditContextDataAnnotationsExtensions.ValidateField(Microsoft.AspNetCore.Components.Forms.EditContext,Microsoft.AspNetCore.Components.Forms.ValidationMessageStore,Microsoft.AspNetCore.Components.Forms.FieldIdentifier@)</property>
9+
</attribute>
10+
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
11+
<argument>ILLink</argument>
12+
<argument>IL2026</argument>
13+
<property name="Scope">member</property>
14+
<property name="Target">M:Microsoft.AspNetCore.Components.Forms.EditContextDataAnnotationsExtensions.ValidateModel(Microsoft.AspNetCore.Components.Forms.EditContext,Microsoft.AspNetCore.Components.Forms.ValidationMessageStore)</property>
15+
</attribute>
416
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
517
<argument>ILLink</argument>
618
<argument>IL2080</argument>

src/Components/WebAssembly/BlazorManifest/acquire/dotnet-install-blazoraot.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<AssemblyName>dotnet-install-blazoraot</AssemblyName>
1010
<PackageId>dotnet-install-blazoraot</PackageId>
1111
<GenerateDocumentationFile>false</GenerateDocumentationFile>
12+
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
1213
<!-- Set this to false because there's nothing to reference here. -->
1314
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
1415
</PropertyGroup>

src/Components/WebAssembly/Server/src/Microsoft.AspNetCore.Components.WebAssembly.Server.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<Description>Runtime server features for ASP.NET Core Blazor applications.</Description>
66
<IsShippingPackage>true</IsShippingPackage>
7+
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
78

89
<!-- We're deliberately bundling assemblies as content files. Suppress the warning. -->
910
<NoWarn>$(NoWarn);NU5100</NoWarn>

src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
55
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
66
<Nullable>enable</Nullable>
7+
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
78
</PropertyGroup>
89

910
<ItemGroup>

src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
44
<TestGroupName>ProjectTemplates.E2ETests</TestGroupName>
55
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
6+
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
67

78
<RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
89
<SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
@@ -63,7 +64,7 @@
6364
<ItemGroup>
6465
<_PublishFiles Include="$(OutputPath).playwright\**\*.*" />
6566
</ItemGroup>
66-
<Copy SourceFiles="@(_PublishFiles)" DestinationFolder="$(PublishDir)\.playwright\%(_PublishFiles.RecursiveDir)\" />
67+
<Copy SourceFiles="@(_PublishFiles)" DestinationFolder="$(PublishDir)\.playwright\%(_PublishFiles.RecursiveDir)\" />
6768
</Target>
6869

6970

src/ProjectTemplates/test/ProjectTemplates.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
88
<TestGroupName>ProjectTemplates.E2ETests</TestGroupName>
99
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
10+
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
1011

1112
<RunTemplateTests Condition="'$(RunTemplateTests)' == ''" >true</RunTemplateTests>
1213
<SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>

src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<IsPackable>false</IsPackable>
1212
<DefineConstants>$(DefineConstants);KESTREL</DefineConstants>
1313
<Nullable>enable</Nullable>
14+
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
1415
</PropertyGroup>
1516

1617
<ItemGroup>

src/Tools/FirstRunCertGenerator/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<Description>Package for the CLI first run experience.</Description>
66
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
77
<PackageTags>aspnet;cli</PackageTags>
8+
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
89

910
<!-- This package contains API for the .NET CLI to generate the aspnet HTTPs dev cert during CLI first-run initialization. -->
1011

src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<AssemblyName>dotnet-openapi</AssemblyName>
88
<PackageId>Microsoft.dotnet-openapi</PackageId>
99
<PackAsTool>true</PackAsTool>
10+
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<RootNamespace>Microsoft.AspNetCore.DeveloperCertificates.Tools</RootNamespace>
88
<PackageTags>dotnet;developercertificates</PackageTags>
99
<PackAsTool>true</PackAsTool>
10+
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
1011
<!-- This package is for internal use only. It contains a CLI which is bundled in the .NET Core SDK. -->
1112
<IsShippingPackage>false</IsShippingPackage>
1213
<ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>

src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<RootNamespace>Microsoft.Extensions.SecretManager.Tools</RootNamespace>
99
<PackageTags>configuration;secrets;usersecrets</PackageTags>
1010
<PackAsTool>true</PackAsTool>
11+
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
1112
<!-- This package is for internal use only. It contains a CLI which is bundled in the .NET Core SDK. -->
1213
<IsShippingPackage>false</IsShippingPackage>
1314
<ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>

0 commit comments

Comments
 (0)