mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request 4898 from darc-internal/release/3.1.1xx-1a8919d3-cda2-437b-9784-4b0111084702 into internal/release/3.1.1xx

Browse source
This commit is contained in:
DotNet Bot 2019-12-16 22:08:02 +00:00
parent 6c6057a558
commit e5837fa361
4 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NuGet.config
View file

@ -13,6 +13,7 @@
<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-7db6969" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-7db69699/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-a1388f1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a1388f19/nuget/v3/index.json" />
<add key="darc-int-aspnet-AspNetCore-e276c81" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-AspNetCore-e276c817/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" />

32
eng/Version.Details.xml
View file

@ -43,27 +43,27 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.0">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.0">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
</Dependency>
<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>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.1-servicing.19615.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.1.0-rtm.19575.14">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
<Dependency Name="dotnet-dev-certs" Version="3.1.1-servicing.19615.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.1.0-rtm.19575.14">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
<Dependency Name="dotnet-user-secrets" Version="3.1.1-servicing.19615.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="3.1.0-rtm.19575.14">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>7db696998c6ae4852fbf01827efdb10634e22668</Sha>
<Dependency Name="dotnet-watch" Version="3.1.1-servicing.19615.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore</Uri>
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</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>

10
eng/Versions.props
View file

@ -36,12 +36,12 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.0</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.1</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>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.1-servicing.19615.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.1.1-servicing.19615.10</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.1.1-servicing.19615.10</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.1.1-servicing.19615.10</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->

2
src/redist/targets/GenerateLayout.targets
View file

@ -11,7 +11,7 @@
<PropertyGroup>
<!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
<AspNetCoreBlobVersion>$(VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion)</AspNetCoreBlobVersion>
<AspNetCoreBlobVersion>$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)</AspNetCoreBlobVersion>
<CoreSetupBlobVersion>$(MicrosoftNETCoreAppInternalPackageVersion)</CoreSetupBlobVersion>
<!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->