[main] Update dependencies from dotnet/installer

Directory.Build.targets

@@ -0,0 +1,2 @@
+<!-- This file is to prevent implicit imports from breaking out of the repo root. -->
+<Project />

eng/AuxMsbuildFiles/Directory.Build.props

@@ -0,0 +1,15 @@
+<Project>
+    <!-- Importing arcade depends on the existence of a global.json. Fix
+        this to a set of well known imports when moving to Helix. -->
+    <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+    <PropertyGroup>
+        <BaseOutputPath>bin\</BaseOutputPath>
+        <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+        <OutputPath Condition="'$(PlatformName)' == 'AnyCPU'">$(BaseOutputPath)$(Configuration)\</OutputPath>
+        <OutputPath Condition="'$(PlatformName)' != 'AnyCPU'">$(BaseOutputPath)$(PlatformName)\$(Configuration)\</OutputPath>
+        <IntermediateOutputPath Condition="'$(PlatformName)' == 'AnyCPU'">$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
+        <IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU'">$(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\</IntermediateOutputPath>
+    </PropertyGroup>
+</Project>

eng/AuxMsbuildFiles/Directory.Build.targets

@@ -0,0 +1,5 @@
+<Project>
+    <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+    <Import Project="SdkPackOverrides.targets"/>
+</Project>

eng/AuxMsbuildFiles/SdkPackOverrides.targets

@@ -0,0 +1,27 @@
+<Project InitialTargets="OverrideTestingVersions">
+  <Target Name="OverrideTestingVersions">
+    <ItemGroup>
+      <KnownFrameworkReference>
+        <TargetingPackVersion Condition="'%(TargetFramework)' == 'net6.0'">$(MicrosoftNETCoreApp60Version)</TargetingPackVersion>
+        <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net6.0'">$(MicrosoftNETCoreApp60Version)</LatestRuntimeFrameworkVersion>
+      </KnownFrameworkReference>
+      <KnownAppHostPack>
+        <AppHostPackVersion Condition="'%(TargetFramework)' == 'net6.0'">$(MicrosoftNETCoreApp60Version)</AppHostPackVersion>
+      </KnownAppHostPack>
+      <KnownCrossgen2Pack>
+        <Crossgen2PackVersion Condition="'%(TargetFramework)' == 'net6.0'">$(MicrosoftNETCoreApp60Version)</Crossgen2PackVersion>
+      </KnownCrossgen2Pack>
+      <KnownRuntimePack>
+        <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net6.0'">$(MicrosoftNETCoreApp60Version)</LatestRuntimeFrameworkVersion>
+      </KnownRuntimePack>
+
+      <KnownFrameworkReference>
+        <TargetingPackVersion Condition="'%(TargetFramework)' == 'netcoreapp3.1'">$(MicrosoftNETCoreApp31Version)</TargetingPackVersion>
+        <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'netcoreapp3.1'">$(MicrosoftNETCoreApp31Version)</LatestRuntimeFrameworkVersion>
+      </KnownFrameworkReference>
+      <KnownAppHostPack>
+        <AppHostPackVersion Condition="'%(TargetFramework)' == 'netcoreapp3.1'">$(MicrosoftNETCoreApp31Version)</AppHostPackVersion>
+      </KnownAppHostPack>
+    </ItemGroup>
+  </Target>
+</Project>

eng/Version.Details.xml

@@ -28,9 +28,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22454.1">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rtm.22480.6">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>330dee39e5e4dcf765f4c41c76b94c8e4497e91c</Sha>
+      <Sha>61f59eff2c102046b8b2f6df9c0605ef3b7f6d63</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rtm.22501.6">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>

eng/Versions.props

@@ -24,7 +24,7 @@
     <MicrosoftAspNetCoreAppRefInternalVersion>7.0.0-rtm.22501.6</MicrosoftAspNetCoreAppRefInternalVersion>
     <MicrosoftAspNetCoreAppRefVersion>7.0.0-rtm.22501.6</MicrosoftAspNetCoreAppRefVersion>
     <!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
-    <MicrosoftDotnetSdkInternalVersion>7.0.100-rc.2.22454.1</MicrosoftDotnetSdkInternalVersion>
+    <MicrosoftDotnetSdkInternalVersion>7.0.100-rtm.22480.6</MicrosoftDotnetSdkInternalVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Runtime versions to test -->
@@ -34,7 +34,7 @@
     <MicrosoftAspNetCoreApp60Version>$(MicrosoftNETCoreApp60Version)</MicrosoftAspNetCoreApp60Version>
     <!-- The SDK runtime version used to build single-file apps (currently hardcoded) -->
     <SingleFileRuntime60Version>6.0.8</SingleFileRuntime60Version>
