Merge pull request #5830 from dotnet-maestro-bot/merge/release/3.1.1xx-to-release/3.1.2xx
[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'
This commit is contained in:
Matt Mitchell
GitHub
commit
9060c20d14
4 changed files with 52 additions and 49 deletions
|
|
@ -10,8 +10,9 @@
|
|||
<add key="darc-pub-dotnet-wcf-eb417fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-wcf-eb417fde/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-templating-b275b18" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b275b18f/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-core-setup-7d57652" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-7d57652f/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-core-setup-65f04fb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-65f04fb6/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
|
||||
<add key="darc-pub-aspnet-AspNetCore-c31f51e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-c31f51e5/nuget/v3/index.json" />
|
||||
<add key="darc-pub-aspnet-AspNetCore-7db6969" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-7db69699/nuget/v3/index.json" />
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
<!-- 3.0.1 assets are needed and not on nuget.org yet or other feeds below. Darc cannot see that due to nonstandard way these are pulled in to a non-3.0 branch -->
|
||||
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
|
||||
|
|
|
|||
|
|
@ -1,33 +1,25 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="3.1.1-servicing.19576.4">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.1-servicing.19576.9">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
|
||||
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.1-servicing.19576.4">
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.1-servicing.19576.9">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
|
||||
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.1-servicing.19576.4">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.1-servicing.19576.9">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
|
||||
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.1-servicing.19576.4">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.1-servicing.19576.9">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
|
||||
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.1-servicing.19576.4">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.1-servicing.19576.9">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.1-servicing.19576.4">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.1-servicing.19576.4">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>07f2d6521b95b6a5e781dc2597e0d6a2c3849f3c</Sha>
|
||||
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</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. -->
|
||||
|
|
@ -35,33 +27,43 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="3.1.0" Pinned="true">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0" CoherentParentDependency="Microsoft.NetCore.App.Internal">
|
||||
<Uri>https://github.com/dotnet/corefx</Uri>
|
||||
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.0">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>c31f51e5c778dc817862d0c932e7cfe9223d4899</Sha>
|
||||
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.0">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>c31f51e5c778dc817862d0c932e7cfe9223d4899</Sha>
|
||||
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1" Version="3.1.0-rtm.19573.3">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1" Version="3.1.0-rtm.19575.14">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>c31f51e5c778dc817862d0c932e7cfe9223d4899</Sha>
|
||||
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="3.1.0-rtm.19573.3">
|
||||
<Dependency Name="dotnet-dev-certs" Version="3.1.0-rtm.19575.14">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>c31f51e5c778dc817862d0c932e7cfe9223d4899</Sha>
|
||||
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="3.1.0-rtm.19573.3">
|
||||
<Dependency Name="dotnet-user-secrets" Version="3.1.0-rtm.19575.14">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>c31f51e5c778dc817862d0c932e7cfe9223d4899</Sha>
|
||||
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-watch" Version="3.1.0-rtm.19573.3">
|
||||
<Dependency Name="dotnet-watch" Version="3.1.0-rtm.19575.14">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>c31f51e5c778dc817862d0c932e7cfe9223d4899</Sha>
|
||||
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</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>
|
||||
|
|
@ -84,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-rtm.19568.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-servicing.19576.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>24b0195c1f4c4a707ca6c3a3bd4715a65fcd8bfe</Sha>
|
||||
<Sha>2204c3f17bea70ee01be3b450f6b84158a80c154</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-rtm.19572.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-rtm.19576.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>e85bb34bcb91bf7b8859d6fd84fd440508498aea</Sha>
|
||||
<Sha>c8a08a25cbde21c5d45048a8719b1c64216402f7</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 -->
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-rtm.19568.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-servicing.19576.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-rtm.19572.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-rtm.19576.3</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.19573.3</VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>3.1.0-rtm.19573.3</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>3.1.0-rtm.19573.3</dotnetusersecretsPackageVersion>
|
||||
<dotnetwatchPackageVersion>3.1.0-rtm.19573.3</dotnetwatchPackageVersion>
|
||||
<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>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/cli -->
|
||||
|
|
@ -61,13 +61,13 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>3.1.1-servicing.19576.4</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.1-servicing.19576.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>3.1.1-servicing.19576.4</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.1-servicing.19576.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>3.1.1-servicing.19576.4</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@
|
|||
<CoreSetupBlobVersion>$(MicrosoftNETCoreAppInternalPackageVersion)</CoreSetupBlobVersion>
|
||||
|
||||
<!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
|
||||
<NETCoreAppTargetingPackBlobVersion>$(CoreSetupBlobVersion)</NETCoreAppTargetingPackBlobVersion>
|
||||
<AspNetCoreTargetingPackBlobVersion>$(AspNetCoreBlobVersion)</AspNetCoreTargetingPackBlobVersion>
|
||||
<WindowsDesktopTargetingPackBlobVersion>$(CoreSetupBlobVersion)</WindowsDesktopTargetingPackBlobVersion>
|
||||
<NETCoreAppTargetingPackBlobVersion>3.1.0</NETCoreAppTargetingPackBlobVersion>
|
||||
<AspNetCoreTargetingPackBlobVersion>3.1.0</AspNetCoreTargetingPackBlobVersion>
|
||||
<WindowsDesktopTargetingPackBlobVersion>3.1.0</WindowsDesktopTargetingPackBlobVersion>
|
||||
<NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue