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

Merge pull request #6352 from mmitche/take-you-back

Browse source 
Update dependencies from .NET Core 5 Dev
This commit is contained in:
Daniel Plaisted 2020-02-13 05:14:58 -08:00 committed by GitHub
commit b81dc76624
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
NuGet.config
View file

@ -5,9 +5,6 @@
</solution>
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<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" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />

46
eng/Version.Details.xml
View file

@ -13,25 +13,25 @@
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>c7a1294fac9ca026100522f7736101bfbdf352f5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-alpha.1.20112.1">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.1.20112.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>673635654c20e5eee329945c58058855bcc24340</Sha>
<Sha>084dd1a5aae0fbe6ed4f9164ac4ee1c5f0b2398f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-alpha.1.20112.1">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-preview.1.20112.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>673635654c20e5eee329945c58058855bcc24340</Sha>
<Sha>084dd1a5aae0fbe6ed4f9164ac4ee1c5f0b2398f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-alpha.1.20112.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview.1.20112.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>673635654c20e5eee329945c58058855bcc24340</Sha>
<Sha>084dd1a5aae0fbe6ed4f9164ac4ee1c5f0b2398f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.0-alpha.1.20112.1">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.0-preview.1.20112.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>673635654c20e5eee329945c58058855bcc24340</Sha>
<Sha>084dd1a5aae0fbe6ed4f9164ac4ee1c5f0b2398f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-alpha.1.20112.1">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-preview.1.20112.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>673635654c20e5eee329945c58058855bcc24340</Sha>
<Sha>084dd1a5aae0fbe6ed4f9164ac4ee1c5f0b2398f</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,9 +39,9 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha.1.20112.1" CoherentParentDependency="Microsoft.NetCore.App.Internal">
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-preview.1.20112.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>673635654c20e5eee329945c58058855bcc24340</Sha>
<Sha>084dd1a5aae0fbe6ed4f9164ac4ee1c5f0b2398f</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-preview.1.20112.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@ -71,21 +71,17 @@
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>5117d3d9d7dfd3583f0c42a639efaf092f957b7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-alpha.1.20109.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-alpha.1.20112.1">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>b6906c18ac94b3bfbfe673bc7b36e03fa818d862</Sha>
<Sha>ce0c35f54bceb739374f18e891913ecff84cd31d</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="5.0.100-preview.1.20109.3">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>648d9ee5620e0a584e41a916475a6d635663845a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.1.20105.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.1.20112.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>9e18c1c22e2cd5c2d0a1cc3a5dc3459e6f2390a6</Sha>
<Sha>adda770782d4fe6ad57a2b4f5e117aa4bdb7a8a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-preview.1.20109.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>648d9ee5620e0a584e41a916475a6d635663845a</Sha>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-preview.1.20112.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>adda770782d4fe6ad57a2b4f5e117aa4bdb7a8a9</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="5.0.0-preview.1.20112.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -98,9 +94,9 @@
</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 -->
<Dependency Name="System.ServiceModel.Primitives" Version="4.7.0">
<Dependency Name="System.ServiceModel.Primitives" Version="5.0.0-preview1.20104.1">
<Uri>https://github.com/dotnet/wcf</Uri>
<Sha>eb417fdeb06faeada140a92e26e86c266574476a</Sha>
<Sha>d08484b1422ee45195adff528d6c65c7c788d7fa</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>

18
eng/Versions.props
View file

@ -29,7 +29,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.0-alpha.1.20109.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.0-alpha.1.20112.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
@ -50,27 +50,27 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.1.20109.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.1.20112.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
<MicrosoftNETSdkPackageVersion>5.0.100-preview.1.20105.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>5.0.100-preview.1.20112.3</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha.1.20112.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-preview.1.20112.8</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-alpha.1.20112.1</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-alpha.1.20112.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.0-alpha.1.20112.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-alpha.1.20112.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-alpha.1.20112.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-preview.1.20112.8</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-preview.1.20112.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.0-preview.1.20112.8</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-preview.1.20112.8</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-preview.1.20112.8</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>