-    <SingleFileRuntimeLatestVersion>7.0.0-rc.1.22422.12</SingleFileRuntimeLatestVersion>
+    <SingleFileRuntimeLatestVersion>7.0.0-rtm.22478.9</SingleFileRuntimeLatestVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Opt-in/out repo features -->

src/Directory.Build.targets

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-    <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
-    <!-- Work around https://github.com/dotnet/sourcelink/issues/572
+  <!-- Work around https://github.com/dotnet/sourcelink/issues/572
   Remove once we build using an SDK that contains https://github.com/dotnet/sdk/pull/10613 -->
   <PropertyGroup>
       <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>

src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs

@@ -76,6 +76,7 @@ public override DotNetBuildDebuggeeTestStep ConfigureDotNetBuildDebuggeeTask(Tes
             string logPath = GetLogPath(config, framework, runtimeIdentifier, debuggeeName);
             return new CsprojBuildDebuggeeTestStep(dotNetPath,
                                                initialSourceDirPath,
+                                               config.DebuggeeMsbuildAuxRoot,
                                                GetDebuggeeNativeLibDirPath(config, debuggeeName),
                                                GetBuildProperties(config, runtimeIdentifier),
                                                runtimeIdentifier,

src/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs

@@ -27,6 +27,7 @@ public class CsprojBuildDebuggeeTestStep : DotNetBuildDebuggeeTestStep
         /// </param>
         public CsprojBuildDebuggeeTestStep(string dotnetToolPath,
                                        string templateSolutionDirPath,
+                                       string debuggeeMsbuildAuxRoot,
                                        string debuggeeNativeLibDirPath,
                                        Dictionary<string,string> buildProperties,
                                        string runtimeIdentifier,
@@ -43,6 +44,7 @@ public CsprojBuildDebuggeeTestStep(string dotnetToolPath,
                                        string logPath) :
             base(dotnetToolPath,
                  templateSolutionDirPath,
+                 debuggeeMsbuildAuxRoot,
                  debuggeeNativeLibDirPath,
                  debuggeeSolutionDirPath,
                  debuggeeProjectDirPath,

src/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs

@@ -72,6 +72,7 @@ public abstract class DotNetBuildDebuggeeTestStep : TestStep
         /// </param>
         public DotNetBuildDebuggeeTestStep(string dotnetToolPath,
                                        string templateSolutionDirPath,
+                                       string debuggeeMsbuildAuxRoot,
                                        string debuggeeNativeLibDirPath,
                                        string debuggeeSolutionDirPath,
                                        string debuggeeProjectDirPath,
@@ -85,6 +86,7 @@ public DotNetBuildDebuggeeTestStep(string dotnetToolPath,
         {
             DotNetToolPath = dotnetToolPath;
             DebuggeeTemplateSolutionDirPath = templateSolutionDirPath;
+            DebuggeeMsbuildAuxRoot = debuggeeMsbuildAuxRoot;
             DebuggeeNativeLibDirPath = debuggeeNativeLibDirPath;
             DebuggeeSolutionDirPath = debuggeeSolutionDirPath;
             DebuggeeProjectDirPath = debuggeeProjectDirPath;
@@ -109,6 +111,10 @@ public DotNetBuildDebuggeeTestStep(string dotnetToolPath,
         /// </summary>
         public string DebuggeeTemplateSolutionDirPath { get; private set; }
         /// <summary>
+        /// The path containing supporting msbuild files for the build
+        /// </summary>
+        public string DebuggeeMsbuildAuxRoot { get; }
+        /// <summary>
         /// The path where the debuggee's native binary dependencies will be copied from.
         /// </summary>
         public string DebuggeeNativeLibDirPath { get; private set; }
@@ -117,6 +123,7 @@ public DotNetBuildDebuggeeTestStep(string dotnetToolPath,
         /// the debuggee project directory.
         /// </summary>
         public string DebuggeeSolutionDirPath { get; private set; }
+
         /// <summary>
         /// The path where the primary debuggee executable project directory will be created. For single project solutions this
         /// will be identical to the debuggee solution directory.
@@ -158,6 +165,7 @@ void PrepareProjectSolution(ITestOutputHelper output)
             output.WriteLine("{");
             IndentedTestOutputHelper indentedOutput = new IndentedTestOutputHelper(output);
             CopySourceDirectory(DebuggeeTemplateSolutionDirPath, DebuggeeSolutionDirPath, indentedOutput);
+            CopySourceDirectory(DebuggeeMsbuildAuxRoot, DebuggeeSolutionDirPath, indentedOutput);
             CreateNuGetConfig(indentedOutput);
             output.WriteLine("}");
             output.WriteLine("");

src/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs

@@ -637,6 +637,14 @@ public string DebuggeeSourceRoot
             get { return MakeCanonicalPath(GetValue("DebuggeeSourceRoot")); }
         }
 
+        /// <summary>
+        /// Auxiliary properties used by CLI based test projects file will be fetched from this path and copied to DebuggeeSourceRoot
+        /// </summary>
+        public string DebuggeeMsbuildAuxRoot
+        {
+            get { return MakeCanonicalPath(GetValue("DebuggeeMsbuildAuxRoot")); }
+        }
+
         /// <summary>
         /// Debuggee final sources/project file/binary outputs will be placed here: <DebuggeeBuildRoot>/<DebuggeeName>/
         /// </summary>

src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt

@@ -30,6 +30,7 @@
   <BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '3.1')">netcoreapp3.1</BuildProjectFrameworkLatest>
 
   <DebuggeeSourceRoot>$(RepoRootDir)/src/SOS/SOS.UnitTests/Debuggees</DebuggeeSourceRoot>
+  <DebuggeeMsbuildAuxRoot>$(RepoRootDir)/eng/AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
   <DebuggeeBuildProcess>sdk.prebuilt</DebuggeeBuildProcess>
   <DebuggeeBuildRoot>$(RootBinDir)</DebuggeeBuildRoot>
 

src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt

@@ -40,6 +40,7 @@
   <DesktopFramework>net462</DesktopFramework>
 
   <DebuggeeSourceRoot>$(RepoRootDir)\src\SOS\SOS.UnitTests\Debuggees</DebuggeeSourceRoot>
+  <DebuggeeMsbuildAuxRoot>$(RepoRootDir)\eng\AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
   <DebuggeeBuildProcess>sdk.prebuilt</DebuggeeBuildProcess>
   <DebuggeeBuildRoot>$(RootBinDir)</DebuggeeBuildRoot>
 

src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props

@@ -1,6 +1,7 @@
 <Project>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\Directory.Build.props"/>
-
+  <Import Project="$(RepoRoot)/eng/AuxMsbuildFiles/SdkPackOverrides.targets"/>
+
   <PropertyGroup>
     <DebugType Condition="'$(TargetFramework)' == 'net462'">full</DebugType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt

@@ -15,6 +15,7 @@
 
   <TestProduct>ProjectK</TestProduct>
   <DebuggeeSourceRoot>$(RepoRootDir)/src/tests</DebuggeeSourceRoot>
+  <DebuggeeMsbuildAuxRoot>$(RepoRootDir)/eng/AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
   <DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
   <DebuggeeBuildProcess>sdk.prebuilt</DebuggeeBuildProcess>
   <DebuggeeBuildRoot>$(RootBinDir)</DebuggeeBuildRoot>

src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt

@@ -16,6 +16,7 @@
 
   <TestProduct>ProjectK</TestProduct>
   <DebuggeeSourceRoot>$(RepoRootDir)\src\tests</DebuggeeSourceRoot>
+  <DebuggeeMsbuildAuxRoot>$(RepoRootDir)\eng\AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
   <DebuggeeBuildProcess>sdk.prebuilt</DebuggeeBuildProcess>
   <DebuggeeBuildRoot>$(RootBinDir)</DebuggeeBuildRoot>
   <CliPath>$(DotNetRoot)\dotnet.exe</CliPath>

src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt

@@ -12,6 +12,7 @@
 
   <TestProduct>ProjectK</TestProduct>
   <DebuggeeSourceRoot>$(RepoRootDir)\src\tests\DbgShim.UnitTests\Debuggees</DebuggeeSourceRoot>
+  <DebuggeeMsbuildAuxRoot>$(RepoRootDir)\eng\AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
   <DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
   <DebuggeeName>SimpleDebuggee</DebuggeeName>
 

src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt

@@ -13,6 +13,7 @@
 
   <TestProduct>ProjectK</TestProduct>
   <DebuggeeSourceRoot>$(RepoRootDir)\src\tests\DbgShim.UnitTests\Debuggees</DebuggeeSourceRoot>
+  <DebuggeeMsbuildAuxRoot>$(RepoRootDir)\eng\AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
   <DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
   <DebuggeeName>SimpleDebuggee</DebuggeeName>