Debug darc master 77f307ec 7455 4c31 92ba 9a9e6e8daaeb

Directory.Build.props

@@ -8,7 +8,7 @@
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <DebugSymbols>true</DebugSymbols>
     <IsShippingPackage>false</IsShippingPackage>
-    <SdkTargetFramework>netcoreapp5.0</SdkTargetFramework>
+    <SdkTargetFramework>net5.0</SdkTargetFramework>
     <ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
 
     <!-- Disable implict package target fallback, and disable warning for when we explicitly add it (currently needed for

eng/Version.Details.xml

@@ -5,29 +5,29 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>f658b13953b2afd593aa84a96c30c4e35fa9ae56</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.5.20253.7">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.5.20260.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>8527a991b91cabc9bec6f6abe57a52b5bb5e154d</Sha>
+      <Sha>09ee4814cb669e4b703a458c63483fa75a47c58f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview.5.20253.7">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview.5.20260.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>8527a991b91cabc9bec6f6abe57a52b5bb5e154d</Sha>
+      <Sha>09ee4814cb669e4b703a458c63483fa75a47c58f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20228.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="5.0.0-preview.5.20253.7">
+    <Dependency Name="Microsoft.NET.HostModel" Version="5.0.0-preview.5.20260.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>8527a991b91cabc9bec6f6abe57a52b5bb5e154d</Sha>
+      <Sha>09ee4814cb669e4b703a458c63483fa75a47c58f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-preview.5.20253.7">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-preview.5.20260.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>8527a991b91cabc9bec6f6abe57a52b5bb5e154d</Sha>
+      <Sha>09ee4814cb669e4b703a458c63483fa75a47c58f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-preview.5.20253.7">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-preview.5.20260.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>8527a991b91cabc9bec6f6abe57a52b5bb5e154d</Sha>
+      <Sha>09ee4814cb669e4b703a458c63483fa75a47c58f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1">
       <Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
@@ -73,21 +73,21 @@
       <Uri>https://github.com/mono/linker</Uri>
       <Sha>fe2d8f8c2007ecf3789df3d8169d9809111875bb</Sha>
     </Dependency>
-    <Dependency Name="System.CodeDom" Version="5.0.0-preview.5.20253.7">
+    <Dependency Name="System.CodeDom" Version="5.0.0-preview.5.20260.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>8527a991b91cabc9bec6f6abe57a52b5bb5e154d</Sha>
+      <Sha>09ee4814cb669e4b703a458c63483fa75a47c58f</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.ProtectedData" Version="5.0.0-preview.5.20253.7">
+    <Dependency Name="System.Security.Cryptography.ProtectedData" Version="5.0.0-preview.5.20260.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>8527a991b91cabc9bec6f6abe57a52b5bb5e154d</Sha>
+      <Sha>09ee4814cb669e4b703a458c63483fa75a47c58f</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encoding.CodePages" Version="5.0.0-preview.5.20253.7">
+    <Dependency Name="System.Text.Encoding.CodePages" Version="5.0.0-preview.5.20260.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>8527a991b91cabc9bec6f6abe57a52b5bb5e154d</Sha>
+      <Sha>09ee4814cb669e4b703a458c63483fa75a47c58f</Sha>
     </Dependency>
-    <Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.5.20253.7">
+    <Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.5.20260.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>8527a991b91cabc9bec6f6abe57a52b5bb5e154d</Sha>
+      <Sha>09ee4814cb669e4b703a458c63483fa75a47c58f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.5.20256.1">
       <Uri>https://github.com/dotnet/windowsdesktop</Uri>

eng/Versions.props

@@ -26,12 +26,12 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-preview.5.20253.7</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-preview.5.20253.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-preview.5.20260.5</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-preview.5.20260.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-preview.5.20253.7</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-preview.5.20253.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftNETHostModelVersion>5.0.0-preview.5.20253.7</MicrosoftNETHostModelVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-preview.5.20260.5</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-preview.5.20260.5</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftNETHostModelVersion>5.0.0-preview.5.20260.5</MicrosoftNETHostModelVersion>
     <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -62,10 +62,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <SystemCodeDomPackageVersion>5.0.0-preview.5.20253.7</SystemCodeDomPackageVersion>
-    <SystemTextEncodingCodePagesPackageVersion>5.0.0-preview.5.20253.7</SystemTextEncodingCodePagesPackageVersion>
-    <SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.5.20253.7</SystemSecurityCryptographyProtectedDataPackageVersion>
-    <SystemResourcesExtensionsPackageVersion>5.0.0-preview.5.20253.7</SystemResourcesExtensionsPackageVersion>
+    <SystemCodeDomPackageVersion>5.0.0-preview.5.20260.5</SystemCodeDomPackageVersion>
+    <SystemTextEncodingCodePagesPackageVersion>5.0.0-preview.5.20260.5</SystemTextEncodingCodePagesPackageVersion>
+    <SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.5.20260.5</SystemSecurityCryptographyProtectedDataPackageVersion>
+    <SystemResourcesExtensionsPackageVersion>5.0.0-preview.5.20260.5</SystemResourcesExtensionsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->

eng/common/performance/performance-setup.ps1

@@ -3,7 +3,7 @@ Param(
     [string] $CoreRootDirectory,
     [string] $BaselineCoreRootDirectory,
     [string] $Architecture="x64",
-    [string] $Framework="netcoreapp5.0",
+    [string] $Framework="net5.0",
     [string] $CompilationMode="Tiered",
     [string] $Repository=$env:BUILD_REPOSITORY_NAME,
     [string] $Branch=$env:BUILD_SOURCEBRANCH,
@@ -111,4 +111,4 @@ Write-PipelineSetVariable -Name 'Queue' -Value "$Queue" -IsMultiJobVariable $fal
 Write-PipelineSetVariable -Name 'HelixSourcePrefix' -Value "$HelixSourcePrefix" -IsMultiJobVariable $false
 Write-PipelineSetVariable -Name '_BuildConfig' -Value "$Architecture.$Kind.$Framework" -IsMultiJobVariable $false
 
-exit 0
+exit 0

eng/common/performance/performance-setup.sh

@@ -4,7 +4,7 @@ source_directory=$BUILD_SOURCESDIRECTORY
 core_root_directory=
 baseline_core_root_directory=
 architecture=x64
-framework=netcoreapp5.0
+framework=net5.0
 compilation_mode=tiered
 repository=$BUILD_REPOSITORY_NAME
 branch=$BUILD_SOURCEBRANCH

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "5.0.100-preview.2.20152.7",
+    "dotnet": "5.0.100-preview.5.20261.8",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCoreAppRuntimePackageVersion)"

src/Assets/TestProjects/CppCliLibWithWpfFrameworkReference/Project1.vcxproj

@@ -24,7 +24,7 @@
     <Keyword>NetCoreCProj</Keyword>
     <RootNamespace>Project1</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -125,4 +125,4 @@
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 
-</Project>
+</Project>

src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj

@@ -37,7 +37,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{CF5DA8D7-1FDF-4E8F-AFE6-450BE16E906A}</ProjectGuid>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <Keyword>ManagedCProj</Keyword>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <RootNamespace>NETCoreCppCliTest</RootNamespace>
@@ -297,4 +297,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestB/NETCoreCppCliTestB.vcxproj

@@ -37,7 +37,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{C8D22D0F-0C2D-4B4A-BF28-14A2D001102B}</ProjectGuid>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <Keyword>ManagedCProj</Keyword>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <RootNamespace>NETCoreCppCliTest</RootNamespace>
@@ -297,4 +297,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestC/NETCoreCppCliTestC.vcxproj

@@ -37,7 +37,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{73B24404-97DE-467A-8251-6542819BCEB4}</ProjectGuid>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <Keyword>ManagedCProj</Keyword>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <RootNamespace>NETCoreCppCliTest</RootNamespace>
@@ -292,4 +292,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

src/Assets/TestProjects/NetCoreCsharpAppReferenceCppCliLib/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj

@@ -13,7 +13,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{CF5DA8D7-1FDF-4E8F-AFE6-450BE16E906A}</ProjectGuid>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>NETCoreCppCliTest</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
@@ -76,4 +76,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs

@@ -177,7 +177,7 @@ private bool ValidateCrossgen2Support()
                 return false;
             }
 
