Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Update dependencies from dotnet/runtime dotnet/efcore #31020

Merged
merged 21 commits into from
Mar 25, 2021
Merged

[main] Update dependencies from dotnet/runtime dotnet/efcore #31020

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dd0fbe1
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Mar 18, 2021
f70185f
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Mar 18, 2021
be83239
Do not declare iOS and Android support everywhere
dougbu Mar 19, 2021
4b3fb77
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Mar 19, 2021
db58b6a
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Mar 19, 2021
11e13d1
!fixup! Fix typo in item group name
dougbu Mar 19, 2021
4a8a092
!fixup! Set `$(RemoveDevicePlatformSupport)` in correct project
dougbu Mar 19, 2021
30047af
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Mar 20, 2021
e311973
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Mar 20, 2021
7ada7c7
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Mar 22, 2021
79c576e
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Mar 22, 2021
b6d6a34
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Mar 23, 2021
3b2d41b
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Mar 23, 2021
00ca475
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Mar 23, 2021
f5c9e3f
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Mar 24, 2021
a9edd93
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Mar 24, 2021
035f42c
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Mar 24, 2021
da5e28a
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Mar 24, 2021
f8f8464
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Mar 24, 2021
b4cf25e
suppress
BrennanConroy Mar 24, 2021
10cba72
Fixup
pranavkm Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
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" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good news @jeffhandley this works at the top level 😀

</ItemGroup>

<Target Name="_CopySymbolsToArtifacts">
<Copy SourceFiles="$([System.IO.Path]::ChangeExtension('$(TargetPath)', 'pdb'))"
DestinationFolder="$(SymbolsOutputPath)$(TargetFramework)"
Expand Down
280 changes: 140 additions & 140 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

140 changes: 70 additions & 70 deletions eng/Versions.props
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/Components/WebAssembly/BlazorManifest/src/BlazorManifest.csproj
View file
Open in desktop
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>
1 change: 1 addition & 0 deletions ...mponents/WebAssembly/Server/src/Microsoft.AspNetCore.Components.WebAssembly.Server.csproj
View file
Open in desktop
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
1 change: 1 addition & 0 deletions src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
View file
Open in desktop
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
View file
Open in desktop
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
1 change: 1 addition & 0 deletions src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
View file
Open in desktop
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
1 change: 1 addition & 0 deletions src/Tools/FirstRunCertGenerator/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj
View file
Open in desktop
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
1 change: 1 addition & 0 deletions src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
View file
Open in desktop
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
View file
Open in desktop
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
1 change: 1 addition & 0 deletions src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
View file
Open in desktop
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