[main] Update dependencies from dotnet/sdk (#10023)

[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.3.21172.2 to 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.3.21172.2 to 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.3.21161.1 to 6.0.100-preview.4.21176.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.3.21172.2 to 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.3.21172.2 to 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.3.21171.2 to 6.0.0-preview.4.21174.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21172.2 to 6.0.100-preview.2.21174.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 3.10.0-2.21173.26 to 3.10.0-2.21175.26 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.10.0-preview-21173-01 to 16.10.0-preview-21175-01 (parent: Microsoft.NET.Sdk)

 - Remove Android, iOS, and macCatalyst from CA1416 analyzer warnings

 - Merge remote-tracking branch 'origin/main' into darc-main-3ea62347-a0cb-4e6d-8270-37add6b236fa

 - Missed property use
This commit is contained in:
dotnet-maestro[bot] 2021-03-26 23:45:47 +00:00 committed by GitHub
parent 81b2a2dab0
commit 7876ef965a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 72 additions and 64 deletions

View file

@ -2,6 +2,14 @@
<Project>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<!-- Explicitly remove Android, iOS, and macCatalyst from CA1416 analyzer warnings -->
<!-- https://github.com/dotnet/sdk/pull/16489 -->
<ItemGroup>
<SupportedPlatform Remove="Android" />
<SupportedPlatform Remove="iOS" />
<SupportedPlatform Remove="macCatalyst" />
</ItemGroup>
<!-- Update KnownFrameworkReferences to target the right version of the runtime -->
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))

View file

@ -1,37 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.0-preview.3.21172.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.0-preview.4.21175.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>18b9c3217d7b1320e48acfc810142ab8d6872485</Sha>
<Sha>e3234e9bc1014708ea6d4e23efdaa6d62b857e03</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21172.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.0-preview.4.21175.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>18b9c3217d7b1320e48acfc810142ab8d6872485</Sha>
<Sha>e3234e9bc1014708ea6d4e23efdaa6d62b857e03</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.3.21172.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.4.21175.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>18b9c3217d7b1320e48acfc810142ab8d6872485</Sha>
<Sha>e3234e9bc1014708ea6d4e23efdaa6d62b857e03</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21167.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.4.21176.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>6bc6560e51d1cf58b54561f7be44801864479b8d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21167.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.4.21176.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>6bc6560e51d1cf58b54561f7be44801864479b8d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21167.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.4.21176.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>6bc6560e51d1cf58b54561f7be44801864479b8d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.3.21167.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.4.21176.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>6bc6560e51d1cf58b54561f7be44801864479b8d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.3.21167.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.4.21176.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>6bc6560e51d1cf58b54561f7be44801864479b8d</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@ -39,33 +39,33 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21167.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.4.21176.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>6bc6560e51d1cf58b54561f7be44801864479b8d</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-preview.3.21172.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-preview.4.21176.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>fb3092b7e6cd8135663bc05c31561b58c0007245</Sha>
<Sha>1e2fdc3f16431497f8c08909b485f1fb33ffd21f</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-preview.3.21172.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-preview.4.21176.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>fb3092b7e6cd8135663bc05c31561b58c0007245</Sha>
<Sha>1e2fdc3f16431497f8c08909b485f1fb33ffd21f</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21172.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.4.21176.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>fb3092b7e6cd8135663bc05c31561b58c0007245</Sha>
<Sha>1e2fdc3f16431497f8c08909b485f1fb33ffd21f</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21172.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.4.21176.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>fb3092b7e6cd8135663bc05c31561b58c0007245</Sha>
<Sha>1e2fdc3f16431497f8c08909b485f1fb33ffd21f</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.0-preview.3.21172.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="6.0.0-preview.4.21176.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>fb3092b7e6cd8135663bc05c31561b58c0007245</Sha>
<Sha>1e2fdc3f16431497f8c08909b485f1fb33ffd21f</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.0-preview.3.21172.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="6.0.0-preview.4.21176.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>fb3092b7e6cd8135663bc05c31561b58c0007245</Sha>
<Sha>1e2fdc3f16431497f8c08909b485f1fb33ffd21f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.21176.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -79,26 +79,26 @@
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>7bb6aa4e0887aedabb0acaf17e84a1734b2e53d6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.100-preview.3.21161.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.100-preview.4.21176.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>5067a9034f799eceb42846a62e5431a3ec8a267b</Sha>
<Sha>f28881570c6f58ccaa76fd8cc48bc22ca2ddf84d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.3.21173.8">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.3.21176.9">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>2bd13761a780509b8d3a0abd74e4197fe06b8f3f</Sha>
<Sha>ef99d3240a737fead9a731785fd7bc2d0ae157d6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.3.21173.8">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.3.21176.9">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>2bd13761a780509b8d3a0abd74e4197fe06b8f3f</Sha>
<Sha>ef99d3240a737fead9a731785fd7bc2d0ae157d6</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.3.21171.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>ed3f2e2ea00a5ea85811bd817d144bc0ce66abc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.0-preview.3.21171.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.0-preview.4.21174.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>77f0456f549ca92ab7413218a7ee028f6195e340</Sha>
<Sha>6d35e1a0539cc5cc7a6111a11b781f52cfc71fc2</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.4.2-beta.21171.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
@ -108,18 +108,18 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>dd5546b3d9ba0c2947c94b56a7f77169ce8d5e9c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21172.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21174.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/mono/linker</Uri>
<Sha>2f5594e95e1a5227103b9b7d6b92f4b2250be2d7</Sha>
<Sha>000432728ae8603d7ac0519d844bc260eee4910e</Sha>
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-2.21173.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-2.21175.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0f72ba6869dfc9e34e163c2ab01863a1a33510c3</Sha>
<Sha>595dde550f007f16b12aa337dd27aa507301b8fb</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="16.10.0-preview-21173-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="16.10.0-preview-21175-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>8d34753d265721735a678033c3ce48033dbc96ee</Sha>
<Sha>afd0b62109300f3b088875b5a65d1a5bfd786e15</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="5.9.0-preview.3.7027" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>

