From 54f88ab190ad5541781ef0533e918d60c0c1aeff Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Tue, 20 Jan 2015 12:29:20 -0800 Subject: [PATCH] [cleanup] Update .gitignore and reset .kproj files - add a couple more exclusions to .gitignore (recent VS additions) - remove `` elements - update files that don't have the correct output directories - remove dangling PrecompilationWebSite.kproj file --- .gitignore | 2 ++ .../TagHelperSample.Web.kproj | 5 ----- .../Microsoft.AspNet.Mvc.Common.kproj | 5 ----- .../Microsoft.AspNet.Mvc.Core.kproj | 5 ----- .../Microsoft.AspNet.Mvc.kproj | 5 ----- .../PrecompilationWebSite.kproj | 17 ----------------- .../Microsoft.AspNet.Mvc.Core.Test.kproj | 5 ----- .../Microsoft.AspNet.Mvc.FunctionalTests.kproj | 5 ----- .../Microsoft.AspNet.Mvc.Razor.Test.kproj | 5 ----- .../ActionConstraintsWebSite.kproj | 8 +++----- .../ActionResultsWebSite.kproj | 8 +++----- .../ErrorPageMiddlewareWebSite.kproj | 8 +++----- .../FormatterWebSite/FormatterWebSite.kproj | 5 ----- .../LoggingWebSite/LoggingWebSite.kproj | 13 +++---------- .../MvcTagHelpersWebSite.kproj | 11 ----------- .../RazorViewEngineOptionsWebsite.kproj | 8 +++----- .../ResponseCacheWebSite.kproj | 13 +++---------- 17 files changed, 20 insertions(+), 108 deletions(-) delete mode 100644 src/PrecompilationWebSite/PrecompilationWebSite.kproj diff --git a/.gitignore b/.gitignore index 9274ba2c88..2253fa08e6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,8 @@ _ReSharper.*/ packages/ artifacts/ PublishProfiles/ +.vs/ +debugSettings.json *.user *.suo *.cache diff --git a/samples/TagHelperSample.Web/TagHelperSample.Web.kproj b/samples/TagHelperSample.Web/TagHelperSample.Web.kproj index 6fcc162ebf..a3afa289a4 100644 --- a/samples/TagHelperSample.Web/TagHelperSample.Web.kproj +++ b/samples/TagHelperSample.Web/TagHelperSample.Web.kproj @@ -15,9 +15,4 @@ 30540 - - - - - \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Common/Microsoft.AspNet.Mvc.Common.kproj b/src/Microsoft.AspNet.Mvc.Common/Microsoft.AspNet.Mvc.Common.kproj index 0367a0ab17..e6a6c1b4f3 100644 --- a/src/Microsoft.AspNet.Mvc.Common/Microsoft.AspNet.Mvc.Common.kproj +++ b/src/Microsoft.AspNet.Mvc.Common/Microsoft.AspNet.Mvc.Common.kproj @@ -14,9 +14,4 @@ 2.0 - - - - - \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj b/src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj index b023020a8a..70bc2e7fe4 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj +++ b/src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj @@ -14,9 +14,4 @@ 2.0 - - - - - \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.kproj b/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.kproj index 84fd55656e..d38738bdb6 100644 --- a/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.kproj +++ b/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.kproj @@ -14,9 +14,4 @@ 2.0 - - - - - \ No newline at end of file diff --git a/src/PrecompilationWebSite/PrecompilationWebSite.kproj b/src/PrecompilationWebSite/PrecompilationWebSite.kproj deleted file mode 100644 index f1e033138a..0000000000 --- a/src/PrecompilationWebSite/PrecompilationWebSite.kproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7af02e0f-a0cd-4a79-8c48-b5decfdd9df6 - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - 2.0 - - - diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj b/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj index 1225141df4..1b773ab251 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj @@ -14,9 +14,4 @@ 2.0 - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Microsoft.AspNet.Mvc.FunctionalTests.kproj b/test/Microsoft.AspNet.Mvc.FunctionalTests/Microsoft.AspNet.Mvc.FunctionalTests.kproj index 247e087053..f97db678df 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Microsoft.AspNet.Mvc.FunctionalTests.kproj +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Microsoft.AspNet.Mvc.FunctionalTests.kproj @@ -14,9 +14,4 @@ 2.0 - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Microsoft.AspNet.Mvc.Razor.Test.kproj b/test/Microsoft.AspNet.Mvc.Razor.Test/Microsoft.AspNet.Mvc.Razor.Test.kproj index 9b102c6387..72198b7e2d 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/Microsoft.AspNet.Mvc.Razor.Test.kproj +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Microsoft.AspNet.Mvc.Razor.Test.kproj @@ -14,9 +14,4 @@ 2.0 - - - - - \ No newline at end of file diff --git a/test/WebSites/ActionConstraintsWebSite/ActionConstraintsWebSite.kproj b/test/WebSites/ActionConstraintsWebSite/ActionConstraintsWebSite.kproj index f22c0494ee..6dc9eaf4ae 100644 --- a/test/WebSites/ActionConstraintsWebSite/ActionConstraintsWebSite.kproj +++ b/test/WebSites/ActionConstraintsWebSite/ActionConstraintsWebSite.kproj @@ -1,5 +1,5 @@  - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -7,10 +7,8 @@ af210f69-9d31-43af-ac3a-cd366e252218 - - - - + ..\..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\..\artifacts\bin\$(MSBuildProjectName)\ 2.0 diff --git a/test/WebSites/ActionResultsWebSite/ActionResultsWebSite.kproj b/test/WebSites/ActionResultsWebSite/ActionResultsWebSite.kproj index 38f9273e1c..3faf50770f 100644 --- a/test/WebSites/ActionResultsWebSite/ActionResultsWebSite.kproj +++ b/test/WebSites/ActionResultsWebSite/ActionResultsWebSite.kproj @@ -1,5 +1,5 @@  - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -7,10 +7,8 @@ 0a6bb4c0-48d3-4e7f-952b-b8917345e075 - - - - + ..\..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\..\artifacts\bin\$(MSBuildProjectName)\ 2.0 diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.kproj b/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.kproj index 8b6261cfdd..9571d6b626 100644 --- a/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.kproj +++ b/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.kproj @@ -1,5 +1,5 @@  - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -7,10 +7,8 @@ ad545a5b-2ba5-4314-88ac-fc2acf2cc718 - - - - + ..\..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\..\artifacts\bin\$(MSBuildProjectName)\ 2.0 diff --git a/test/WebSites/FormatterWebSite/FormatterWebSite.kproj b/test/WebSites/FormatterWebSite/FormatterWebSite.kproj index 970df2e1a6..5ac17019bb 100644 --- a/test/WebSites/FormatterWebSite/FormatterWebSite.kproj +++ b/test/WebSites/FormatterWebSite/FormatterWebSite.kproj @@ -15,9 +15,4 @@ 49634 - - - - - \ No newline at end of file diff --git a/test/WebSites/LoggingWebSite/LoggingWebSite.kproj b/test/WebSites/LoggingWebSite/LoggingWebSite.kproj index a513d0edcc..f44da51bf8 100644 --- a/test/WebSites/LoggingWebSite/LoggingWebSite.kproj +++ b/test/WebSites/LoggingWebSite/LoggingWebSite.kproj @@ -1,5 +1,5 @@  - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -7,19 +7,12 @@ 0ad78ab5-d67c-49bc-81b1-0c51bfa82b5e - - - - + ..\..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\..\artifacts\bin\$(MSBuildProjectName)\ 2.0 40912 - - - - - \ No newline at end of file diff --git a/test/WebSites/MvcTagHelpersWebSite/MvcTagHelpersWebSite.kproj b/test/WebSites/MvcTagHelpersWebSite/MvcTagHelpersWebSite.kproj index b0d0f0b700..2878099501 100644 --- a/test/WebSites/MvcTagHelpersWebSite/MvcTagHelpersWebSite.kproj +++ b/test/WebSites/MvcTagHelpersWebSite/MvcTagHelpersWebSite.kproj @@ -10,20 +10,9 @@ ..\..\..\artifacts\obj\$(MSBuildProjectName) ..\..\..\artifacts\bin\$(MSBuildProjectName)\ - - MvcTagHelpersWebSite - - - MvcTagHelpersWebSite - 2.0 49646 - - - - - \ No newline at end of file diff --git a/test/WebSites/RazorViewEngineOptionsWebsite/RazorViewEngineOptionsWebsite.kproj b/test/WebSites/RazorViewEngineOptionsWebsite/RazorViewEngineOptionsWebsite.kproj index 359e82f004..918015c097 100644 --- a/test/WebSites/RazorViewEngineOptionsWebsite/RazorViewEngineOptionsWebsite.kproj +++ b/test/WebSites/RazorViewEngineOptionsWebsite/RazorViewEngineOptionsWebsite.kproj @@ -1,5 +1,5 @@  - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -7,10 +7,8 @@ b18ade62-35de-4a06-8e1d-edd6245f7f4d - - - - + ..\..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\..\artifacts\bin\$(MSBuildProjectName)\ 2.0 diff --git a/test/WebSites/ResponseCacheWebSite/ResponseCacheWebSite.kproj b/test/WebSites/ResponseCacheWebSite/ResponseCacheWebSite.kproj index fad43c1846..44b3c3ecad 100644 --- a/test/WebSites/ResponseCacheWebSite/ResponseCacheWebSite.kproj +++ b/test/WebSites/ResponseCacheWebSite/ResponseCacheWebSite.kproj @@ -1,5 +1,5 @@  - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -7,19 +7,12 @@ bdeebe09-c0c4-433c-b0b8-8478c9776996 - - - - + ..\..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\..\artifacts\bin\$(MSBuildProjectName)\ 2.0 63072 - - - - - \ No newline at end of file