diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 0000000000..62fa468efc
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/eng/AuxMsbuildFiles/Directory.Build.props b/eng/AuxMsbuildFiles/Directory.Build.props
new file mode 100644
index 0000000000..8231a8a4fd
--- /dev/null
+++ b/eng/AuxMsbuildFiles/Directory.Build.props
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+ bin\
+ obj\
+ $(BaseOutputPath)$(Configuration)\
+ $(BaseOutputPath)$(PlatformName)\$(Configuration)\
+ $(BaseIntermediateOutputPath)$(Configuration)\
+ $(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\
+
+
\ No newline at end of file
diff --git a/eng/AuxMsbuildFiles/Directory.Build.targets b/eng/AuxMsbuildFiles/Directory.Build.targets
new file mode 100644
index 0000000000..f098fa72fc
--- /dev/null
+++ b/eng/AuxMsbuildFiles/Directory.Build.targets
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/eng/AuxMsbuildFiles/SdkPackOverrides.targets b/eng/AuxMsbuildFiles/SdkPackOverrides.targets
new file mode 100644
index 0000000000..6251cd2389
--- /dev/null
+++ b/eng/AuxMsbuildFiles/SdkPackOverrides.targets
@@ -0,0 +1,26 @@
+
+
+
+
+ $(MicrosoftNETCoreApp60Version)
+ $(MicrosoftNETCoreApp60Version)
+
+
+ $(MicrosoftNETCoreApp60Version)
+
+
+ $(MicrosoftNETCoreApp60Version)
+
+
+ $(MicrosoftNETCoreApp60Version)
+
+
+
+ $(MicrosoftNETCoreApp31Version)
+
+
+ $(MicrosoftNETCoreApp31Version)
+
+
+
+
\ No newline at end of file
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1ac66c552d..97cb2fb1b8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -28,9 +28,9 @@
https://github.com/dotnet/arcade
ccfe6da198c5f05534863bbb1bff66e830e0c6ab
-
+
https://github.com/dotnet/installer
- 330dee39e5e4dcf765f4c41c76b94c8e4497e91c
+ 61f59eff2c102046b8b2f6df9c0605ef3b7f6d63
https://github.com/dotnet/aspnetcore
diff --git a/eng/Versions.props b/eng/Versions.props
index 25cbdd82d0..cf18209d6e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,7 +24,7 @@
7.0.0-rtm.22501.6
7.0.0-rtm.22501.6
- 7.0.100-rc.2.22454.1
+ 7.0.100-rtm.22480.6
@@ -34,7 +34,7 @@
$(MicrosoftNETCoreApp60Version)
6.0.8
- 7.0.0-rc.1.22422.12
+ 7.0.0-rtm.22478.9
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 6f6f369a60..90cbe3259d 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -1,8 +1,8 @@
-
+
-
$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))
diff --git a/src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs b/src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs
index 6a7716ee14..c1ec9a9023 100644
--- a/src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs
+++ b/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,
diff --git a/src/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs b/src/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs
index a0d566dc65..8f00b98a5d 100644
--- a/src/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs
+++ b/src/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs
@@ -27,6 +27,7 @@ public class CsprojBuildDebuggeeTestStep : DotNetBuildDebuggeeTestStep
///
public CsprojBuildDebuggeeTestStep(string dotnetToolPath,
string templateSolutionDirPath,
+ string debuggeeMsbuildAuxRoot,
string debuggeeNativeLibDirPath,
Dictionary buildProperties,
string runtimeIdentifier,
@@ -43,6 +44,7 @@ public CsprojBuildDebuggeeTestStep(string dotnetToolPath,
string logPath) :
base(dotnetToolPath,
templateSolutionDirPath,
+ debuggeeMsbuildAuxRoot,
debuggeeNativeLibDirPath,
debuggeeSolutionDirPath,
debuggeeProjectDirPath,
diff --git a/src/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs b/src/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs
index b2a3cb234d..86217d58bd 100644
--- a/src/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs
+++ b/src/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs
@@ -72,6 +72,7 @@ public abstract class DotNetBuildDebuggeeTestStep : TestStep
///
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,
///
public string DebuggeeTemplateSolutionDirPath { get; private set; }
///
+ /// The path containing supporting msbuild files for the build
+ ///
+ public string DebuggeeMsbuildAuxRoot { get; }
+ ///
/// The path where the debuggee's native binary dependencies will be copied from.
///
public string DebuggeeNativeLibDirPath { get; private set; }
@@ -117,6 +123,7 @@ public DotNetBuildDebuggeeTestStep(string dotnetToolPath,
/// the debuggee project directory.
///
public string DebuggeeSolutionDirPath { get; private set; }
+
///
/// 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("");
diff --git a/src/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs b/src/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs
index 95b41a190a..071f6ad344 100644
--- a/src/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs
+++ b/src/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs
@@ -637,6 +637,14 @@ public string DebuggeeSourceRoot
get { return MakeCanonicalPath(GetValue("DebuggeeSourceRoot")); }
}
+ ///
+ /// Auxiliary properties used by CLI based test projects file will be fetched from this path and copied to DebuggeeSourceRoot
+ ///
+ public string DebuggeeMsbuildAuxRoot
+ {
+ get { return MakeCanonicalPath(GetValue("DebuggeeMsbuildAuxRoot")); }
+ }
+
///
/// Debuggee final sources/project file/binary outputs will be placed here: //
///
diff --git a/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
index 3e76b20f05..873b2f3b36 100644
--- a/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
+++ b/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
@@ -30,6 +30,7 @@
netcoreapp3.1
$(RepoRootDir)/src/SOS/SOS.UnitTests/Debuggees
+ $(RepoRootDir)/eng/AuxMsbuildFiles
sdk.prebuilt
$(RootBinDir)
diff --git a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
index cc7ae9f566..50ba15ace4 100644
--- a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
+++ b/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
@@ -40,6 +40,7 @@
net462
$(RepoRootDir)\src\SOS\SOS.UnitTests\Debuggees
+ $(RepoRootDir)\eng\AuxMsbuildFiles
sdk.prebuilt
$(RootBinDir)
diff --git a/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props b/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props
index 95a0a487ff..89b039761e 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props
+++ b/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props
@@ -1,6 +1,7 @@
-
+
+
full
true
diff --git a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt
index 1518328255..5fddf13339 100644
--- a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt
+++ b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt
@@ -15,6 +15,7 @@
ProjectK
$(RepoRootDir)/src/tests
+ $(RepoRootDir)/eng/AuxMsbuildFiles
cli
sdk.prebuilt
$(RootBinDir)
diff --git a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt
index fc0ad14297..ea51d1d00f 100644
--- a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt
+++ b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt
@@ -16,6 +16,7 @@
ProjectK
$(RepoRootDir)\src\tests
+ $(RepoRootDir)\eng\AuxMsbuildFiles
sdk.prebuilt
$(RootBinDir)
$(DotNetRoot)\dotnet.exe
diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
index 8638e73682..31decaa95b 100644
--- a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
+++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
@@ -12,6 +12,7 @@
ProjectK
$(RepoRootDir)\src\tests\DbgShim.UnitTests\Debuggees
+ $(RepoRootDir)\eng\AuxMsbuildFiles
cli
SimpleDebuggee
diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
index fd6e1343ec..53d6d646f0 100644
--- a/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
+++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
@@ -13,6 +13,7 @@
ProjectK
$(RepoRootDir)\src\tests\DbgShim.UnitTests\Debuggees
+ $(RepoRootDir)\eng\AuxMsbuildFiles
cli
SimpleDebuggee