[main] Update dependencies from dotnet/aspnetcore (#3492)

[main] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.Extensions.Configuration.Json: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.CodeAnalysis.Razor)
  - Microsoft.Extensions.Logging: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.CodeAnalysis.Razor)
  - System.Diagnostics.DiagnosticSource: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.CodeAnalysis.Razor)
  - System.Resources.Extensions: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.CodeAnalysis.Razor)
  - System.Text.Encodings.Web: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.CodeAnalysis.Razor)
  - Microsoft.Extensions.DependencyModel: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.CodeAnalysis.Razor)
  - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.CodeAnalysis.Razor)
  - Microsoft.NETCore.BrowserDebugHost.Transport: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.CodeAnalysis.Razor)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.CodeAnalysis.Razor)
  - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.CodeAnalysis.Razor)

 - Add RemoveDevicePlatformSupport to rzls.csproj

 - Adding RemoveDevicePlatformSupport definition
This commit is contained in:
dotnet-maestro[bot] 2021-04-21 21:23:29 +00:00 коммит произвёл GitHub
Родитель 0d46aaf1e3
Коммит 5a5d4704f6
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 61 добавлений и 51 удалений

Просмотреть файл

@ -48,6 +48,15 @@
<EditorConfigFiles Condition="'$(IsApiShim)' == 'true'" Include="$(RepositoryEngineeringDir)config\globalconfigs\ApiShim.globalconfig" />
</ItemGroup>
<!--
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' ">
<SupportedPlatform Remove="Android" />
<SupportedPlatform Remove="iOS" />
</ItemGroup>
<Target Name="GetCustomAssemblyAttributes"
BeforeTargets="GetAssemblyAttributes"
Condition=" '$(MSBuildProjectExtension)' == '.csproj' "

Просмотреть файл

@ -1,84 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.CodeAnalysis.Razor" Version="6.0.0-preview.5.21220.16">
<Dependency Name="Microsoft.CodeAnalysis.Razor" Version="6.0.0-preview.5.21221.7">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>7af95b42681e6808a3944168dcf54a7c4adbf0f8</Sha>
<Sha>5ab47f39b160cdd8670ac734426229482821138e</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Razor.Internal.Transport" Version="6.0.0-preview.5.21220.16">
<Dependency Name="Microsoft.AspNetCore.Razor.Internal.Transport" Version="6.0.0-preview.5.21221.7">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>7af95b42681e6808a3944168dcf54a7c4adbf0f8</Sha>
<Sha>5ab47f39b160cdd8670ac734426229482821138e</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="6.0.0-preview.5.21220.16">
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="6.0.0-preview.5.21221.7">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>7af95b42681e6808a3944168dcf54a7c4adbf0f8</Sha>
<Sha>5ab47f39b160cdd8670ac734426229482821138e</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="6.0.0-preview.5.21220.16">
<Dependency Name="Microsoft.AspNetCore.Testing" Version="6.0.0-preview.5.21221.7">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>7af95b42681e6808a3944168dcf54a7c4adbf0f8</Sha>
<Sha>5ab47f39b160cdd8670ac734426229482821138e</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0-preview.5.21220.16">
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0-preview.5.21221.7">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>7af95b42681e6808a3944168dcf54a7c4adbf0f8</Sha>
<Sha>5ab47f39b160cdd8670ac734426229482821138e</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Version="6.0.0-preview.5.21220.16">
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Version="6.0.0-preview.5.21221.7">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>7af95b42681e6808a3944168dcf54a7c4adbf0f8</Sha>
<Sha>5ab47f39b160cdd8670ac734426229482821138e</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X" Version="6.0.0-preview.5.21220.16">
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X" Version="6.0.0-preview.5.21221.7">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>7af95b42681e6808a3944168dcf54a7c4adbf0f8</Sha>
<Sha>5ab47f39b160cdd8670ac734426229482821138e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.5.21219.10" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.5.21221.1" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a668de0a1f619947c6fe164d9408d2fdbda86dc8</Sha>
<Sha>65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.5.21219.10" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.5.21221.1" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a668de0a1f619947c6fe164d9408d2fdbda86dc8</Sha>
<Sha>65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Razor" Version="6.0.0-alpha.1.21072.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>20b6779cf3af2fed6a8fe64a0865cfab50b776bb</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-preview.5.21219.10" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-preview.5.21221.1" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a668de0a1f619947c6fe164d9408d2fdbda86dc8</Sha>
<Sha>65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.5.21219.10" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.5.21221.1" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a668de0a1f619947c6fe164d9408d2fdbda86dc8</Sha>
<Sha>65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="6.0.0-preview.5.21219.10" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Dependency Name="System.Text.Encodings.Web" Version="6.0.0-preview.5.21221.1" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a668de0a1f619947c6fe164d9408d2fdbda86dc8</Sha>
<Sha>65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.5.21219.10" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.5.21221.1" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a668de0a1f619947c6fe164d9408d2fdbda86dc8</Sha>
<Sha>65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.5.21219.10" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.5.21221.1" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a668de0a1f619947c6fe164d9408d2fdbda86dc8</Sha>
<Sha>65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.5.21219.10" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.5.21221.1" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a668de0a1f619947c6fe164d9408d2fdbda86dc8</Sha>
<Sha>65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed</Sha>
</Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.5.21219.10" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.5.21221.1" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a668de0a1f619947c6fe164d9408d2fdbda86dc8</Sha>
<Sha>65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.5.21219.10" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.5.21221.1" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a668de0a1f619947c6fe164d9408d2fdbda86dc8</Sha>
<Sha>65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21216.2">
<Uri>https://github.com/dotnet/arcade</Uri>