-            // Crossgen2 only supports the following host->target compilation scenarios in netcoreapp5.0:
+            // Crossgen2 only supports the following host->target compilation scenarios in net5.0:
             //      win-x64 -> win-x64
             //      linux-x64 -> linux-x64
             //      linux-musl-x64 -> linux-musl-x64

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACppCliProject.cs

@@ -40,7 +40,7 @@ public void It_builds_and_runs()
             var exe = Path.Combine( //find the platform directory
                 new DirectoryInfo(Path.Combine(testAsset.TestRoot, "CSConsoleApp", "bin")).GetDirectories().Single().FullName,
                 "Debug",
-                "netcoreapp5.0",
+                "net5.0",
                 "CSConsoleApp.exe");
 
             var runCommand = new RunExeCommand(Log, exe);

src/Tests/Microsoft.NET.Build.Tests/GivenWeWantToRequireWindowsForDesktopApps.cs

@@ -103,7 +103,7 @@ public void It_does_not_download_desktop_targeting_packs_on_unix()
             var testProject = new TestProject()
             {
                 Name = ProjectName,
-                TargetFrameworks = "netcoreapp5.0",
+                TargetFrameworks = "net5.0",
                 IsSdkProject = true,
                 IsExe = true,
             };

src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishANetCoreAppForTelemetry.cs

