[internal/release/5.0.1xx] Update dependencies from dnceng/internal/d…

…otnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.1-servicing.20580.3 to 5.0.2-servicing.20613.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.1-servicing.20575.16 to 5.0.2-servicing.20611.20 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.1 to 5.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.1 to 5.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.1 to 5.0.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.1-servicing.20601.7 to 5.0.2-servicing.20613.2 (parent: Microsoft.NET.Sdk) - Microsoft.EntityFrameworkCore: from 5.0.1 to 5.0.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.1 to 5.0.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.1-servicing.20601.7 to 5.0.2-servicing.20613.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.1-servicing.20601.7 to 5.0.2-servicing.20613.2 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.1-servicing.20601.7 to 5.0.2-servicing.20613.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 5.0.1 to 5.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.1-servicing.20575.6 to 5.0.2-servicing.20613.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.1 to 5.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.1-servicing.20580.1 to 5.0.2-servicing.20613.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.20604.1 to 5.0.0-rtm.20612.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.8.0 to 16.8.3 (parent: Microsoft.NET.Sdk) - Try simpler fix - Revert attempts to fix base64 problem - Pass base64 token - Emptyness check - DOTNETCLIMSRC_READ_SAS_TOKEN_BASE64 agan - Another attempt to decode base64 token - DOTNETCLIMSRC_READ_SAS_TOKEN_BASE64/DOTNETCLIMSRC_READ_SAS_TOKEN confusion - Remove redundant DOTNETCLIMSRC_READ_SAS_TOKEN assignment - Attempt using base64 string - Fixup disabled package sources - Internal runtime download arguments
dotnet · Dec 14, 2020 · 71365b4 · 71365b4
1 parent 2503ceb
commit 71365b4
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 73 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -5,6 +5,26 @@
   </solution>
   <packageSources>
     <clear />
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-2670c12" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-2670c128/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-1ee6b62" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-1ee6b629/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-efcore -->
+    <!--  Begin: Package sources from dotnet-msbuild -->
+    <add key="darc-pub-dotnet-msbuild-39993bd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-msbuild-39993bd9/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-msbuild -->
+    <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-cb5f173" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-cb5f173b/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-runtime -->
+    <!--  Begin: Package sources from dotnet-templating -->
+    <add key="darc-pub-dotnet-templating-568c09b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-568c09b9/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-templating -->
+    <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-c0f7184" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-c0f71846/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-windowsdesktop -->
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- 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="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -20,9 +40,13 @@
     <add key="darc-pub-dotnet-templating-247f60e9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-247f60e9/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
-    <clear />
+    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-2670c12" value="true" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-efcore-1ee6b62" value="true" />
+    <add key="darc-int-dotnet-runtime-cb5f173" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-c0f7184" value="true" />
     <!-- Added by darc above. due to dependencies on 3.0.0 and 2.1.0 packs, but we can get those from nuget.org -->
     <!-- Darc will just put it back if we attempt to remove it above. -->
-    <add key="darc-pub-dotnet-core-setup-7d57652" value="true" />
   </disabledPackageSources>
 </configuration>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -5,13 +5,13 @@
       <Uri>https://github.com/dotnet/windowsdesktop</Uri>
       <Sha>ec2af60c1eb8b2665745750f6445b3ff133178fb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.1-servicing.20580.3" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>cc1f119dc6ed7ca15c5d395cf7bdaa5c472f00e9</Sha>
+    <Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.2-servicing.20613.4" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
+      <Sha>c0f71846fb6ea631ffd2b4f6d3a9974c0897b901</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>cc1f119dc6ed7ca15c5d395cf7bdaa5c472f00e9</Sha>
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
+      <Sha>c0f71846fb6ea631ffd2b4f6d3a9974c0897b901</Sha>
     </Dependency>
     <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>
@@ -21,21 +21,21 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.1-servicing.20575.16" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.2-servicing.20611.20" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</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. -->
@@ -55,29 +55,29 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>371a26f07b23ad77c636332c2dfc0cbd1d8137ba</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc93e595ceffbb1e3e85532bf454e92a6a80dd6b</Sha>
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>2670c128d522473e146ff9f8159bfffdfe694cd9</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0" Version="5.0.1-servicing.20601.7" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc93e595ceffbb1e3e85532bf454e92a6a80dd6b</Sha>
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>2670c128d522473e146ff9f8159bfffdfe694cd9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
-      <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>494e218127bfb7afee3c9b10a30bcd32d6cd80db</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
+      <Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="5.0.1-servicing.20601.7" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc93e595ceffbb1e3e85532bf454e92a6a80dd6b</Sha>
+    <Dependency Name="dotnet-dev-certs" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>2670c128d522473e146ff9f8159bfffdfe694cd9</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="5.0.1-servicing.20601.7" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc93e595ceffbb1e3e85532bf454e92a6a80dd6b</Sha>
+    <Dependency Name="dotnet-user-secrets" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>2670c128d522473e146ff9f8159bfffdfe694cd9</Sha>
     </Dependency>
-    <Dependency Name="dotnet-watch" Version="5.0.1-servicing.20601.7" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc93e595ceffbb1e3e85532bf454e92a6a80dd6b</Sha>
+    <Dependency Name="dotnet-watch" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>2670c128d522473e146ff9f8159bfffdfe694cd9</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.20420.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
@@ -87,26 +87,26 @@
       <Uri>https://github.com/dotnet/test-templates</Uri>
       <Sha>a2b05d8171915c69ad97ab5d49bbb07d2c780a67</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>9d3065efbe93ec1daaa4d59115b2887f6b36766a</Sha>
+      <Sha>568c09b99075179607c572f7b9f3ad3d706f1fc3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.101-servicing.20604.7">
-      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>c3a779b104eabb4bd859283919c96889d00d7f9c</Sha>
+    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.102-servicing.20613.7">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
+      <Sha>ef14c79a16171496e2d972edd9a7874d596f624d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.101-servicing.20604.7">
-      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>c3a779b104eabb4bd859283919c96889d00d7f9c</Sha>
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.102-servicing.20613.7">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
+      <Sha>ef14c79a16171496e2d972edd9a7874d596f624d</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.1-servicing.20575.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
-      <Uri>https://github.com/dotnet/winforms</Uri>
-      <Sha>200d7409fd9078764eb840e431bc3649caf3ad56</Sha>
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.2-servicing.20613.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
+      <Sha>1a7d925a270d4eaca6e801de8b88b34b535091de</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.1-servicing.20580.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
-      <Uri>https://github.com/dotnet/wpf</Uri>
-      <Sha>f336060dde15d0aecaf37f3493f699134451fa8c</Sha>
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
+      <Sha>89936f5f8d7ac99e04123f8f48754f252dfd9973</Sha>
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20507.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
@@ -116,18 +116,18 @@
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>212656d7b384a506aa714999f678b3ace82d114e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.20604.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.20612.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d</Sha>
+      <Sha>25604250cf2663aed6630e305cc0538aeebda80a</Sha>
       <RepoName>linker</RepoName>
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-5.20604.10" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>9ed4b774d20940880de8df1ca8b07508aa01c8cd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="16.8.0" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Build" Version="16.8.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>126527ff107ae93fed10af675506c56d046aa5a3</Sha>
+      <Sha>39993bd9d02917993b6147a9973dc3aa6e9b00c7</Sha>
     </Dependency>
     <Dependency Name="NuGet.Build.Tasks" Version="5.8.0-rc.6930" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/NuGet/NuGet.Client</Uri>