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

Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210521.7

Browse source 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.301-servicing.21269.13 -> To Version 5.0.301-servicing.21271.7

Dependency coherency updates

Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 5.0.6-servicing.21221.6 -> To Version 5.0.7-servicing.21263.4 (parent: Microsoft.NET.Sdk
This commit is contained in:
DotNet-Bot 2021-05-21 12:30:20 +00:00
parent 4b800362b3
commit 57dc629f24
3 changed files with 31 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
NuGet.config
View file

@ -24,6 +24,11 @@
<add key="darc-int-dotnet-runtime-556582d-3" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-556582d9-3/nuget/v3/index.json" /> <add key="darc-int-dotnet-runtime-556582d-3" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-556582d9-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-556582d-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-556582d9-2/nuget/v3/index.json" /> <add key="darc-int-dotnet-runtime-556582d-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-556582d9-2/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f874552-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-f8745522-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f874552-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-f8745522-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f874552" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-f8745522/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- For custom version of arcade --> <!-- For custom version of arcade -->
<add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" /> <add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
@ -44,14 +49,19 @@
<add key="darc-int-dotnet-aspnetcore-67acc3d-2" value="true" /> <add key="darc-int-dotnet-aspnetcore-67acc3d-2" value="true" />
<!-- End: Package sources from dotnet-aspnetcore --> <!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-f8a6198" value="true" />
<add key="darc-int-dotnet-efcore-f8a6198-1" value="true" />
<add key="darc-int-dotnet-efcore-f8a6198-2" value="true" />
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f874552" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f874552-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f874552-2" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-runtime-556582d-2" value="true" /> <add key="darc-int-dotnet-runtime-556582d-2" value="true" />
<add key="darc-int-dotnet-runtime-556582d-3" value="true" /> <add key="darc-int-dotnet-runtime-556582d-3" value="true" />
<add key="darc-int-dotnet-runtime-556582d-4" value="true" /> <add key="darc-int-dotnet-runtime-556582d-4" value="true" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-efcore-f8a6198" value="true" />
<add key="darc-int-dotnet-efcore-f8a6198-1" value="true" />
<add key="darc-int-dotnet-efcore-f8a6198-2" value="true" />
<!-- End: Package sources from dotnet-efcore --> <!-- End: Package sources from dotnet-efcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- Added by darc above. due to dependencies on 3.0.0 and 2.1.0 packs, but we can get those from nuget.org --> <!-- Added by darc above. due to dependencies on 3.0.0 and 2.1.0 packs, but we can get those from nuget.org -->

24
eng/Version.Details.xml
View file

@ -5,13 +5,13 @@
<Uri>https://github.com/dotnet/windowsdesktop</Uri> <Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>ec2af60c1eb8b2665745750f6445b3ff133178fb</Sha> <Sha>ec2af60c1eb8b2665745750f6445b3ff133178fb</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.6-servicing.21221.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.7-servicing.21263.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>297185fc6039237591fb28a8a09fc01d2ea69ae6</Sha> <Sha>f87455227b7f349e26043daa2e1b5b86fb381627</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>297185fc6039237591fb28a8a09fc01d2ea69ae6</Sha> <Sha>f87455227b7f349e26043daa2e1b5b86fb381627</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.5.0" Version="5.0.0-rtm.20520.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.5.0" Version="5.0.0-rtm.20520.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri> <Uri>https://github.com/dotnet/windowsdesktop</Uri>
@ -87,22 +87,22 @@
<Uri>https://github.com/dotnet/templating</Uri> <Uri>https://github.com/dotnet/templating</Uri>
<Sha>592742371da1df5b459c4bbf68e05968b5eb750d</Sha> <Sha>592742371da1df5b459c4bbf68e05968b5eb750d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.301-servicing.21271.5"> <Dependency Name="Microsoft.NET.Sdk" Version="5.0.301-servicing.21271.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>8e86aff63cbc2a14a24f321cef946cd435ef277d</Sha> <Sha>1555c5a76cb15abb5350aeeffc63d83c3fd2f70f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.301-servicing.21271.5"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.301-servicing.21271.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>8e86aff63cbc2a14a24f321cef946cd435ef277d</Sha> <Sha>1555c5a76cb15abb5350aeeffc63d83c3fd2f70f</Sha>
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <!-- 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.6-servicing.21221.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.7-servicing.21263.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>3b86fe34ae2ef405a49c19997f9f01ed63a2ad70</Sha> <Sha>3e5e4f7ca852c8b85899a18efcd114e7ed4ea163</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.6-servicing.21221.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.6-servicing.21263.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>fe9dd395134709b5a53883b71c01447b5f132a06</Sha> <Sha>36ec7266b65ec578b5524c998a80e6a8848efb41</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.4.2-beta.21262.7" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.FSharp.Compiler" Version="11.4.2-beta.21262.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri> <Uri>https://github.com/dotnet/fsharp</Uri>

12
eng/Versions.props
View file

@ -23,11 +23,11 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.6-servicing.21221.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.7-servicing.21263.7</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf --> <!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.6-servicing.21221.8</MicrosoftDotNetWpfProjectTemplatesPackageVersion> <MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.6-servicing.21263.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating --> <!-- Dependency from https://github.com/dotnet/templating -->
@ -55,8 +55,8 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk --> <!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>5.0.301-servicing.21271.5</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>5.0.301-servicing.21271.7</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.301-servicing.21271.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.301-servicing.21271.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -76,8 +76,8 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop --> <!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<MicrosoftWindowsDesktopAppPackageVersion>5.0.6-servicing.21221.6</MicrosoftWindowsDesktopAppPackageVersion> <MicrosoftWindowsDesktopAppPackageVersion>5.0.7-servicing.21263.4</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.6</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.7</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0</MicrosoftWindowsDesktopAppRefPackageVersion> <MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion>5.0.0-rtm.20520.1</VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion> <VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion>5.0.0-rtm.20520.1</VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion>
</PropertyGroup> </PropertyGroup>