Skip to content

Commit

Permalink
Do not declare iOS and Android support everywhere
Browse files Browse the repository at this point in the history
- runtime update includes new annotations making non-support obvious
- see dotnet/runtime#49354 (w/ a similar Android PR coming soon)
  • Loading branch information
dougbu authored and BrennanConroy committed Mar 24, 2021
1 parent b212160 commit 8a4011f
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 2 deletions.
9 changes: 9 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,15 @@
<BuildDependsOn>$(BuildDependsOn);_CopySymbolsToArtifacts</BuildDependsOn>
</PropertyGroup>

<!--
Where necessary, do not pretend we support iOS or Android. This file is imported after project
has a chance to set $(RemoveDevicePlatformSupport) and long after @(SupportedPlatforms) is initialized.
-->
<ItemGroup Condition=" '$(RemoveDevicePlatformSupport)' == 'true' ">
<SupportedPlatforms Remove="Android" />
<SupportedPlatforms Remove="iOS" />
</ItemGroup>

<Target Name="_CopySymbolsToArtifacts">
<Copy SourceFiles="$([System.IO.Path]::ChangeExtension('$(TargetPath)', 'pdb'))"
DestinationFolder="$(SymbolsOutputPath)$(TargetFramework)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<Description>SDK manifest for Blazor WebAssembly AOT.</Description>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<IncludeBuildOutput>false</IncludeBuildOutput>
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
<!-- Set this to false because there's nothing to reference here. -->
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
</PropertyGroup>
Expand Down Expand Up @@ -34,4 +35,4 @@
</ItemGroup>
</Target>

</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<Description>Runtime server features for ASP.NET Core Blazor applications.</Description>
<IsShippingPackage>true</IsShippingPackage>
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>

<!-- We're deliberately bundling assemblies as content files. Suppress the warning. -->
<NoWarn>$(NoWarn);NU5100</NoWarn>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<Nullable>enable</Nullable>
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<TestGroupName>ProjectTemplates.E2ETests</TestGroupName>
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>

<RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
<SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
Expand Down Expand Up @@ -63,7 +64,7 @@
<ItemGroup>
<_PublishFiles Include="$(OutputPath).playwright\**\*.*" />
</ItemGroup>
<Copy SourceFiles="@(_PublishFiles)" DestinationFolder="$(PublishDir)\.playwright\%(_PublishFiles.RecursiveDir)\" />
<Copy SourceFiles="@(_PublishFiles)" DestinationFolder="$(PublishDir)\.playwright\%(_PublishFiles.RecursiveDir)\" />
</Target>


Expand Down
1 change: 1 addition & 0 deletions src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<TestGroupName>ProjectTemplates.E2ETests</TestGroupName>
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>

<RunTemplateTests Condition="'$(RunTemplateTests)' == ''" >true</RunTemplateTests>
<SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<IsPackable>false</IsPackable>
<DefineConstants>$(DefineConstants);KESTREL</DefineConstants>
<Nullable>enable</Nullable>
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<Description>Package for the CLI first run experience.</Description>
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
<PackageTags>aspnet;cli</PackageTags>
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<AssemblyName>dotnet-openapi</AssemblyName>
<PackageId>Microsoft.dotnet-openapi</PackageId>
<PackAsTool>true</PackAsTool>
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<RootNamespace>Microsoft.AspNetCore.DeveloperCertificates.Tools</RootNamespace>
<PackageTags>dotnet;developercertificates</PackageTags>
<PackAsTool>true</PackAsTool>
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
<!-- This package is for internal use only. It contains a CLI which is bundled in the .NET Core SDK. -->
<IsShippingPackage>false</IsShippingPackage>
<ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<RootNamespace>Microsoft.Extensions.SecretManager.Tools</RootNamespace>
<PackageTags>configuration;secrets;usersecrets</PackageTags>
<PackAsTool>true</PackAsTool>
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
<!-- This package is for internal use only. It contains a CLI which is bundled in the .NET Core SDK. -->
<IsShippingPackage>false</IsShippingPackage>
<ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
Expand Down

0 comments on commit 8a4011f

Please sign in to comment.