From b9c387bf5f89a3c585182c645126583c5467c130 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 29 Mar 2017 10:33:29 +0100 Subject: [PATCH] Remove obsolete references from gitignore files. Fixes #818 and #819. --- .gitignore | 1 - samples/angular/MusicStore/.gitignore | 1 - samples/misc/Webpack/.gitignore | 4 ---- samples/react/ReactGrid/.gitignore | 1 - templates/Angular2Spa/template_gitignore | 13 ++----------- templates/AureliaSpa/template_gitignore | 12 ++---------- templates/KnockoutSpa/template_gitignore | 9 +-------- templates/ReactReduxSpa/template_gitignore | 12 ++---------- templates/ReactSpa/template_gitignore | 9 +-------- templates/VueSpa/template_gitignore | 6 +----- templates/WebApplicationBasic/template_gitignore | 4 ---- 11 files changed, 9 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 9b53d65..100aa3b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,6 @@ PublishProfiles/ *.docstates _ReSharper.* nuget.exe -project.lock.json *net45.csproj *net451.csproj *k10.csproj diff --git a/samples/angular/MusicStore/.gitignore b/samples/angular/MusicStore/.gitignore index 762a3e6..a31c74a 100644 --- a/samples/angular/MusicStore/.gitignore +++ b/samples/angular/MusicStore/.gitignore @@ -1,7 +1,6 @@ /node_modules/ /wwwroot/lib/ /wwwroot/ng-app/**/*.js -/project.lock.json /music-db.sqlite /Properties/launchSettings.json diff --git a/samples/misc/Webpack/.gitignore b/samples/misc/Webpack/.gitignore index a99ce52..1363491 100644 --- a/samples/misc/Webpack/.gitignore +++ b/samples/misc/Webpack/.gitignore @@ -43,10 +43,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h diff --git a/samples/react/ReactGrid/.gitignore b/samples/react/ReactGrid/.gitignore index 22ae0ea..f050c80 100644 --- a/samples/react/ReactGrid/.gitignore +++ b/samples/react/ReactGrid/.gitignore @@ -1,4 +1,3 @@ /node_modules/ -project.lock.json /wwwroot/dist/ /Properties/launchSettings.json diff --git a/templates/Angular2Spa/template_gitignore b/templates/Angular2Spa/template_gitignore index 900f1b7..d261e7c 100644 --- a/templates/Angular2Spa/template_gitignore +++ b/templates/Angular2Spa/template_gitignore @@ -28,13 +28,8 @@ Obj/ # Visual Studio 2015 cache/options directory .vs/ -/wwwroot/dist/** -/ClientApp/dist/** - -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -!/wwwroot/dist/_placeholder.txt -!/ClientApp/dist/_placeholder.txt - +/wwwroot/dist/ +/ClientApp/dist/ # MSTest test Results [Tt]est[Rr]esult*/ @@ -49,10 +44,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h diff --git a/templates/AureliaSpa/template_gitignore b/templates/AureliaSpa/template_gitignore index 0d5fcb9..c8274b5 100644 --- a/templates/AureliaSpa/template_gitignore +++ b/templates/AureliaSpa/template_gitignore @@ -28,12 +28,8 @@ Obj/ # Visual Studio 2015 cache/options directory .vs/ -/wwwroot/dist/** -/ClientApp/dist/** - -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -!/wwwroot/dist/_placeholder.txt -!/ClientApp/dist/_placeholder.txt +/wwwroot/dist/ +/ClientApp/dist/ /yarn.lock @@ -50,10 +46,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h diff --git a/templates/KnockoutSpa/template_gitignore b/templates/KnockoutSpa/template_gitignore index a6f8810..3e035ee 100644 --- a/templates/KnockoutSpa/template_gitignore +++ b/templates/KnockoutSpa/template_gitignore @@ -28,10 +28,7 @@ Obj/ # Visual Studio 2015 cache/options directory .vs/ -/wwwroot/dist/** - -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -!/wwwroot/dist/_placeholder.txt +/wwwroot/dist/ /yarn.lock @@ -48,10 +45,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h diff --git a/templates/ReactReduxSpa/template_gitignore b/templates/ReactReduxSpa/template_gitignore index 0d5fcb9..c8274b5 100644 --- a/templates/ReactReduxSpa/template_gitignore +++ b/templates/ReactReduxSpa/template_gitignore @@ -28,12 +28,8 @@ Obj/ # Visual Studio 2015 cache/options directory .vs/ -/wwwroot/dist/** -/ClientApp/dist/** - -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -!/wwwroot/dist/_placeholder.txt -!/ClientApp/dist/_placeholder.txt +/wwwroot/dist/ +/ClientApp/dist/ /yarn.lock @@ -50,10 +46,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h diff --git a/templates/ReactSpa/template_gitignore b/templates/ReactSpa/template_gitignore index a6f8810..3e035ee 100644 --- a/templates/ReactSpa/template_gitignore +++ b/templates/ReactSpa/template_gitignore @@ -28,10 +28,7 @@ Obj/ # Visual Studio 2015 cache/options directory .vs/ -/wwwroot/dist/** - -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -!/wwwroot/dist/_placeholder.txt +/wwwroot/dist/ /yarn.lock @@ -48,10 +45,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h diff --git a/templates/VueSpa/template_gitignore b/templates/VueSpa/template_gitignore index a6f8810..30342b1 100644 --- a/templates/VueSpa/template_gitignore +++ b/templates/VueSpa/template_gitignore @@ -28,10 +28,7 @@ Obj/ # Visual Studio 2015 cache/options directory .vs/ -/wwwroot/dist/** - -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -!/wwwroot/dist/_placeholder.txt +/wwwroot/dist/ /yarn.lock @@ -49,7 +46,6 @@ TestResult.xml dlldata.c # DNX -project.lock.json artifacts/ *_i.c diff --git a/templates/WebApplicationBasic/template_gitignore b/templates/WebApplicationBasic/template_gitignore index 2e3deee..3e035ee 100644 --- a/templates/WebApplicationBasic/template_gitignore +++ b/templates/WebApplicationBasic/template_gitignore @@ -45,10 +45,6 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX -project.lock.json -artifacts/ - *_i.c *_p.c *_i.h