diff --git a/samples/MvcSandbox/MvcSandbox.xproj b/samples/MvcSandbox/MvcSandbox.xproj
index a865e6544b..3a5dcc6cba 100644
--- a/samples/MvcSandbox/MvcSandbox.xproj
+++ b/samples/MvcSandbox/MvcSandbox.xproj
@@ -7,8 +7,8 @@
14ed4476-9f24-4776-8417-ea6927f6c9c9
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
@@ -17,6 +17,7 @@
+
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.xproj b/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.xproj
index 1ee5c0e865..ad8898d68e 100644
--- a/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.xproj
@@ -7,8 +7,8 @@
1154203c-7579-4525-906e-bc55268421c1
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.xproj b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.xproj
index 80131cb34e..72616251cb 100644
--- a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.xproj
@@ -7,8 +7,8 @@
a2b72833-5d70-4c42-ae85-e0319926fb8a
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.xproj b/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.xproj
index bf97c00daf..8ff6047a97 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.xproj
@@ -7,8 +7,8 @@
c48da9d7-acb5-4408-aa79-27ecb60a67ef
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.xproj b/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.xproj
index b784dd72d6..61f3bea519 100644
--- a/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.xproj
@@ -7,8 +7,8 @@
9a07eea2-942e-4969-9d41-799b6e2d1ff5
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.xproj b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.xproj
index 128be672f9..4c89b8ab48 100644
--- a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.xproj
@@ -7,8 +7,8 @@
2dd786ca-7af7-437a-b499-801a589b9a1c
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.xproj b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.xproj
index abb9ea1973..13f2ff9f77 100644
--- a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.xproj
@@ -7,8 +7,8 @@
3fc8d9d6-9352-43a3-8e81-422f270085b7
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.xproj b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.xproj
index c6dc526576..67a17566fe 100644
--- a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.xproj
@@ -7,8 +7,8 @@
42c81540-cd47-4c68-a7a3-2a93b9c3b210
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.xproj b/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.xproj
index 997bd7331d..02dfc31105 100644
--- a/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.xproj
@@ -7,8 +7,8 @@
50893b10-5735-4f35-9995-f81da3f0189e
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Host/Microsoft.AspNetCore.Mvc.Razor.Host.xproj b/src/Microsoft.AspNetCore.Mvc.Razor.Host/Microsoft.AspNetCore.Mvc.Razor.Host.xproj
index 9ee37b0e05..b23a426193 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Host/Microsoft.AspNetCore.Mvc.Razor.Host.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Host/Microsoft.AspNetCore.Mvc.Razor.Host.xproj
@@ -7,8 +7,8 @@
520b3aa4-363a-497c-8c15-80423c5afc85
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.xproj b/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.xproj
index ef9aa545e7..d3a2b16a6b 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.xproj
@@ -7,8 +7,8 @@
314e9ad6-2ffc-4a92-a8ad-510658c64f1e
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.xproj b/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.xproj
index c5c886e6d5..f833422169 100644
--- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.xproj
@@ -7,8 +7,8 @@
b2347320-308e-4d2b-aec8-005dfa68b0c9
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.xproj b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.xproj
index 1143068d7f..9226bffc38 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.xproj
@@ -8,8 +8,8 @@
3f8b8fc1-9fe4-4788-8991-367113e8d7ad
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.xproj b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.xproj
index 634aa9ddf0..2ee6c60a43 100644
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.xproj
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.xproj
@@ -7,8 +7,8 @@
23d30b8c-04b1-4577-a604-ed27ea1e4a0e
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.xproj b/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.xproj
index b9c6193bd8..7523e5fb8f 100644
--- a/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.xproj
+++ b/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.xproj
@@ -7,8 +7,8 @@
079efa1f-0b0a-4853-b27b-5780d111cd85
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.xproj b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.xproj
index a5e008e361..2c1a1b5f6b 100644
--- a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.xproj
@@ -7,8 +7,8 @@
da000953-7532-4df5-8db9-8143df98d999
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.xproj b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.xproj
index 942068ab96..85117c8ec5 100644
--- a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.xproj
@@ -7,8 +7,8 @@
4c2ad8ab-8ac0-46c4-80c6-c5577c7255f6
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.xproj b/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.xproj
index 89acc5f2f2..7a89944c5a 100644
--- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.xproj
@@ -7,8 +7,8 @@
a8aa326e-8ee8-4f11-b750-23028e0949d7
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.xproj b/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.xproj
index ec972dc608..014f4d66cb 100644
--- a/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.xproj
@@ -7,8 +7,8 @@
6bb4c20b-24c0-45d6-9e4c-c2620959bdd5
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.xproj b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.xproj
index 846a522225..f018adf377 100644
--- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.xproj
@@ -7,8 +7,8 @@
827dbbcb-f3a9-4bad-8262-4bd43e28eb3b
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.xproj b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.xproj
index 4331f2fa1f..52d105c3de 100644
--- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.xproj
@@ -7,8 +7,8 @@
493780da-e696-40ff-bd12-4a5c5736f292
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.xproj b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.xproj
index eebff64cad..5c58b99fd4 100644
--- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.xproj
@@ -7,8 +7,8 @@
22019146-bdfa-442e-8c8e-345fb9644578
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.xproj
index 8ff735758a..8ab62f3c95 100644
--- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.xproj
@@ -7,8 +7,8 @@
323d0c04-b518-4a8f-8a8e-3546ad153d34
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.xproj b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.xproj
index e87da668e4..cbaf77b56e 100644
--- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.xproj
@@ -7,8 +7,8 @@
864fa09d-1e48-403a-a6c8-4f079d2a30f0
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.xproj b/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.xproj
index e80bcc3842..379b26f1e9 100644
--- a/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.xproj
@@ -7,8 +7,8 @@
8fc726b5-e766-44e0-8b38-1313b6d8d9a7
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/Microsoft.AspNetCore.Mvc.Razor.Host.Test.xproj b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/Microsoft.AspNetCore.Mvc.Razor.Host.Test.xproj
index 721c9f0da3..58ef069804 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/Microsoft.AspNetCore.Mvc.Razor.Host.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/Microsoft.AspNetCore.Mvc.Razor.Host.Test.xproj
@@ -7,8 +7,8 @@
7c4f5973-0491-4028-b1dc-a9ba73ff9f77
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.xproj b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.xproj
index 25a9d03e5a..4120646002 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.xproj
@@ -7,8 +7,8 @@
3f6e355e-4869-41d9-943b-d54771221a7f
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.xproj b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.xproj
index 66cc5c5d0c..d84ab9df6a 100644
--- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.xproj
@@ -7,8 +7,8 @@
860119ed-3db1-424d-8d0a-30132a8a7d96
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.xproj b/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.xproj
index 501f619769..dbe1ad4107 100644
--- a/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.xproj
@@ -7,8 +7,8 @@
5f945b82-fe5f-425c-956c-8bc2f2020254
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.xproj b/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.xproj
index 6aa3bb46a4..0f22392ddf 100644
--- a/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.xproj
@@ -7,8 +7,8 @@
f504357e-c2e1-4818-ba5c-9a2eac25fee5
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources.xproj b/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources.xproj
index 55d04c07ba..f816325f17 100644
--- a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources.xproj
@@ -7,8 +7,8 @@
9879b5d5-2325-4a81-b4df-f279fe8feeb4
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.xproj b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.xproj
index d547727f74..3848bac60f 100644
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.xproj
@@ -7,8 +7,8 @@
60873dfa-97b9-419e-baa3-940fc9b07085
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.xproj b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.xproj
index 34ea51e6e4..53c962ae99 100644
--- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.xproj
+++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.xproj
@@ -7,8 +7,8 @@
5de8e4d9-aacd-4b5f-819f-f091383fb996
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.xproj b/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.xproj
index a6522785d7..27f7ea36e5 100644
--- a/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.xproj
+++ b/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.xproj
@@ -7,8 +7,8 @@
61061528-071e-424e-965a-07bcc2f02672
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.xproj b/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.xproj
index e3c483322f..c58f05f6b3 100644
--- a/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.xproj
+++ b/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.xproj
@@ -7,8 +7,8 @@
cae52cb7-0fac-4b5b-8251-b0ff837db657
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/BasicWebSite/BasicWebSite.xproj b/test/WebSites/BasicWebSite/BasicWebSite.xproj
index bf27910068..1339118d93 100644
--- a/test/WebSites/BasicWebSite/BasicWebSite.xproj
+++ b/test/WebSites/BasicWebSite/BasicWebSite.xproj
@@ -7,8 +7,8 @@
34df1487-12c6-476c-be0a-f31df1939ae5
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.xproj b/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.xproj
index d6aec3f977..04ebf597c4 100644
--- a/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.xproj
+++ b/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.xproj
@@ -7,8 +7,8 @@
551dc89e-2a13-4cf2-83d7-1add802443d5
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.xproj b/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.xproj
index 21201885c0..0b8525ee17 100644
--- a/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.xproj
+++ b/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.xproj
@@ -7,8 +7,8 @@
983741b2-4424-4ed1-9b03-7675a67230c8
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/CorsWebSite/CorsWebSite.xproj b/test/WebSites/CorsWebSite/CorsWebSite.xproj
index 3cbee076f0..e90b25cc7a 100644
--- a/test/WebSites/CorsWebSite/CorsWebSite.xproj
+++ b/test/WebSites/CorsWebSite/CorsWebSite.xproj
@@ -7,8 +7,8 @@
94ba134d-04b3-48aa-ba55-5a4db8640f2d
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.xproj b/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.xproj
index 9a4933a9b8..34616f76d0 100644
--- a/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.xproj
+++ b/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.xproj
@@ -7,8 +7,8 @@
ad545a5b-2ba5-4314-88ac-fc2acf2cc718
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/FilesWebSite/FilesWebSite.xproj b/test/WebSites/FilesWebSite/FilesWebSite.xproj
index 06e60b0f32..3f01d4da21 100644
--- a/test/WebSites/FilesWebSite/FilesWebSite.xproj
+++ b/test/WebSites/FilesWebSite/FilesWebSite.xproj
@@ -7,8 +7,8 @@
0ef9860b-10d7-452f-b0f4-a405b88bebb3
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/FiltersWebSite/FiltersWebSite.xproj b/test/WebSites/FiltersWebSite/FiltersWebSite.xproj
index 3b682d7e3f..c489c64f69 100644
--- a/test/WebSites/FiltersWebSite/FiltersWebSite.xproj
+++ b/test/WebSites/FiltersWebSite/FiltersWebSite.xproj
@@ -7,8 +7,8 @@
1976ac4a-fea4-4587-a158-d9f79736d2b6
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/FormatterWebSite/FormatterWebSite.xproj b/test/WebSites/FormatterWebSite/FormatterWebSite.xproj
index 011af7dbf4..633ae52a19 100644
--- a/test/WebSites/FormatterWebSite/FormatterWebSite.xproj
+++ b/test/WebSites/FormatterWebSite/FormatterWebSite.xproj
@@ -7,8 +7,8 @@
62735776-46ff-4170-9392-02e128a69b89
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.xproj b/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.xproj
index fd66e9ae54..3ee63dd926 100644
--- a/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.xproj
+++ b/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.xproj
@@ -7,8 +7,8 @@
920f8a0e-6f7d-4bbe-84ff-840b89099be6
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/Microsoft.AspNetCore.Mvc.TestConfiguration.xproj b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/Microsoft.AspNetCore.Mvc.TestConfiguration.xproj
index 1f32c9cd0d..36f46b3956 100644
--- a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/Microsoft.AspNetCore.Mvc.TestConfiguration.xproj
+++ b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/Microsoft.AspNetCore.Mvc.TestConfiguration.xproj
@@ -7,8 +7,8 @@
680d75ed-601f-4d86-b01b-1072d0c31b8c
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.xproj b/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.xproj
index b6c7ecc9b3..34daba6490 100644
--- a/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.xproj
+++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.xproj
@@ -7,8 +7,8 @@
2b2b9876-903c-4065-8d62-2ee832bba106
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/RazorWebSite/RazorWebSite.xproj b/test/WebSites/RazorWebSite/RazorWebSite.xproj
index 6b75fb9ca4..6cfa011767 100644
--- a/test/WebSites/RazorWebSite/RazorWebSite.xproj
+++ b/test/WebSites/RazorWebSite/RazorWebSite.xproj
@@ -7,8 +7,8 @@
b07caf59-11ed-40e3-a5db-e1178f84fa78
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/RoutingWebSite/RoutingWebSite.xproj b/test/WebSites/RoutingWebSite/RoutingWebSite.xproj
index 8eb0e34975..f7c52f77a8 100644
--- a/test/WebSites/RoutingWebSite/RoutingWebSite.xproj
+++ b/test/WebSites/RoutingWebSite/RoutingWebSite.xproj
@@ -7,8 +7,8 @@
42cdbf4a-e238-4c0f-a416-44588363eb4c
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/SimpleWebSite/SimpleWebSite.xproj b/test/WebSites/SimpleWebSite/SimpleWebSite.xproj
index 06e78634fd..bd383aa191 100644
--- a/test/WebSites/SimpleWebSite/SimpleWebSite.xproj
+++ b/test/WebSites/SimpleWebSite/SimpleWebSite.xproj
@@ -7,8 +7,8 @@
396b40d7-ac70-49a7-b33c-ed42129febe3
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.xproj b/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.xproj
index 05c9b28fb1..c192037118 100644
--- a/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.xproj
+++ b/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.xproj
@@ -7,8 +7,8 @@
6db9b8d0-80f7-4e70-bbb0-0b4c04d79a47
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/UserClassLibrary/UserClassLibrary.xproj b/test/WebSites/UserClassLibrary/UserClassLibrary.xproj
index ae2724e49f..35010d81c0 100644
--- a/test/WebSites/UserClassLibrary/UserClassLibrary.xproj
+++ b/test/WebSites/UserClassLibrary/UserClassLibrary.xproj
@@ -7,8 +7,8 @@
c651f432-4ebe-41a6-bad2-3e07ccba209c
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/VersioningWebSite/VersioningWebSite.xproj b/test/WebSites/VersioningWebSite/VersioningWebSite.xproj
index 477a6bb0e2..c651999566 100644
--- a/test/WebSites/VersioningWebSite/VersioningWebSite.xproj
+++ b/test/WebSites/VersioningWebSite/VersioningWebSite.xproj
@@ -7,8 +7,8 @@
c6304029-78c8-4604-99be-2078dca1dd36
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.xproj b/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.xproj
index f051ef6d23..13e4ff4185 100644
--- a/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.xproj
+++ b/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.xproj
@@ -7,8 +7,8 @@
b2b7bc91-688e-4c1e-a71f-ce948d958ddf
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.xproj b/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.xproj
index 5cf5c239ec..5c06576fd7 100644
--- a/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.xproj
+++ b/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.xproj
@@ -7,8 +7,8 @@
c3123a70-41c4-4122-ad1c-d35df8958dd7
- ..\..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0