Merge pull request #5861 from dotnet/revert-back-to-310-deps

Revert back to 3.1.0 runtime versions
This commit is contained in:
William Li 2019-12-11 14:11:31 -08:00 committed by GitHub
commit 16bae39283
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 33 deletions

View file

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.1-servicing.19576.9">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.0">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.1-servicing.19576.9">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.0-rtm.19565.2">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.1-servicing.19576.9">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.0">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.1-servicing.19576.9">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.0">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.1-servicing.19576.9">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.0">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</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. -->
@ -49,21 +49,21 @@
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1" Version="3.1.0-rtm.19575.14">
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1" Version="3.1.0-rtm.19566.1">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.1.0-rtm.19575.14">
<Dependency Name="dotnet-dev-certs" Version="3.1.0-rtm.19566.1">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.1.0-rtm.19575.14">
<Dependency Name="dotnet-user-secrets" Version="3.1.0-rtm.19566.1">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="3.1.0-rtm.19575.14">
<Dependency Name="dotnet-watch" Version="3.1.0-rtm.19566.1">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.3.1" Version="1.0.2-beta4.19570.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -86,13 +86,13 @@
<Sha>ee2dc9d1a446ba70b39043443e1e99a659c8a9c3</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-servicing.19576.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-rtm.19564.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>2204c3f17bea70ee01be3b450f6b84158a80c154</Sha>
<Sha>4bcd68c8b29476fc3c5ca1b496214584aadfdc84</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-rtm.19576.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-rtm.19565.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>c8a08a25cbde21c5d45048a8719b1c64216402f7</Sha>
<Sha>427fa56aed34cbbc5096aa6137e748054905507d</Sha>
</Dependency>
<!-- This is so that WCF packages are included in the final drop for official releases. -->
<!-- Replace with better solution, see https://github.com/dotnet/arcade/issues/4162 -->

View file

@ -16,11 +16,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-servicing.19576.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-rtm.19564.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-rtm.19576.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-rtm.19565.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
@ -38,10 +38,10 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.0</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.1.0</MicrosoftAspNetCoreAppRefPackageVersion>
<VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>3.1.0-rtm.19575.14</VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>
<dotnetdevcertsPackageVersion>3.1.0-rtm.19575.14</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.1.0-rtm.19575.14</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.1.0-rtm.19575.14</dotnetwatchPackageVersion>
<VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>3.1.0-rtm.19566.1</VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>
<dotnetdevcertsPackageVersion>3.1.0-rtm.19566.1</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.1.0-rtm.19566.1</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.1.0-rtm.19566.1</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
@ -61,12 +61,12 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<MicrosoftNETCoreAppInternalPackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.0-rtm.19565.2</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.0</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.0</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.0</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.0</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>