View file

@ -28,11 +28,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.0-preview.3.21171.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.0-preview.4.21174.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.100-preview.3.21161.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.100-preview.4.21176.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
@ -45,42 +45,42 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.0-preview.3.21172.8</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.0-preview.3.21172.8</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.0-preview.3.21172.8</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21172.8</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.0-preview.3.21172.8</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.0-preview.3.21172.8</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.0-preview.4.21176.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.0-preview.4.21176.2</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.0-preview.4.21176.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.4.21176.2</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.0-preview.4.21176.2</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.0-preview.4.21176.2</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.100-preview.3.21173.8</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.3.21173.8</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.100-preview.3.21176.9</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.3.21176.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-preview.3.21167.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-preview.4.21176.1</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21167.1</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.4.21176.1</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.4.21176.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.0-preview.4.21176.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.4.21176.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.4.21176.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21172.2</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.0-preview.3.21172.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.0-preview.3.21172.2</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-preview.4.21175.1</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.0-preview.4.21175.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.0-preview.4.21175.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->

View file

@ -72,7 +72,7 @@
<SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
<SharedFrameworkRid Condition="$(ProductMonikerRid.StartsWith('linux-musl'))">$(ProductMonikerRid)</SharedFrameworkRid>
<SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-$(Architecture)</SharedFrameworkRid>
<CombinedFrameworkHostArchiveFileName>dotnet-runtime$(PgoTerm)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
<CombinedFrameworkHostArchiveFileName>dotnet-runtime$(PgoArchiveTerm)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
<WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
<AspNetCoreSharedFxInstallerRid Condition="'$(AspNetCoreSharedFxInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreSharedFxInstallerRid>