diff --git a/src/xunit.runner.visualstudio/VsTestRunner.cs b/src/xunit.runner.visualstudio/VsTestRunner.cs
index 02fa9444..c6f90fb4 100644
--- a/src/xunit.runner.visualstudio/VsTestRunner.cs
+++ b/src/xunit.runner.visualstudio/VsTestRunner.cs
@@ -638,30 +638,6 @@ void handler()
logger.LogWarning(message);
}
- // Look for runners that might be embedded in ourselves (because of ILRepack). This is what the code
- // in RunnerReporterUtility.GetAvailableRunnerReporters does after it finds a target assembly.
- foreach (var type in adapterAssembly.GetTypes())
- {
- if (type is null || type.IsAbstract || !type.GetInterfaces().Any(t => t == typeof(IRunnerReporter)))
- continue;
-
- try
- {
- var ctor = type.GetConstructor(new Type[0]);
- if (ctor is null)
- {
- logger?.LogWarning($"Type '{type.FullName ?? type.Name}' in the adapter assembly appears to be a runner reporter, but does not have an empty constructor.");
- continue;
- }
-
- result.Add((IRunnerReporter)ctor.Invoke(new object[0]));
- }
- catch (Exception ex)
- {
- logger?.LogWarning($"Exception thrown while inspecting type '{type.FullName ?? type.Name}' in the adapter assembly:{Environment.NewLine}{ex}");
- }
- }
-
return result;
}
diff --git a/src/xunit.runner.visualstudio/build/xunit.runner.visualstudio.desktop.props b/src/xunit.runner.visualstudio/build/xunit.runner.visualstudio.desktop.props
index fe1ba8ed..75d06f03 100644
--- a/src/xunit.runner.visualstudio/build/xunit.runner.visualstudio.desktop.props
+++ b/src/xunit.runner.visualstudio/build/xunit.runner.visualstudio.desktop.props
@@ -11,6 +11,16 @@
PreserveNewest
False
+
+ xunit.runner.reporters.net452.dll
+ PreserveNewest
+ False
+
+
+ xunit.runner.utility.net452.dll
+ PreserveNewest
+ False
+
diff --git a/src/xunit.runner.visualstudio/build/xunit.runner.visualstudio.dotnetcore.props b/src/xunit.runner.visualstudio/build/xunit.runner.visualstudio.dotnetcore.props
index 7aa92d64..410a2532 100644
--- a/src/xunit.runner.visualstudio/build/xunit.runner.visualstudio.dotnetcore.props
+++ b/src/xunit.runner.visualstudio/build/xunit.runner.visualstudio.dotnetcore.props
@@ -6,6 +6,16 @@
PreserveNewest
False
+
+ xunit.runner.reporters.netcoreapp10.dll
+ PreserveNewest
+ False
+
+
+ xunit.runner.utility.netcoreapp10.dll
+ PreserveNewest
+ False
+
diff --git a/src/xunit.runner.visualstudio/xunit.runner.visualstudio.csproj b/src/xunit.runner.visualstudio/xunit.runner.visualstudio.csproj
index 849367d1..291bac64 100644
--- a/src/xunit.runner.visualstudio/xunit.runner.visualstudio.csproj
+++ b/src/xunit.runner.visualstudio/xunit.runner.visualstudio.csproj
@@ -22,7 +22,7 @@
-
+
@@ -56,47 +56,9 @@
Configuration=$(Configuration);
GitCommitId=$(GitCommitId);
PackageVersion=$(PackageVersion);
+ XunitVersion=$(XunitVersion);
-
-
-
- $([System.IO.Path]::Combine($(TargetDir), "merged", "$(TargetFileName)"))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $([System.IO.Path]::Combine($(NuGetPackageRoot), "ilrepack.msbuild.task", $(ILRepackVersion), "tools", "ilrepack.exe"))
- mono $(ILRepackExe)
- $([System.IO.Path]::Combine($(TargetDir), "premerge", "$(TargetFileName)"))
- $([System.IO.Path]::Combine($(TargetDir), "merged", "$(TargetFileName)"))
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/xunit.runner.visualstudio/xunit.runner.visualstudio.nuspec b/src/xunit.runner.visualstudio/xunit.runner.visualstudio.nuspec
index 7f66020c..f72bccfc 100644
--- a/src/xunit.runner.visualstudio/xunit.runner.visualstudio.nuspec
+++ b/src/xunit.runner.visualstudio/xunit.runner.visualstudio.nuspec
@@ -27,10 +27,10 @@
-
+
-
+
diff --git a/test/test.harness/test.harness.csproj b/test/test.harness/test.harness.csproj
index 26ad2717..ce95c80b 100644
--- a/test/test.harness/test.harness.csproj
+++ b/test/test.harness/test.harness.csproj
@@ -4,6 +4,10 @@
net462;net472;net6.0
+
+
+
+
diff --git a/test/test.testcasefilter/test.testcasefilter.csproj b/test/test.testcasefilter/test.testcasefilter.csproj
index af715a18..7ba02960 100644
--- a/test/test.testcasefilter/test.testcasefilter.csproj
+++ b/test/test.testcasefilter/test.testcasefilter.csproj
@@ -5,31 +5,12 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+