diff --git a/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.xproj b/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.xproj
index e7153086dc..34d1af1f6a 100644
--- a/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.xproj
+++ b/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.xproj
@@ -7,8 +7,8 @@
ff7f11a1-14e7-4948-a853-2487d99de0c6
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.xproj b/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.xproj
index 6f21f7f601..390b9dc9ca 100644
--- a/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.xproj
+++ b/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.xproj
@@ -7,8 +7,8 @@
589ac17f-9455-4764-8f82-fcd2ae58da14
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/samples/ElmPageSample/ElmPageSample.xproj b/samples/ElmPageSample/ElmPageSample.xproj
index 4c662de0e9..f05537d1a5 100644
--- a/samples/ElmPageSample/ElmPageSample.xproj
+++ b/samples/ElmPageSample/ElmPageSample.xproj
@@ -7,8 +7,8 @@
ffd28dcf-c24f-4c59-9b6b-f3b74ce13129
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/samples/ExceptionHandlerSample/ExceptionHandlerSample.xproj b/samples/ExceptionHandlerSample/ExceptionHandlerSample.xproj
index 42296dbb77..3858f86b31 100644
--- a/samples/ExceptionHandlerSample/ExceptionHandlerSample.xproj
+++ b/samples/ExceptionHandlerSample/ExceptionHandlerSample.xproj
@@ -7,8 +7,8 @@
427cdb36-78b0-4583-9ebc-7f283de60355
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.xproj b/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.xproj
index d5978b350c..07c825fbe6 100644
--- a/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.xproj
+++ b/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.xproj
@@ -7,8 +7,8 @@
95981429-f212-44e1-83aa-32da9e2a517c
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/samples/StatusCodePagesSample/StatusCodePagesSample.xproj b/samples/StatusCodePagesSample/StatusCodePagesSample.xproj
index 1dd3b409e8..65db127940 100644
--- a/samples/StatusCodePagesSample/StatusCodePagesSample.xproj
+++ b/samples/StatusCodePagesSample/StatusCodePagesSample.xproj
@@ -7,8 +7,8 @@
cc1f5841-fe10-4ddb-8477-c4de92ba759f
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/samples/WelcomePageSample/WelcomePageSample.xproj b/samples/WelcomePageSample/WelcomePageSample.xproj
index 1abde40b4e..2f665e0579 100644
--- a/samples/WelcomePageSample/WelcomePageSample.xproj
+++ b/samples/WelcomePageSample/WelcomePageSample.xproj
@@ -7,8 +7,8 @@
c5f59cba-df2d-4983-8cbb-11b6af21b416
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.xproj b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.xproj
index 5205e9a855..60eeab5258 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.xproj
+++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.xproj
@@ -7,8 +7,8 @@
83ffb65a-97b1-45aa-bcb8-3f43966bc8a3
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.xproj b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.xproj
index 02f5743c4b..a838466270 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.xproj
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.xproj
@@ -7,8 +7,8 @@
624b0019-956a-4157-b008-270c5b229553
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.xproj b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.xproj
index f4c2b874f2..7c90c6cb0e 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.xproj
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.xproj
@@ -7,8 +7,8 @@
4f5a6a72-ffe4-49c4-b4c6-58132cfcb9fe
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.xproj b/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.xproj
index 36667b0126..cb71cb99df 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.xproj
+++ b/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.xproj
@@ -7,8 +7,8 @@
68a1f0e1-ecce-46d1-b20f-c43ee5b097de
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/Microsoft.AspNetCore.DiagnosticsViewPage.Sources.xproj b/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/Microsoft.AspNetCore.DiagnosticsViewPage.Sources.xproj
index 8637a65e8d..7312cf2de3 100644
--- a/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/Microsoft.AspNetCore.DiagnosticsViewPage.Sources.xproj
+++ b/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/Microsoft.AspNetCore.DiagnosticsViewPage.Sources.xproj
@@ -1,14 +1,13 @@
-
+
- 14.0.24720
+ 14.0
$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
b9f08060-621f-4e1f-bda8-9c4ea107e08a
- Microsoft.AspNetCore.DiagnosticsViewPage.Sources
- ..\..\artifacts\obj\$(MSBuildProjectName)
+ .\obj
.\bin\
diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj
index f4093ee1a9..b2b37686de 100644
--- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj
+++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj
@@ -7,8 +7,8 @@
c2dedd37-d1eb-4819-9a9c-475e37a52358
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/src/PageGenerator/PageGenerator.xproj b/src/PageGenerator/PageGenerator.xproj
index 47e0a039ef..4780f62048 100644
--- a/src/PageGenerator/PageGenerator.xproj
+++ b/src/PageGenerator/PageGenerator.xproj
@@ -7,8 +7,8 @@
4d4a785a-ecb9-4916-a88f-0fd306ee3b74
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.xproj
index 0f82bb1161..739e82bfa2 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.xproj
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.xproj
@@ -7,8 +7,8 @@
2f9b479d-8247-4210-804b-78e6dd5c3e98
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.xproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.xproj
index 4683488421..454b428ea4 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.xproj
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.xproj
@@ -7,8 +7,8 @@
5486117b-a742-49e0-94fc-12b76f061803
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.xproj
index 5c53eaf784..11583dbc89 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.xproj
+++ b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/Microsoft.AspNetCore.Diagnostics.FunctionalTests.xproj
@@ -7,8 +7,8 @@
bfdfe1e3-a6a9-4dab-8939-1da306fc69c8
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.xproj b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.xproj
index 0c4d1d2bb4..d8d9afb0e6 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.xproj
+++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.xproj
@@ -7,8 +7,8 @@
994351b4-7b2a-4139-8b72-72c5bb5cc618
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0
diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj
index 3e93f56bd3..304d78ae98 100644
--- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj
+++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj
@@ -7,8 +7,8 @@
b0166aed-738f-42ee-af4d-c487c8b21521
- ..\..\artifacts\obj\$(MSBuildProjectName)
- ..\..\artifacts\bin\
+ .\obj
+ .\bin\
2.0