@@ -20,7 +20,7 @@ public GivenThatWeWantToPublishANetCoreAppForTelemetry(ITestOutputHelper log) :
         }
 
         [CoreMSBuildOnlyTheory]
-        [InlineData("netcoreapp5.0")]
+        [InlineData("net5.0")]
         public void It_collects_empty_Trimmer_SingleFile_ReadyToRun_publishing_properties(string targetFramework)
         {
             Type loggerType = typeof(LogTelemetryToStdOutForTest);
@@ -37,7 +37,7 @@ public void It_collects_empty_Trimmer_SingleFile_ReadyToRun_publishing_propertie
         }
 
         [CoreMSBuildOnlyTheory]
-        [InlineData("netcoreapp5.0")]
+        [InlineData("net5.0")]
         public void It_collects_Trimmer_SingleFile_ReadyToRun_publishing_properties(string targetFramework)
         {
             Type loggerType = typeof(LogTelemetryToStdOutForTest);
@@ -61,7 +61,7 @@ public void It_collects_Trimmer_SingleFile_ReadyToRun_publishing_properties(stri
         }
 
         [CoreMSBuildOnlyTheory]
-        [InlineData("netcoreapp5.0")]
+        [InlineData("net5.0")]
         public void It_collects_crossgen2_publishing_properties(string targetFramework)
         {
             // Crossgen2 only supported for Linux/Windows x64 scenarios for now

src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishReadyToRun.cs

@@ -195,7 +195,7 @@ public void It_can_publish_readytorun_for_selfcontained_library_projects(string
         }
 
         [Theory]
-        [InlineData("netcoreapp5.0")]
+        [InlineData("net5.0")]
         public void It_can_publish_readytorun_using_crossgen2(string targetFramework)
         {
             // Crossgen2 only supported for Linux/Windows x64 scenarios for now
@@ -206,7 +206,7 @@ public void It_can_publish_readytorun_using_crossgen2(string targetFramework)
         }
 
         [Theory]
-        [InlineData("netcoreapp5.0")]
+        [InlineData("net5.0")]
         public void It_only_supports_selfcontained_when_using_crossgen2(string targetFramework)
         {
             // Crossgen2 only supported for Linux/Windows x64 scenarios for now

src/Tests/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs

@@ -68,15 +68,23 @@ public void ItRestoresLibToSpecificDirectory(bool useStaticGraphEvaluation)
                 .Should()
                 .Pass();
 
-            string[] args = new[] { "--packages", dir };
+
+            var logpath = Path.Combine(TestContext.GetRepoRoot(), "artifacts", "log", $"ItRestoresLibToSpecificDirectory-{useStaticGraphEvaluation}.binlog");
+            string[] args = new[] {"-v", "diag", $"-bl:{logpath}", "--packages", dir};
             args = HandleStaticGraphEvaluation(useStaticGraphEvaluation, args);
-            new DotnetRestoreCommand(Log)
-                .WithWorkingDirectory(rootPath)
-                .Execute(args)
+            Cli.Utils.CommandResult commandResult = new DotnetRestoreCommand(Log)
+                            .WithWorkingDirectory(rootPath)
+                            .Execute(args);
+            commandResult
                 .Should()
                 .Pass()
                 .And.NotHaveStdErr();
 
+            if (!Directory.Exists(fullPath))
+            {
+                Log.WriteLine(commandResult.StdOut);
+            }
+
             Directory.Exists(fullPath).Should().BeTrue();
             Directory.EnumerateFiles(fullPath, "*.dll", SearchOption.AllDirectories).Count().Should().BeGreaterThan(0);
         }