Fix runtime/aspnetcore DARC updates (#1668)

Fix runtime/aspnetcore DARC updates

* Update dependencies from https://github.com/dotnet/runtime build 20201014.4

Microsoft.NETCore.App
 From Version 5.0.0-rc.2.20479.6 -> To Version 5.0.0-rtm.20514.4

* Update dependencies from https://github.com/dotnet/runtime build 20201015.3

Microsoft.NETCore.App
 From Version 5.0.0-rc.2.20479.6 -> To Version 5.0.0-rtm.20515.3

* Update dependencies from https://github.com/dotnet/runtime build 20201017.6

Microsoft.NETCore.App
 From Version 5.0.0-rc.2.20479.6 -> To Version 5.0.0-rtm.20517.6

* Update dependencies from https://github.com/dotnet/runtime build 20201019.4

Microsoft.NETCore.App
 From Version 5.0.0-rc.2.20479.6 -> To Version 5.0.0-rtm.20519.4

diff --git a/NuGet.config b/NuGet.config
index a6a27a89a480af9172eb62a08396b276a7166790..1dc830cf728a79cd8664529fab1dc2c174a58906 100644 (file)
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,6 +5,10 @@
   </solution>
   <packageSources>
     <clear />
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <add key="darc-pub-dotnet-runtime-25c7409" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-25c7409c/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-aspnetcore-c7d42cf" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-c7d42cf3/nuget/v3/index.json" />
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- Feeds used in Maestro/Arcade publishing -->
     <add key="dotnet5" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet5/nuget/v3/index.json" />
     <add key="dotnet5-transport" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet5-transport/nuget/v3/index.json" />

diff --git a/eng/InstallRuntimes.proj b/eng/InstallRuntimes.proj
index 1f84af3d5d17c2f532fac78c0b0a4867174a3c4b..2770b90400253de4c5c76cf20b0fec96633b58f1 100644 (file)
--- a/eng/InstallRuntimes.proj
+++ b/eng/InstallRuntimes.proj
@@ -15,7 +15,12 @@
 
      $(MicrosoftDotnetSdkInternalVersion) - .NET SDK to use for testing
 
-     $(MicrosoftNETCoreAppVersion)   $(MicrosoftAspNetCoreAppRefVersion) - latest dotnet runtime/aspnetcore version to install/test
+     $(MicrosoftNETCoreAppVersion)               - latest dotnet runtime package version (the version to install)
+     $(MicrosoftNETCoreAppRuntimewinx64Version)  - latest dotnet runtime stable version (the version that actually is installed)
+
+     $(MicrosoftAspNetCoreAppRefInternalVersion) - latest dotnet aspnetcore package version (the version to install)
+     $(MicrosoftAspNetCoreAppRefVersion)         - latest dotnet aspnetcore stable version (the version that actually is installed)
+
      $(MicrosoftNETCoreApp31Version) $(MicrosoftAspNetCoreApp31Version)  - 3.1 version
      $(MicrosoftNETCoreApp21Version) $(MicrosoftAspNetCoreApp21Version)  - 2.1 version
 
@@ -48,7 +53,7 @@
 
   <PropertyGroup>
     <CommonInstallArgs>-NoPath -SkipNonVersionedFiles -Architecture $(BuildArch) -InstallDir $(DotNetInstallRoot)</CommonInstallArgs>
-    <DotNetInstallDir>$(DotNetInstallRoot.Replace("\", "\\"))shared\\Microsoft.NETCore.App\\$(MicrosoftNETCoreAppVersion)\\</DotNetInstallDir>
+    <DotNetInstallDir>$([MSBuild]::NormalizeDirectory('$(DotNetInstallRoot)', 'shared', 'Microsoft.NETCore.App', '$(MicrosoftNETCoreAppRuntimewinx64Version)'))</DotNetInstallDir>
     <TestConfigFileName>$(DotNetInstallRoot)Debugger.Tests.Versions.txt</TestConfigFileName>
     <AddRegeditFileName>$(DotNetInstallRoot)AddPrivateTesting.reg</AddRegeditFileName>
     <RemoveRegeditFileName>$(DotNetInstallRoot)RemovePrivateTesting.reg</RemoveRegeditFileName>
@@ -70,14 +75,14 @@
   </Choose>
 
   <ItemGroup Condition="!$(InternalReleaseTesting) and !$(PrivateBuildTesting)">
-    <TestVersions Include="Latest" RuntimeVersion="$(MicrosoftNETCoreAppVersion)" AspNetVersion="$(MicrosoftAspNetCoreAppRefVersion)" />
+    <TestVersions Include="Latest" RuntimeVersion="$(MicrosoftNETCoreAppVersion)" AspNetVersion="$(MicrosoftAspNetCoreAppRefInternalVersion)" />
     <TestVersions Include="31" RuntimeVersion="$(MicrosoftNETCoreApp31Version)" AspNetVersion="$(MicrosoftAspNetCoreApp31Version)" />
     <TestVersions Condition="'$(BuildArch)' != 'arm' and '$(BuildArch)' != 'arm64'" Include="21" RuntimeVersion="$(MicrosoftNETCoreApp21Version)" AspNetVersion="$(MicrosoftAspNetCoreApp21Version)" />
   </ItemGroup>
 
   <!-- Local private build testing -->
   <ItemGroup Condition="$(PrivateBuildTesting)">
-    <TestVersions Include="Latest" RuntimeVersion="$(MicrosoftNETCoreAppVersion)" AspNetVersion="$(MicrosoftAspNetCoreAppRefVersion)" />
+    <TestVersions Include="Latest" RuntimeVersion="$(MicrosoftNETCoreAppVersion)" AspNetVersion="$(MicrosoftAspNetCoreAppRefInternalVersion)" />
   </ItemGroup>
 
   <!-- Internal service release testing -->
@@ -140,7 +145,7 @@
           Outputs="$(TestConfigFileName)">
 
     <PropertyGroup>
-      <RuntimeVersionLatest>$(MicrosoftNETCoreAppVersion)</RuntimeVersionLatest>
+      <RuntimeVersionLatest>$(MicrosoftNETCoreAppRuntimewinx64Version)</RuntimeVersionLatest>
       <RuntimeVersionLatest Condition="$(InternalReleaseTesting)">$(DotnetRuntimeVersion)</RuntimeVersionLatest>
       <TestConfigFileLines>
 <![CDATA[

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 13aa6c5c04cc2a11c2db7681d45799c2e5333195..e9338472cfc2a523c68931a066a345e1fc503609 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -30,13 +30,21 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>d4de3ce701c2ba697d71cc70e2db69d7568913dc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rc.2.20479.6">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>c95b3204bc3790e797cf8787481898e5473049d9</Sha>
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="5.0.0-rtm.20517.7">
+      <Uri>https://github.com/dotnet/aspnetcore</Uri>
+      <Sha>c7d42cf37bfc928bfae6c4ddaff0749fbb2fb9f2</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.2.20475.17">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>25bd01f17d5f01fc78bea5eb5308b2c0d79e2889</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rtm.20519.4">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
index 9d35082c42929b22af5f0c00059144e031eabab1..11e1645bd2d7de936052c8b907fbd2013d2a97db 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -15,8 +15,10 @@
     <MicrosoftNETCoreApp31Version>3.1.8</MicrosoftNETCoreApp31Version>
     <MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>
     <!-- Latest shared runtime version updated by darc -->
-    <MicrosoftNETCoreAppVersion>5.0.0-rc.2.20479.6</MicrosoftNETCoreAppVersion>
+    <MicrosoftNETCoreAppVersion>5.0.0-rtm.20519.4</MicrosoftNETCoreAppVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>5.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
     <!-- Latest shared aspnetcore version updated by darc -->
+    <MicrosoftAspNetCoreAppRefInternalVersion>5.0.0-rc.2.20475.17</MicrosoftAspNetCoreAppRefInternalVersion>
     <MicrosoftAspNetCoreAppRefVersion>5.0.0-rc.2.20475.17</MicrosoftAspNetCoreAppRefVersion>
     <!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
     <MicrosoftDotnetSdkInternalVersion>5.0.100-rc.2.20480.7</MicrosoftDotnetSdkInternalVersion>

diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj
index 1eb11051dee961309aad419dd5cfbc754451e425..e0e813c74e17a86cb2f633d89b556ac1a87e5af8 100644 (file)
--- a/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj
+++ b/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <!-- 
-    DARCVersionFileName, GenerateDARCVersion, and InjectDARCVersion are used for injecting the value of MicrosoftNETCoreAppVersion
+    DARCVersionFileName, GenerateDARCVersion, and InjectDARCVersion are used for injecting the value of MicrosoftNETCoreAppRuntimewinx64Version
     int csharp code so that it can be used by testing harnesses for running tests under a specific runtime version.  This specifically
     allows tests to run on a version of the runtime besides whatever was included with Arcade's SDK.
    -->
@@ -27,7 +27,7 @@ namespace Microsoft.Diagnostics.NETCore.Client
 {
     public partial class CommonHelper
     {
-        public static readonly string CurrentDARCVersion = "$(MicrosoftNETCoreAppVersion)";
+        public static readonly string CurrentDARCVersion = "$(MicrosoftNETCoreAppRuntimewinx64Version)";
     }
 }
 ]]>