[release/11.0.1xx-preview2] Source code updates from dotnet/dotnet

eng/Versions.props

@@ -34,9 +34,9 @@
     <VersionFeature60>36</VersionFeature60>
     <VersionFeature70>20</VersionFeature70>
     <!-- This version should be N-1 (ie the currently released version) in the preview branch but N-2 in main so that workloads stay behind the unreleased version -->
-    <VersionFeature80>23</VersionFeature80>
-    <VersionFeature90>12</VersionFeature90>
-    <VersionFeature100>2</VersionFeature100>
+    <VersionFeature80>24</VersionFeature80>
+    <VersionFeature90>13</VersionFeature90>
+    <VersionFeature100>3</VersionFeature100>
     <!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
          referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
     <_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>

global.json

@@ -21,8 +21,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26122.107",
-    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26122.107",
+    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26159.112",
+    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26159.112",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
     "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"

src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.cs

@@ -441,7 +441,8 @@ public static bool IsPathOption(string arg, out int colonIndex)
 
     private static string ComputeRuntimeVersion()
     {
-        var executingRuntimeVersion = RuntimeInformation.FrameworkDescription.Split(' ').Last();
+        var executingRuntimeVersion = Path.GetFileName(Path.GetDirectoryName(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()));
+        Debug.Assert(!string.IsNullOrWhiteSpace(executingRuntimeVersion));
         var executingRuntimeMajorVersion = executingRuntimeVersion.Split('.').First();
         var tfmMajorVersion = TargetFrameworkVersion.Split('.').First();
 

src/Layout/redist/targets/GenerateInstallerLayout.targets

@@ -97,7 +97,7 @@
                             ReplaceBundledRuntimePackFilesWithSymbolicLinks"
           AfterTargets="AfterBuild">
     <!-- TODO: This will eventually be done for all platforms as part of the deduplication work (https://github.com/dotnet/sdk/issues/52183). -->
-    <DeduplicateAssembliesWithLinks Condition="!$([MSBuild]::IsOSPlatform('Windows'))" LayoutDirectory="$(RedistInstallerLayoutPath)sdk\" UseHardLinks="false" />
+    <DeduplicateAssembliesWithLinks Condition="!$([MSBuild]::IsOSPlatform('Windows')) and !$([MSBuild]::IsOSPlatform('OSX'))" LayoutDirectory="$(RedistInstallerLayoutPath)sdk\" UseHardLinks="false" />
   </Target>
 
   <!-- Copy the sdk layout into a temporary folder so that it's nested under "sdk\$(Version)\" which is

src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.SourceGenerators.targets

@@ -21,14 +21,6 @@ Copyright (c) .NET Foundation. All rights reserved.
       <ProvideApplicationPartFactoryAttributeTypeName Condition="'$(ProvideApplicationPartFactoryAttributeTypeName)' == ''">Microsoft.AspNetCore.Mvc.ApplicationParts.ConsolidatedAssemblyApplicationPartFactory, Microsoft.AspNetCore.Mvc.Razor</ProvideApplicationPartFactoryAttributeTypeName>
     </PropertyGroup>
 
-    <PropertyGroup>
-      <RazorEncConfigFile>$(_RazorSdkSourceGeneratorDirectoryRoot)RazorSourceGenerator.razorencconfig</RazorEncConfigFile>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <EditorConfigFiles Include="$(RazorEncConfigFile)" Condition="'$(DesignTimeBuild)' == 'true' AND '$(BuildingInsideVisualStudio)' == 'true'"/>
-    </ItemGroup>
-
     <ItemGroup>
       <_RazorAnalyzer Include="$(_RazorSdkSourceGeneratorDirectoryRoot)*.dll" />
     </ItemGroup>

src/Workloads/VSInsertion/workloads.csproj

@@ -565,6 +565,7 @@
       NoLogo="true"
       Cultures="en-us"
       InstallerFile="$(_Msi)"
+      SuppressValidation="true"
       WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
       WixSrcFiles="@(_WixObj)">
       <Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />

test/EndToEnd.Tests/GivenDotNetMacInstallers.cs

@@ -6,42 +6,43 @@
 
 namespace EndToEnd.Tests;
 
-public class GivenDotNetMacInstallers(ITestOutputHelper log) : SdkTest(log)
-{
-    [Fact]
-    public void PkgPackagePreservesSymbolicLinks() =>
-        SymbolicLinkHelpers.VerifyInstallerSymlinks(
-            OSPlatform.OSX,
-            "dotnet-sdk-*.pkg",
-            excludeSubstrings: ["-internal"],
-            ExtractPkgPackage,
-            TestAssetsManager,
-            Log);
+// TODO: Disabled for 11.0.100-preview.2 - https://github.com/dotnet/dotnet/issues/5281
+// public class GivenDotNetMacInstallers(ITestOutputHelper log) : SdkTest(log)
+// {
+//     [Fact]
+//     public void PkgPackagePreservesSymbolicLinks() =>
+//         SymbolicLinkHelpers.VerifyInstallerSymlinks(
+//             OSPlatform.OSX,
+//             "dotnet-sdk-*.pkg",
+//             excludeSubstrings: ["-internal"],
+//             ExtractPkgPackage,
+//             TestAssetsManager,
+//             Log);
 
-    private void ExtractPkgPackage(string installerPath, string tempDir)
-    {
-        // Expand the pkg using pkgutil
-        var expandedDir = Path.Combine(tempDir, "expanded");
-        new RunExeCommand(Log, "pkgutil")
-            .Execute("--expand", installerPath, expandedDir)
-            .Should().Pass();
+//     private void ExtractPkgPackage(string installerPath, string tempDir)
+//     {
+//         // Expand the pkg using pkgutil
+//         var expandedDir = Path.Combine(tempDir, "expanded");
+//         new RunExeCommand(Log, "pkgutil")
+//             .Execute("--expand", installerPath, expandedDir)
+//             .Should().Pass();
 
-        // Find and extract the Payload from each component
-        // pkg files contain one or more component directories, each with a Payload file
-        var payloadFiles = Directory.GetFiles(expandedDir, "Payload", SearchOption.AllDirectories);
+//         // Find and extract the Payload from each component
+//         // pkg files contain one or more component directories, each with a Payload file
+//         var payloadFiles = Directory.GetFiles(expandedDir, "Payload", SearchOption.AllDirectories);
 
-        foreach (var payloadFile in payloadFiles)
-        {
-            var componentDir = Path.GetDirectoryName(payloadFile)!;
-            var componentName = Path.GetFileName(componentDir);
-            var extractDir = Path.Combine(tempDir, "data", componentName);
-            Directory.CreateDirectory(extractDir);
+//         foreach (var payloadFile in payloadFiles)
+//         {
+//             var componentDir = Path.GetDirectoryName(payloadFile)!;
+//             var componentName = Path.GetFileName(componentDir);
+//             var extractDir = Path.Combine(tempDir, "data", componentName);
+//             Directory.CreateDirectory(extractDir);
 
-            // Payload is a cpio archive (possibly compressed)
-            // Use ditto which handles Apple's archive formats well
-            new RunExeCommand(Log, "ditto")
-                .Execute("-x", payloadFile, extractDir)
-                .Should().Pass();
-        }
-    }
-}
+//             // Payload is a cpio archive (possibly compressed)
+//             // Use ditto which handles Apple's archive formats well
+//             new RunExeCommand(Log, "ditto")
+//                 .Execute("-x", payloadFile, extractDir)
+//                 .Should().Pass();
+//         }
+//     }
+// }

test/EndToEnd.Tests/GivenSdkArchives.cs

@@ -11,7 +11,7 @@ public class GivenSdkArchives(ITestOutputHelper log) : SdkTest(log)
     [Fact]
     public void ItHasDeduplicatedAssemblies()
     {
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
         {
             Log.WriteLine("SKIPPED: Windows deduplication not yet supported (https://github.com/dotnet/sdk/issues/52182)");
             return;