Просмотреть файл

@ -48,24 +48,24 @@
-->
<PropertyGroup Label="Automated">
<MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-preview.5.21220.16</MicrosoftCodeAnalysisRazorPackageVersion>
<MicrosoftAspNetCoreRazorInternalTransportPackageVersion>6.0.0-preview.5.21220.16</MicrosoftAspNetCoreRazorInternalTransportPackageVersion>
<MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-preview.5.21220.16</MicrosoftAspNetCoreRazorLanguagePackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>6.0.0-preview.5.21220.16</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-preview.5.21220.16</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>6.0.0-preview.5.21220.16</MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>6.0.0-preview.5.21220.16</MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>6.0.0-preview.5.21219.10</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.5.21219.10</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-preview.5.21219.10</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.0-preview.5.21219.10</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.5.21219.10</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.5.21219.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-preview.5.21219.10</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-preview.5.21221.7</MicrosoftCodeAnalysisRazorPackageVersion>
<MicrosoftAspNetCoreRazorInternalTransportPackageVersion>6.0.0-preview.5.21221.7</MicrosoftAspNetCoreRazorInternalTransportPackageVersion>
<MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-preview.5.21221.7</MicrosoftAspNetCoreRazorLanguagePackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>6.0.0-preview.5.21221.7</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-preview.5.21221.7</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>6.0.0-preview.5.21221.7</MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>6.0.0-preview.5.21221.7</MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>6.0.0-preview.5.21221.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.5.21221.1</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-preview.5.21221.1</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.0-preview.5.21221.1</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.5.21221.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.5.21221.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-preview.5.21221.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>6.0.0-alpha.1.21072.5</MicrosoftNETSdkRazorPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0-preview.5.21219.10</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.5.21219.10</SystemResourcesExtensionsPackageVersion>
<SystemTextEncodingsWebPackageVersion>6.0.0-preview.5.21219.10</SystemTextEncodingsWebPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0-preview.5.21221.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.5.21221.1</SystemResourcesExtensionsPackageVersion>
<SystemTextEncodingsWebPackageVersion>6.0.0-preview.5.21221.1</SystemTextEncodingsWebPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Dependency version settings">
<!--

Просмотреть файл

@ -7,6 +7,7 @@
<EnableApiCheck>false</EnableApiCheck>
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;osx-x64;</RuntimeIdentifiers>
<IsShippingPackage>false</IsShippingPackage>
<RemoveDevicePlatformSupport>true</RemoveDevicePlatformSupport>
</PropertyGroup>
<ItemGroup>